4 files changed, 45 insertions, 40 deletions
diff --git a/multimedia/makemkv/README b/multimedia/makemkv/README
index 43c1af3a21cbe..a6e029da678e9 100644
--- a/multimedia/makemkv/README
+++ b/multimedia/makemkv/README
@@ -7,35 +7,4 @@ intermediate conversion to a wide range of players, so you may watch
 Blu-ray and DVD discs with your favorite player on your favorite OS
 or on your favorite device.
 
-This creates a package out of a closed source component (the console
-application itself) and an open source component (the libraries and
-GUI wrapper). Neither is usable on its own and both are built and/or
-packaged using this script.
-
-This SlackBuild assumes automatic acceptance of the EULA for the closed
-source binary component (the open source component has no EULA). You
-should read the EULA upon installation at
-/usr/doc/makemkv-$VERSION/eula_en_linux.txt and uninstall the
-package if you do not agree to its terms. Also note that decrypting
-encrypted discs may be illegal depending on where you live.
-
-Please note that this contains closed-source *commercial* beta software.
-It will remain free (as in beer) throughout the beta, but with a few
-annoyances (unless you pay for a registration key, which should work
-fine with this package):
-
-MakeMKV BETA has several major restrictions.
-
-Program is time-limited -- it will stop functioning after 60 days. You
-can always download the latest version from makemkv.com that will reset
-the expiration date.
-
-HD-DVD support is limited - some discs may fail to open and not all
-audio and subtitle tracks will be preserved.
-
-Blu-ray and DVD discs are fully supported.
-
-Note that usually new registration keys are posted in the official
-MakeMKV forums so that old time-expired MakeMKV versions will still
-work during the beta (so you won't need to immediately upgrade to a
-newer version).
+See README.issues for further discussion of MakeMKV.
diff --git a/multimedia/makemkv/README.issues b/multimedia/makemkv/README.issues
new file mode 100644
index 0000000000000..1c287f5ad961f
--- /dev/null
+++ b/multimedia/makemkv/README.issues
@@ -0,0 +1,33 @@
+This creates a package out of a closed source component (the console
+application itself) and an open source component (the libraries and
+GUI wrapper). Neither is usable on its own and both are built and/or
+packaged using this script.
+
+This SlackBuild assumes automatic acceptance of the EULA for the closed
+source binary component and parts of the open source component. You
+should read the EULA upon installation at
+/usr/doc/makemkv-$VERSION/eula_en_linux.txt and
+/usr/doc/makemkv-$VERSION/License.txt and uninstall the package if you
+do not agree to its terms. Also note that decrypting encrypted discs
+may be illegal depending on where you live.
+
+Please note that this contains closed-source *commercial* beta software.
+It will remain free (as in beer) throughout the beta, but with a few
+annoyances (unless you pay for a registration key, which should work
+fine with this package):
+
+MakeMKV BETA has several major restrictions.
+
+Program is time-limited -- it will stop functioning after 60 days. You
+can always download the latest version from makemkv.com that will reset
+the expiration date.
+
+HD-DVD support is limited - some discs may fail to open and not all
+audio and subtitle tracks will be preserved.
+
+Blu-ray and DVD discs are fully supported.
+
+Note that usually new registration keys are posted in the official
+MakeMKV forums so that old time-expired MakeMKV versions will still
+work during the beta (so you won't need to immediately upgrade to a
+newer version).
diff --git a/multimedia/makemkv/makemkv.SlackBuild b/multimedia/makemkv/makemkv.SlackBuild
index 9bc9c9455aefe..42baca7cc74fe 100644
--- a/multimedia/makemkv/makemkv.SlackBuild
+++ b/multimedia/makemkv/makemkv.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=makemkv
-VERSION=${VERSION:-1.7.7}
+VERSION=${VERSION:-1.8.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -72,6 +72,9 @@ find . \
 make -f makefile.linux
 make -f makefile.linux install LIBDIR="\${PREFIX}/lib${LIBDIRSUFFIX}" DESTDIR=$PKG
 
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a License.txt $PKG/usr/doc/$PRGNAM-$VERSION
+
 # Now extract/copy the closed source component...
 cd $TMP
 rm -rf ${PRGNAM}-bin-${VERSION}
@@ -106,11 +109,9 @@ fi
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  src/eula_en_linux.txt \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a src/eula_en_linux.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/README.issues > $PKG/usr/doc/$PRGNAM-$VERSION/README.issues
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/multimedia/makemkv/makemkv.info b/multimedia/makemkv/makemkv.info
index 8456f7ce9fde7..489de367302a4 100644
--- a/multimedia/makemkv/makemkv.info
+++ b/multimedia/makemkv/makemkv.info
@@ -1,8 +1,10 @@
 PRGNAM="makemkv"
-VERSION="1.7.7"
+VERSION="1.8.0"
 HOMEPAGE="http://www.makemkv.com/"
-DOWNLOAD="http://www.makemkv.com/download/makemkv-oss-1.7.7.tar.gz http://www.makemkv.com/download/makemkv-bin-1.7.7.tar.gz"
-MD5SUM="68ec2f0654b0b826ed3ba3b31d99dc5e c5def819651e6758357a95dc77e48d01"
+DOWNLOAD="http://www.makemkv.com/download/makemkv-oss-1.8.0.tar.gz \
+          http://www.makemkv.com/download/makemkv-bin-1.8.0.tar.gz"
+MD5SUM="656b47f152bea4dbb413896af93f736d \
+        9e9790b2ce99adace89c4efac652cc54"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""