Update libbluray and related libraries

Also clean up/modernise Makefiles.

Reviewed by:	cs
Approved by:	cs
Differential Revision:	https://reviews.freebsd.org/D5743

4 files changed, 11 insertions, 57 deletions

diff --git a/multimedia/libbluray/Makefile b/multimedia/libbluray/Makefile
index dd086641691e..d3a7f14b2ecc 100644
--- a/multimedia/libbluray/Makefile
+++ b/multimedia/libbluray/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libbluray
-PORTVERSION=	0.7.0
+PORTVERSION=	0.9.2
 PORTEPOCH=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.videolan.org/pub/videolan/${PORTNAME}/${PORTVERSION}/ \
@@ -31,50 +31,11 @@ OPTIONS_DEFINE=	JAVA
 OPTIONS_SUB=	yes
 JAVA_DESC=	Enable Blu-Ray Java support
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MJAVA}
-BUILD_DEPENDS+=	ant:devel/apache-ant
-CATEGORIES+=	java
-USE_JAVA=	yes
-JAVA_VERSION=	1.6+
-JAVA_BUILD=	yes
-JAVA_RUN=	yes
-CONFIGURE_ARGS+=	--enable-bdjava --with-bdj-type=j2se
-CONFIGURE_ENV+=	JDK_HOME="${JAVA_HOME}"
-.endif
-
-#
-# NOTE:
-# makeplist has no support for options, leave this in place
-#
-
-# 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
-
-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} -e '/share\/licenses/d' -e '/ dir /d' -e 's/ .*//' \
-		> "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./} \
-		| ${SED} "${PLIST_SUB_SED}" > ${PLIST}
-	@${RM} plist. ${OPTIONS_DEFINE:C/^/plist.add./}
+JAVA_BUILD_DEPENDS=		ant:devel/apache-ant
+JAVA_CATEGORIES=		java
+JAVA_USE=			JAVA=yes
+JAVA_VARS=			JAVA_VERSION=1.6+ JAVA_BUILD=yes JAVA_RUN=yes
+JAVA_CONFIGURE_ENABLE=		bdjava
+JAVA_CONFIGURE_ENV=		JDK_HOME="${JAVA_HOME}"
 
 .include <bsd.port.mk>
diff --git a/multimedia/libbluray/distinfo b/multimedia/libbluray/distinfo
index 62b267af1348..8fa2e8635b58 100644
--- a/multimedia/libbluray/distinfo
+++ b/multimedia/libbluray/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libbluray-0.7.0.tar.bz2) = f79beb9fbb24117cbb1264c919e686ae9e6349c0ad08b48c4b6233b2887eb68d
-SIZE (libbluray-0.7.0.tar.bz2) = 597266
+SHA256 (libbluray-0.9.2.tar.bz2) = efc994f42d2bce6af2ce69d05ba89dbbd88bcec7aca065de094fb3a7880ce7ea
+SIZE (libbluray-0.9.2.tar.bz2) = 704357
diff --git a/multimedia/libbluray/files/patch-src-Makefile.am b/multimedia/libbluray/files/patch-src-Makefile.am
deleted file mode 100644
index bfb1eaa4aac0..000000000000
--- a/multimedia/libbluray/files/patch-src-Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
---- src/Makefile.am.orig	2015-01-26 10:44:55.000000000 +0100
-+++ src/Makefile.am	2015-01-29 13:10:02.000000000 +0100
-@@ -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 $(BDJAVA_CFLAGS)
- 
- AM_CFLAGS = -std=c99 $(SET_FEATURES) $(SET_INCLUDES) $(LIBXML2_CFLAGS) $(FT2_CFLAGS) $(FONTCONFIG_CFLAGS)
diff --git a/multimedia/libbluray/pkg-plist b/multimedia/libbluray/pkg-plist
index fc3d162bca24..b38651a530e5 100644
--- a/multimedia/libbluray/pkg-plist
+++ b/multimedia/libbluray/pkg-plist
@@ -11,6 +11,6 @@ include/libbluray/player_settings.h
 lib/libbluray.a
 lib/libbluray.so
 lib/libbluray.so.1
-lib/libbluray.so.1.7.0
+lib/libbluray.so.1.9.2
 libdata/pkgconfig/libbluray.pc
-%%JAVA%%%%JAVASHAREDIR%%/libbluray-j2se-0.7.0.jar
+%%JAVA%%%%JAVASHAREDIR%%/libbluray-j2se-0.9.2.jar