1 files changed, 39 insertions, 37 deletions

diff --git a/multimedia/gmerlin-avdecoder/Makefile b/multimedia/gmerlin-avdecoder/Makefile
index b7f8dfbb498c..961e9c74b641 100644
--- a/multimedia/gmerlin-avdecoder/Makefile
+++ b/multimedia/gmerlin-avdecoder/Makefile
@@ -3,18 +3,17 @@
 
 PORTNAME=	gmerlin-avdecoder
 PORTVERSION=	1.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/gmerlin/${PORTNAME}/${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	wg@FreeBSD.org
 COMMENT=	General purpose media decoding library
 
 LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/include/linux/dvb/frontend.h:${PORTSDIR}/multimedia/v4l_compat
-LIB_DEPENDS=	gavl.1:${PORTSDIR}/multimedia/gavl
+LIB_DEPENDS=	libgavl.so:${PORTSDIR}/multimedia/gavl
 
 OPTIONS_DEFINE=	A52 CDIO DCA DVDREAD FAAD FFMPEG FLAC GMERLIN MAD \
 		MJPEGTOOLS MPEG2 MUSEPACK OPENJPEG OPTIMIZED_CFLAGS PNG \
@@ -31,14 +30,13 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-cpuflags=none --without-doxygen
 USE_LDCONFIG=	yes
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include/ffmpeg0
+LDFLAGS+=	-L${LOCALBASE}/lib/ffmpeg0
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGMERLIN}
-LIB_DEPENDS+=	gmerlin.0:${PORTSDIR}/multimedia/gmerlin
+LIB_DEPENDS+=	libgmerlin.so:${PORTSDIR}/multimedia/gmerlin
 PLIST_SUB+=	GMERLIN=""
 .else
 CONFIGURE_ARGS+=--disable-gmerlin
@@ -46,68 +44,68 @@ PLIST_SUB+=	GMERLIN="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MFFMPEG}
-LIB_DEPENDS+=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg
+LIB_DEPENDS+=	libavcodec0.so:${PORTSDIR}/multimedia/ffmpeg0
 .else
 CONFIGURE_ARGS+=--disable-libavcodec --disable-libpostproc --disable-libswscale --disable-libavformat
 .endif
 
 .if ${PORT_OPTIONS:MTHEORA}
-LIB_DEPENDS+=	theora.0:${PORTSDIR}/multimedia/libtheora
+LIB_DEPENDS+=	libtheora.so:${PORTSDIR}/multimedia/libtheora
 .else
 CONFIGURE_ARGS+=--disable-theoradec
 .endif
 
 .if ${PORT_OPTIONS:MSPEEX}
-LIB_DEPENDS+=	speex.1:${PORTSDIR}/audio/speex
+LIB_DEPENDS+=	libspeex.so:${PORTSDIR}/audio/speex
 .else
 CONFIGURE_ARGS+=--disable-speex
 .endif
 
-.if ${PORT_OPTIONS:MJPEGTOOLS}
-LIB_DEPENDS+=	lavjpeg-2.0.0:${PORTSDIR}/multimedia/mjpegtools
+.if ${PORT_OPTIONS:MMJPEGTOOLS}
+LIB_DEPENDS+=	liblavjpeg-2.0.so:${PORTSDIR}/multimedia/mjpegtools
 .else
 CONFIGURE_ARGS+=--disable-mjpegtools
 .endif
 
 .if ${PORT_OPTIONS:MVORBIS}
-LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	libvorbis.so:${PORTSDIR}/audio/libvorbis
 CONFIGURE_ARGS+=--with-vorbis=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=--disable-vorbis
 .endif
 
 .if ${PORT_OPTIONS:MMPEG2}
-LIB_DEPENDS+=	mpeg2.0:${PORTSDIR}/multimedia/libmpeg2
+LIB_DEPENDS+=	libmpeg2.so:${PORTSDIR}/multimedia/libmpeg2
 .else
 CONFIGURE_ARGS+=--disable-libmpeg2
 .endif
 
 .if ${PORT_OPTIONS:MTIFF}
-LIB_DEPENDS+=	tiff.4:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS+=	libtiff.so:${PORTSDIR}/graphics/tiff
 .else
 CONFIGURE_ARGS+=--disable-libtiff
 .endif
 
 .if ${PORT_OPTIONS:MSAMBA}
-LIB_DEPENDS+=	smbclient.0:${PORTSDIR}/net/samba-libsmbclient
+LIB_DEPENDS+=	libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
 .else
 CONFIGURE_ARGS+=--disable-samba
 .endif
 
 .if ${PORT_OPTIONS:MPNG}
-LIB_DEPENDS+=	png15:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=	libpng15.so:${PORTSDIR}/graphics/png
 .else
 CONFIGURE_ARGS+=--disable-libpng
 .endif
 
 .if ${PORT_OPTIONS:MFAAD}
-LIB_DEPENDS+=	faad.2:${PORTSDIR}/audio/faad
+LIB_DEPENDS+=	libfaad.so:${PORTSDIR}/audio/faad
 .else
 CONFIGURE_ARGS+=--disable-faad2
 .endif
 
 .if ${PORT_OPTIONS:MDVDREAD}
-LIB_DEPENDS+=	dvdread.4:${PORTSDIR}/multimedia/libdvdread
+LIB_DEPENDS+=	libdvdread.so:${PORTSDIR}/multimedia/libdvdread
 PLIST_SUB+=	DVDREAD=""
 .else
 CONFIGURE_ARGS+=--disable-dvdread
@@ -115,38 +113,38 @@ PLIST_SUB+=	DVDREAD="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MFLAC}
-LIB_DEPENDS+=	FLAC:${PORTSDIR}/audio/flac
+LIB_DEPENDS+=	libFLAC.so:${PORTSDIR}/audio/flac
 .else
 CONFIGURE_ARGS+=--disable-flac
 .endif
 
 .if ${PORT_OPTIONS:MMUSEPACK}
-LIB_DEPENDS+=	mpcdec.7:${PORTSDIR}/audio/musepack
+LIB_DEPENDS+=	libmpcdec.so:${PORTSDIR}/audio/musepack
 .else
 CONFIGURE_ARGS+=--disable-musepack
 .endif
 
 .if ${PORT_OPTIONS:MMAD}
-LIB_DEPENDS+=	mad.2:${PORTSDIR}/audio/libmad
+LIB_DEPENDS+=	libmad.so:${PORTSDIR}/audio/libmad
 .else
 CONFIGURE_ARGS+=--disable-mad
 .endif
 
 .if ${PORT_OPTIONS:MA52}
-LIB_DEPENDS+=	a52.0:${PORTSDIR}/audio/liba52
+LIB_DEPENDS+=	liba52.so:${PORTSDIR}/audio/liba52
 .else
 CONFIGURE_ARGS+=--disable-liba52
 .endif
 
 .if ${PORT_OPTIONS:MDCA}
-LIB_DEPENDS+=	dca.0:${PORTSDIR}/multimedia/libdca
+LIB_DEPENDS+=	libdca.so:${PORTSDIR}/multimedia/libdca
 .else
 # error in configure
 CONFIGURE_ARGS+=--disable-libcda --disable-libdca
 .endif
 
 .if ${PORT_OPTIONS:MCDIO}
-LIB_DEPENDS+=	cdio.13:${PORTSDIR}/sysutils/libcdio
+LIB_DEPENDS+=	libcdio.so:${PORTSDIR}/sysutils/libcdio
 PLIST_SUB+=	CDIO=""
 .else
 CONFIGURE_ARGS+=--disable-libcdio
@@ -154,19 +152,19 @@ PLIST_SUB+=	CDIO="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MOPENJPEG}
-LIB_DEPENDS+=	openjpeg.2:${PORTSDIR}/graphics/openjpeg
+LIB_DEPENDS+=	libopenjpeg.so:${PORTSDIR}/graphics/openjpeg
 .else
 CONFIGURE_ARGS+=--disable-openjpeg
 .endif
 
 .if ${PORT_OPTIONS:MSCHROEDINGER}
-LIB_DEPENDS+=	schroedinger-1.0.11:${PORTSDIR}/multimedia/schroedinger
+LIB_DEPENDS+=	libschroedinger-1.0.so:${PORTSDIR}/multimedia/schroedinger
 .else
 CONFIGURE_ARGS+=--disable-schroedinger
 .endif
 
 .if ${PORT_OPTIONS:MVDPAU}
-LIB_DEPENDS+=	vdpau.1:${PORTSDIR}/multimedia/libvdpau
+LIB_DEPENDS+=	libvdpau.so:${PORTSDIR}/multimedia/libvdpau
 .else
 CONFIGURE_ARGS+=	--disable-vdpau
 .endif
@@ -178,10 +176,16 @@ CXXFLAGS+=	-O3 -funroll-all-loops -ffast-math
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e \
+	@${REINPLACE_CMD} -E -e \
 		's|-O3 -funroll-all-loops -ffast-math||g; \
 		 /LIBS/ s|-ldl||g; \
-		 s|^LDFLAGS="|&$${LDFLAGS} |' ${WRKSRC}/configure
+		 s|^LDFLAGS="|&$${LDFLAGS} |' \
+		 -e 's|^(.*PKG_CONFIG.*)libavcodec(.*)|\1libavcodec0\2|g' \
+		 -e 's|^(.*PKG_CONFIG.*)libavformat(.*)|\1libavformat0\2|g' \
+		 -e 's|^(.*PKG_CONFIG.*)libavutil(.*)|\1libavutil0\2|g' \
+		 -e 's|^(.*PKG_CONFIG.*)libpostproc(.*)|\1libpostproc0\2|g' \
+		 -e 's|^(.*PKG_CONFIG.*)libswscale(.*)|\1libswscale0\2|g' \
+		 ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e \
 		's|#if DVDREAD_VERSION < 905|#if DVDREAD_VERSION < 904|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e \
@@ -190,9 +194,7 @@ post-patch:
 		's|malloc.h|stdlib.h|' ${WRKSRC}/lib/in_smb.c
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>