git: b7be88867a05 - main - multimedia/makemkv: Use new linux-c7 -devel pkgs

The branch main has been updated by zirias:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b7be88867a057a7ab5ed453fd167080f07df91e3

commit b7be88867a057a7ab5ed453fd167080f07df91e3
Author:     Felix Palmen <zirias@FreeBSD.org>
AuthorDate: 2022-09-20 11:28:29 +0000
Commit:     Felix Palmen <zirias@FreeBSD.org>
CommitDate: 2022-09-30 16:19:39 +0000

    multimedia/makemkv: Use new linux-c7 -devel pkgs
    
    This avoids fetching upstream distfiles just for OpenSSL headers. Bump
    port revision because different headers are used.
    
    Also drop perl5 dependency (not needed any more) and avoid little-known
    AT&T style replacements in Makefile.
    
    Approved by:            tcberner (mentor)
    Differential Revision:  https://reviews.freebsd.org/D36836
---
 multimedia/makemkv/Makefile | 45 ++++++++++++---------------------------------
 1 file changed, 12 insertions(+), 33 deletions(-)

diff --git a/multimedia/makemkv/Makefile b/multimedia/makemkv/Makefile
index 88fa45d2e6db..32fc59f7b10b 100644
--- a/multimedia/makemkv/Makefile
+++ b/multimedia/makemkv/Makefile
@@ -1,14 +1,13 @@
 PORTNAME=	makemkv
 DISTVERSION=	1.17.1
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.makemkv.com/download/:makemkv \
 		http://www.makemkv.com/download/old/:makemkv \
 		SF/opencore-amr/fdk-aac/:fdkaac \
-		https://ffmpeg.org/releases/:ffmpeg \
-		https://www.openssl.org/source/old/${OPENSSLVERSION}/:openssl
-DISTFILES=	${DISTFL_MAKEMKV:=:makemkv} \
-		${DISTFL_FFMPEG:=:ffmpeg} \
-		${DISTFL_OPENSSL:=:openssl}
+		https://ffmpeg.org/releases/:ffmpeg
+DISTFILES=	${DISTFL_MAKEMKV:S/$/:makemkv/} \
+		${DISTFL_FFMPEG:S/$/:ffmpeg/}
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	zirias@FreeBSD.org
@@ -30,13 +29,13 @@ LICENSE_DISTFILES_LGPL21+ =	${DISTFL_FFMPEG}
 LICENSE_DISTFILES_MAKEMKV=	${DISTFL_MAKEMKV}
 
 ONLY_FOR_ARCHS=	aarch64 amd64 i386
-USES=		gmake linux pkgconfig perl5
+USES=		gmake linux pkgconfig
 USE_CSTD=	c11
 USE_CXXSTD=	c++11
-USE_LINUX=	base expat expat:build openssl openssl:build devtools:build
-USE_PERL5=	build
-BUILD_DEPENDS=	${LOCALBASE}/include/expat.h:textproc/expat2 \
-		patchelf>0:sysutils/patchelf \
+USE_LINUX=	base expat \
+		devtools:build expat-devel:build openssl-devel:build \
+		zlib-devel:build
+BUILD_DEPENDS=	patchelf:sysutils/patchelf \
 		${BUILD_DEPENDS_${FFMPEG_ARCH}}
 BUILD_DEPENDS_x86=	nasm:devel/nasm
 
@@ -44,7 +43,6 @@ WRKSRC=		${WRKDIR}/makemkv-oss-${DISTVERSION}
 WRKSRC_bin=	${WRKDIR}/makemkv-bin-${DISTVERSION}
 WRKSRC_fdkaac=	${WRKDIR}/fdk-aac-${FDKAACVERSION}
 WRKSRC_ffmpeg=	${WRKDIR}/ffmpeg-${FFMPEGVERSION}
-WRKSRC_openssl=	${WRKDIR}/openssl-${OPENSSLFULLVER}
 
 CONFLICTS_BUILD=	v4l_compat
 
@@ -54,34 +52,24 @@ PLIST_SUB=	LINUXBASE=${LINUXBASE}
 
 FDKAACVERSION=	2.0.2
 FFMPEGVERSION=	5.1
-OPENSSLVERSION=	1.0.2
-OPENSSLPATCHLEVEL=	k
-OPENSSLFULLVER=	${OPENSSLVERSION}${OPENSSLPATCHLEVEL}
 
 DISTFL_MAKEMKV=	makemkv-oss-${DISTVERSION}.tar.gz \
 		makemkv-bin-${DISTVERSION}.tar.gz
 DISTFL_FDKAAC=	fdk-aac-${FDKAACVERSION}.tar.gz
 DISTFL_FFMPEG=	ffmpeg-${FFMPEGVERSION}.tar.bz2
-DISTFL_OPENSSL=	openssl-${OPENSSLFULLVER}.tar.gz
-
-LINUXLIBDIR=	${LINUXBASE}/${"${ARCH:Mi386}":?lib:lib64}
-OPENSSLTARGET=	linux-${ARCH:S/i386/elf/:S/amd64/x86_64/}
-LINUXLIBS=	libcrypto.so.10 libexpat.so.1 libz.so.1
-LINUXSYSROOT=	${WRKDIR}/gnuroot
 
 OPTIONS_DEFINE=		EXAMPLES FDK_AAC
 OPTIONS_DEFAULT=	EXAMPLES
 FDK_AAC_DESC=		Support AAC via statically linked fdk-aac
-FDK_AAC_DISTFILES=	${DISTFL_FDKAAC:=:fdkaac}
+FDK_AAC_DISTFILES=	${DISTFL_FDKAAC:S/$/:fdkaac/}
 TARGET_ORDER_OVERRIDE=	290:pre-configure-FDK_AAC-on
 
 CC=		${LINUXBASE}/bin/gcc
 CXX=		${LINUXBASE}/bin/g++
-CPPFLAGS+=	-I${LINUXSYSROOT}/include -I${WRKSRC_openssl}/include \
-		-D_linux_ -DFORCE_OPENSSL_NO_EC \
+CPPFLAGS+=	-D_linux_ -DFORCE_OPENSSL_NO_EC \
 		${${OSVERSION}<1300000:?-Dcaddr_t=void\* -D__daddr_t_defined:}
-LDFLAGS+=	-L${LINUXSYSROOT}/lib
 PATCHELF_CMD?=	${LOCALBASE}/bin/patchelf
+LINUXSYSROOT=	${WRKDIR}/gnuroot
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} --disable-gui --libdir=${PREFIX}/lib/makemkv
 CONFIGURE_ENV=	PKG_CONFIG_PATH=${LINUXSYSROOT}/lib/pkgconfig
@@ -96,12 +84,6 @@ FFMPEG_CONFIGURE_ENV=	${CONFIGURE_ENV} CFLAGS="${CPPFLAGS} ${CFLAGS}"
 FFMPEG_MAKE_ARGS=	V=1 ARCH=${FFMPEG_ARCH}
 FFMPEG_INSTALL_TARGET=	${ALL_TARGET} ${INSTALL_TARGET}
 
-post-extract:
-		@${MKDIR} ${LINUXSYSROOT}/lib
-.for lib in ${LINUXLIBS}
-		@${LN} -s ${LINUXLIBDIR}/${lib} ${LINUXSYSROOT}/lib/${lib:R}
-.endfor
-
 post-patch:
 		@${REINPLACE_CMD} -e 's:INSTALL) -D:INSTALL):' \
 			${WRKSRC}/Makefile.in
@@ -125,9 +107,6 @@ pre-configure:
 		${FFMPEG_CONFIGURE_ENV} ./configure ${FFMPEG_CONFIGURE_ARGS}; \
 		${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} \
 			${FFMPEG_MAKE_ARGS} ${FFMPEG_INSTALL_TARGET}
-		# OpenSSL headers
-		cd ${WRKSRC_openssl}; \
-		./Configure --openssldir= --prefix=/usr ${OPENSSLTARGET}
 
 pre-install:
 		${MKDIR} ${STAGEDIR}${PREFIX}/lib/makemkv