3 files changed, 28 insertions, 34 deletions

diff --git a/multimedia/makemkv/Makefile b/multimedia/makemkv/Makefile
index c35ded9bee8c..f03d69d1e598 100644
--- a/multimedia/makemkv/Makefile
+++ b/multimedia/makemkv/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	makemkv
-PORTVERSION=	1.15.0
+PORTVERSION=	1.15.1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.makemkv.com/download/:makemkv \
 		http://www.makemkv.com/download/old/:makemkv \
@@ -39,8 +39,8 @@ LICENSE_NAME_MAKEMKV=	The MakeMKV EULA
 LICENSE_NAME_FDK=	The FDK AAC License
 LICENSE_FILE_MAKEMKV=	${WRKDIR}/makemkv-bin-${PORTVERSION}/src/eula_en_linux.txt
 LICENSE_FILE_FDK=	${WRKDIR}/fdk-aac-${FDKAACVERSION}/NOTICE
-LICENSE_PERMS_MAKEMKV=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell \
-			no-auto-accept
+LICENSE_PERMS_MAKEMKV=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell \
+			auto-accept
 LICENSE_PERMS_FDK=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell \
 			auto-accept
 LICENSE_DISTFILES_FDK=	fdk-aac-${FDKAACVERSION}.tar.gz
@@ -57,19 +57,22 @@ LICENSE_DISTFILES_MAKEMKV=	makemkv-bin-${PORTVERSION}.tar.gz \
 				makemkv-oss-${PORTVERSION}.tar.gz
 
 ONLY_FOR_ARCHS=	amd64 i386
-USE_LDCONFIG=	yes
 USES=	gmake linux pkgconfig perl5
 USE_LINUX=	base expat expat:build openssl openssl:build
 USE_PERL5=	build
 USE_GCC=	yes
+USE_LDCONFIG=	yes
 BUILD_DEPENDS=	nasm>0:devel/nasm \
 		${LOCALBASE}/include/expat.h:textproc/expat2 \
 		patchelf>0:sysutils/patchelf \
 		gawk>0:lang/gawk \
 		gsed>0:textproc/gsed
 
-RESTRICTED=	yes
+NO_CDROM=	Do not sell
 RESTRICTED_FILES=	makemkv-bin-${PORTVERSION}.tar.gz
+LEGAL_TEXT=	${NO_CDROM}. Do not redistribute modified binaries, but\
+		explicit permission to distribute a patched makemkvcon given\
+		by copyright owner
 
 WRKSRC=		${WRKDIR}/makemkv-oss-${PORTVERSION}
 
@@ -92,6 +95,8 @@ OPENSSLFULLVER=	${OPENSSLVERSION}${OPENSSLPATCHLEVEL}
 
 LINUXARCH=	${ARCH:S/amd64/x86_64/}
 LINUXTRIPLET=	${LINUXARCH}-unknown-linux-gnu
+LINUX32CPUTYPE=	${${OSVERSION} >= 1300000:?i686:i486}
+LINUXTRIPLET=	${LINUXARCH:S/i386/${LINUX32CPUTYPE}/}-unknown-linux-gnu
 LINUXLIBDIR=	${LINUXBASE}/${"${LINUXARCH:Mx86_64}" != "":?lib64:lib}
 GNUCROSSDIR=	${WRKDIR}/gnuroot/${LINUXTRIPLET}
 GNUCROSSLIBDIR=	${GNUCROSSDIR}/${"${LINUXARCH:Mx86_64}" != "":?lib64:lib}
@@ -104,14 +109,6 @@ CFLAGS+=	-DFORCE_OPENSSL_NO_EC -I${WRKDIR}/gnuroot/include \
 SSP_CFLAGS=
 LDFLAGS+=	-L${WRKDIR}/gnuroot/lib -Wl,-rpath-link=${WRKDIR}/gnuroot/lib
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX} --disable-gui --host=${LINUXTRIPLET} \
-		--libdir=${PREFIX}/lib/makemkv
-CONFIGURE_ENV=	CC=${LINUXTRIPLET}-gcc CXX=${LINUXTRIPLET}-g++ \
-		CFLAGS="${CFLAGS:N-Wl,-rpath=*}" \
-		CXXFLAGS="${CXXFLAGS:N-Wl,-rpath=*}" \
-		LDFLAGS="${LDFLAGS:N-Wl,-rpath=*}" \
-		PATH=${WRKDIR}/gnuroot/bin:${PATH} \
-		PKG_CONFIG_PATH=${WRKDIR}/gnuroot/lib/pkgconfig
 MAKE_ENV=	PATH=${WRKDIR}/gnuroot/bin:${PATH}
 STRIP_CMD=	${WRKDIR}/gnuroot/bin/${LINUXTRIPLET}-strip
 
@@ -146,6 +143,7 @@ post-patch:
 			${WRKSRC}/Makefile.in
 		@${REINPLACE_CMD} -e 's:/bin/bash:/bin/sh:' \
 			-e 's:x86_64:amd64:' \
+			-e 's:i686:i386:' \
 			-e 's:-t \([^ ]*\) \([^ ]*\):\2 \1:' \
 			${WRKDIR}/makemkv-bin-${PORTVERSION}/Makefile
 		@${REINPLACE_CMD} -e 's:3\.79:4.*:' \
@@ -243,6 +241,17 @@ pre-configure:
 		cd ${WRKDIR}/openssl-${OPENSSLFULLVER}; \
 		./Configure --openssldir= --prefix=/usr ${OPENSSLTARGET}
 
+do-configure:
+		cd ${WRKSRC}; \
+		CC=${LINUXTRIPLET}-gcc CXX=${LINUXTRIPLET}-g++ \
+		CFLAGS="${CFLAGS:N-Wl,-rpath=*}" \
+		CXXFLAGS="${CXXFLAGS:N-Wl,-rpath=*}" \
+		LDFLAGS="${LDFLAGS:N-Wl,-rpath=*}" \
+		PATH=${WRKDIR}/gnuroot/bin:${PATH} \
+		PKG_CONFIG_PATH=${WRKDIR}/gnuroot/lib/pkgconfig \
+		./configure --prefix=${PREFIX} --host=${LINUXTRIPLET} \
+			--libdir=${PREFIX}/lib/makemkv --disable-gui
+
 pre-install:
 		${MKDIR} ${STAGEDIR}${PREFIX}/lib/makemkv
 
diff --git a/multimedia/makemkv/distinfo b/multimedia/makemkv/distinfo
index 529230f39c0a..fb5a775b1c45 100644
--- a/multimedia/makemkv/distinfo
+++ b/multimedia/makemkv/distinfo
@@ -1,8 +1,8 @@
-TIMESTAMP = 1585042908
-SHA256 (makemkv/makemkv-oss-1.15.0.tar.gz) = a9213fa7cbf2bf2f03d90cd350ad53aa82394bc3991c440e9e369e4169f3ed06
-SIZE (makemkv/makemkv-oss-1.15.0.tar.gz) = 6383576
-SHA256 (makemkv/makemkv-bin-1.15.0.tar.gz) = 442d67d5368390263c30fca2d980ebfffb716be227b9f056b69961d2b11b26ff
-SIZE (makemkv/makemkv-bin-1.15.0.tar.gz) = 9516617
+TIMESTAMP = 1587020270
+SHA256 (makemkv/makemkv-oss-1.15.1.tar.gz) = 5e6b3da05a3298a0ac85c674dbde45d5eb36956159deb3207ac23f85a7ffa166
+SIZE (makemkv/makemkv-oss-1.15.1.tar.gz) = 6403114
+SHA256 (makemkv/makemkv-bin-1.15.1.tar.gz) = 80bbd4438c3ce6e95c085a63b9129c919dff865d14cd2b5e58a851da74302631
+SIZE (makemkv/makemkv-bin-1.15.1.tar.gz) = 8338636
 SHA256 (makemkv/linux-2.6.32.27.tar.xz) = 96c20c370ed440db61624d93f34721a09a69b12bb81b1b03bb735041983fb1bd
 SIZE (makemkv/linux-2.6.32.27.tar.xz) = 52652044
 SHA256 (makemkv/binutils-2.27.tar.bz2) = 369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88
diff --git a/multimedia/makemkv/pkg-descr b/multimedia/makemkv/pkg-descr
index 083b77d35b61..77cc55fd8f79 100644
--- a/multimedia/makemkv/pkg-descr
+++ b/multimedia/makemkv/pkg-descr
@@ -4,22 +4,7 @@ MakeMKV is your one-click solution to convert video that you own into free and
 patents-unencumbered format that can be played everywhere. MakeMKV is a format
 converter, otherwise called "transcoder". It converts the video clips from
 proprietary (and usually encrypted) disc into a set of MKV files, preserving
-most information but not changing it in any way. The MKV format can store
-multiple video/audio tracks with all meta-information and preserve chapters.
-There are many players that can play MKV files nearly on all platforms, and
-there are tools to convert MKV files to many formats, including DVD and Blu-ray
-discs.
-
-* Reads DVD and Blu-ray discs
-* Reads Blu-ray discs protected with latest versions of AACS and BD+
-* Preserves all video and audio tracks, including HD audio
-* Preserves chapters information
-* Preserves all meta-information (track language, audio type)
-* Fast conversion - converts as fast as your drive can read data.
-* No additional software is required for conversion or decryption.
-* Functionality to open DVD discs is free and will always stay free.
-* All features (including Blu-ray decryption and processing) are free during
-  BETA.
+most information but not changing it in any way.
 
 Known issues on FreeBSD: