audio/rhythmbox: drop :keepla

multimedia/banshee: add USES=libtool and INSTALL_TARGET=install-strip
multimedia/libmtp: add USES=libtool and INSTALL_TARGET=install-strip
multimedia/libaacs:
- USES=libtool pathfix
- Add INSTALL_TARGET=install-strip
- Avoid USE_AUTOTOOLS
- Remove plist target, superseded by makeplist
multimedia/libbluray:
- USES=libtool pathfix
- Add INSTALL_TARGET=install-strip
- Avoid USE_AUTOTOOLS
- Remove plist target, superseded by makeplist
- Use OPTIONS_SUB
- Replace patch with post-patch command

Bump dependent ports

3 files changed, 10 insertions, 47 deletions

diff --git a/multimedia/libbluray/Makefile b/multimedia/libbluray/Makefile
index b49ec02f4d46..bd95917da278 100644
--- a/multimedia/libbluray/Makefile
+++ b/multimedia/libbluray/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libbluray
 PORTVERSION=	0.5.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.videolan.org/pub/videolan/${PORTNAME}/${PORTVERSION}/ \
@@ -17,17 +18,15 @@ LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
 # dlopen dependencies, libbdplus not yet available
 LIB_DEPENDS+=	libaacs.so:${PORTSDIR}/multimedia/libaacs
 
-USES=		iconv pkgconfig tar:bzip2
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-debug
+INSTALL_TARGET=	install-strip
+USES=		iconv libtool pathfix pkgconfig tar:bzip2
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	autoconf aclocal automake libtool
 USE_GNOME=	libxml2
 
-HAS_CONFIGURE=	yes
-MAKE_ARGS=	pkgconfigdir="${PREFIX}/libdata/pkgconfig"
-CONFIGURE_ARGS=	--prefix="${PREFIX}" \
-		--disable-debug
-
 OPTIONS_DEFINE=	JAVA
+OPTIONS_SUB=	yes
 JAVA_DESC=	Enable Blu-Ray Java support
 
 .include <bsd.port.options.mk>
@@ -43,36 +42,7 @@ CONFIGURE_ARGS+=	--enable-bdjava --with-bdj-type=j2se
 CONFIGURE_ENV+=	JDK_HOME="${JAVA_HOME}"
 .endif
 
-# Create PLIST_SUB definitions for options
-.for _option in ${OPTIONS_DEFINE}
-.if ${PORT_OPTIONS:M${_option}}
-PLIST_SUB+=	${_option}=""
-.else
-PLIST_SUB+=	${_option}="@comment "
-.endif
-.endfor
-
-run-autotools:
-	@cd ${WRKSRC} && ${SH} bootstrap
-
-plist:
-	@${ECHO} "===> Rebuilding PLIST."
-.for _option in "" ${OPTIONS_DEFINE}
-	@${MAKE} clean stage OPTIONS_EXCLUDE="${OPTIONS_DEFINE:N${_option}}" \
-	                     WITH=${_option}
-	@${MTREE_CMD} -cp "${STAGEDIR}${PREFIX}/" > "${WRKDIR}/mtree.${_option}"
-	@${MTREE_CMD} -Sf "${WRKDIR}/mtree.${_option}" -f "${MTREE_FILE}" \
-		| ${SED} -ne '/share\/licenses/b dirs' \
-		         -e '/ dir /{s/ .*//;s/^/@dirrm /;H;};t dirs' \
-		         -e 's/ .*//p;:dirs' -e '$${g;s/^\n//p;}' \
-		> "plist.${_option}"
-.endfor
-.for _option in ${OPTIONS_DEFINE}
-	@${GREP} -vFx "$$(${CAT} "plist.")" "plist.${_option}" \
-		| ${SED} 's/^/%%${_option}%%/' > "plist.add.${_option}"
-	@${RM} "plist.${_option}"
-.endfor
-	@${CAT} plist. ${OPTIONS_DEFINE:C/^/plist.add./} > ${PLIST}
-	@${RM} plist. ${OPTIONS_DEFINE:C/^/plist.add./}
+post-patch:
+	@${REINPLACE_CMD} '/^SET_FEATURES =/d' ${WRKSRC}/src/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/multimedia/libbluray/files/patch-src-Makefile.am b/multimedia/libbluray/files/patch-src-Makefile.am
deleted file mode 100644
index d4594c071ad1..000000000000
--- a/multimedia/libbluray/files/patch-src-Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
---- src/Makefile.am.orig	2014-04-13 18:08:03.000000000 +0200
-+++ src/Makefile.am	2014-04-13 18:08:10.000000000 +0200
-@@ -1,4 +1,3 @@
--SET_FEATURES = -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112L -D_REENTRANT
- SET_INCLUDES = -I$(top_srcdir) -Ifile -Ilibbluray -Ilibbluray/bdnav
- 
- AM_CFLAGS = -std=c99 $(SET_FEATURES) $(SET_INCLUDES) $(LIBXML2_CFLAGS) $(FT2_CFLAGS)
diff --git a/multimedia/libbluray/pkg-plist b/multimedia/libbluray/pkg-plist
index 8f37e5b4dfc6..02f9cf01c935 100644
--- a/multimedia/libbluray/pkg-plist
+++ b/multimedia/libbluray/pkg-plist
@@ -8,9 +8,9 @@ include/libbluray/log_control.h
 include/libbluray/meta_data.h
 include/libbluray/overlay.h
 lib/libbluray.a
-lib/libbluray.la
 lib/libbluray.so
-lib/libbluray.so.6
+lib/libbluray.so.1
+lib/libbluray.so.1.5.0
 libdata/pkgconfig/libbluray.pc
 @dirrm include/libbluray
 %%JAVA%%lib/libbluray/libbluray.jar