--- multimedia/libaacs/Makefile	(revision 325249)
+++ multimedia/libaacs/Makefile	(working copy)
@@ -2,8 +2,7 @@ 
 # $FreeBSD$
 
 PORTNAME=	libaacs
-PORTVERSION=	0.3.0
-PORTREVISION=	1
+PORTVERSION=	0.6.0
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.videolan.org/pub/videolan/${PORTNAME}/${PORTVERSION}/ \
 		http://blu.opsec.eu/
@@ -13,7 +12,7 @@ 
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
 LIB_DEPENDS=	gcrypt:${PORTSDIR}/security/libgcrypt \
-		gpg-error.0:${PORTSDIR}/security/libgpg-error
+		gpg-error:${PORTSDIR}/security/libgpg-error
 
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
@@ -23,8 +22,7 @@ 
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV+=	LEX="${LOCALBASE}/bin/flex"
 CONFIGURE_ARGS+=	--prefix="${PREFIX}" \
-		--disable-debug \
-		--disable-optimizations
+		--disable-debug
 # Evil hack, necessitating another evil hack in the plist target.
 MAKE_ARGS+=	pkgconfigdir="${PREFIX}/libdata/pkgconfig" \
 		CFLAGS=${CFLAGS:Q}
--- multimedia/libaacs/distinfo	(revision 325249)
+++ multimedia/libaacs/distinfo	(working copy)
@@ -1,2 +1,2 @@ 
-SHA256 (libaacs-0.3.0.tar.bz2) = bf92dab1a6a8ee08a55e8cf347c2cda49e6535b52e85bb1e92e1cfcc8ecec22c
-SIZE (libaacs-0.3.0.tar.bz2) = 313776
+SHA256 (libaacs-0.6.0.tar.bz2) = 8f1dadef40257280e5aff4242cca5bb81a0267921c7402f474156e3eb45ec1d9
+SIZE (libaacs-0.6.0.tar.bz2) = 331318
--- multimedia/libaacs/pkg-descr	(revision 325249)
+++ multimedia/libaacs/pkg-descr	(working copy)
@@ -5,4 +5,4 @@ 
 This research project is mainly developed by an international team of developers
 from Doom9.
 
-WWW:	http://www.videolan.org/developers/libaacs.html
+WWW: http://www.videolan.org/developers/libaacs.html
--- multimedia/libaacs/pkg-plist	(revision 325249)
+++ multimedia/libaacs/pkg-plist	(working copy)
@@ -1,3 +1,4 @@ 
+bin/aacs_info
 include/libaacs/aacs-version.h
 include/libaacs/aacs.h
 include/libaacs/filesystem.h
@@ -4,6 +5,6 @@ 
 lib/libaacs.a
 lib/libaacs.la
 lib/libaacs.so
-lib/libaacs.so.1
+lib/libaacs.so.3
 libdata/pkgconfig/libaacs.pc
 @dirrm include/libaacs
--- multimedia/libbluray/Makefile	(revision 325249)
+++ multimedia/libbluray/Makefile	(working copy)
@@ -2,7 +2,7 @@ 
 # $FreeBSD$
 
 PORTNAME=	libbluray
-PORTVERSION=	0.2.2
+PORTVERSION=	0.3.0
 PORTEPOCH=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.videolan.org/pub/videolan/${PORTNAME}/${PORTVERSION}/ \
@@ -11,9 +11,9 @@ 
 MAINTAINER=	kamikaze@bsdforen.de
 COMMENT=	Blu-Ray discs playback library for media players
 
-LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	xml2:${PORTSDIR}/textproc/libxml2
 # dlopen dependencies, libbdplus not yet available
-LIB_DEPENDS+=	aacs.1:${PORTSDIR}/multimedia/libaacs
+LIB_DEPENDS+=	aacs:${PORTSDIR}/multimedia/libaacs
 
 USES=		iconv
 USE_LDCONFIG=	yes
@@ -21,11 +21,9 @@ 
 USE_AUTOTOOLS=	autoconf aclocal automake libtool
 
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--prefix="${PREFIX}" \
-		--disable-debug \
-		--disable-optimizations
-MAKE_ARGS+=	pkgconfigdir="${PREFIX}/libdata/pkgconfig" \
-		CFLAGS=${CFLAGS:Q}
+MAKE_ARGS=	pkgconfigdir="${PREFIX}/libdata/pkgconfig"
+CONFIGURE_ARGS=	--prefix="${PREFIX}" \
+		--disable-debug
 
 OPTIONS_DEFINE=	JAVA
 JAVA_DESC=	Enable Blu-Ray Java support
@@ -33,13 +31,15 @@ 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MJAVA}
+BROKEN=		Does not build with JAVA
 BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
 CATEGORIES+=	java
-USE_JAVA=	1.6+
+USE_JAVA=	yes
+JAVA_VERSION=	1.4+
 JAVA_BUILD=	yes
 JAVA_RUN=	yes
-CONFIGURE_ARGS+=	--enable-bdjava \
-		--with-jdk="${JAVA_HOME}"
+CONFIGURE_ARGS+=	--enable-bdjava --with-bdj-type=j2se
+CONFIGURE_ENV+=	JDK_HOME="${JAVA_HOME}"
 .endif
 
 run-autotools:
--- multimedia/libbluray/distinfo	(revision 325249)
+++ multimedia/libbluray/distinfo	(working copy)
@@ -1,2 +1,2 @@ 
-SHA256 (libbluray-0.2.2.tar.bz2) = 46fa6ff8b18b66cb478a081981a61230fd3909e1a867eaf81325569224da7173
-SIZE (libbluray-0.2.2.tar.bz2) = 456025
+SHA256 (libbluray-0.3.0.tar.bz2) = dc73ad618052ddd2d72bb847c8e5b9a1c9175db7b18d0456b21f484836c30038
+SIZE (libbluray-0.3.0.tar.bz2) = 510993
--- multimedia/libbluray/pkg-descr	(revision 325249)
+++ multimedia/libbluray/pkg-descr	(working copy)
@@ -4,4 +4,4 @@ 
 This research project is developed by an international team of developers from
 Doom9.
 
-WWW:	http://www.videolan.org/developers/libbluray.html
+WWW: http://www.videolan.org/developers/libbluray.html
--- multimedia/libbluray/pkg-plist	(revision 325249)
+++ multimedia/libbluray/pkg-plist	(working copy)
@@ -1,3 +1,4 @@ 
+bin/bd_info
 include/libbluray/bluray-version.h
 include/libbluray/bluray.h
 include/libbluray/clpi_data.h
@@ -9,6 +10,6 @@ 
 lib/libbluray.a
 lib/libbluray.la
 lib/libbluray.so
-lib/libbluray.so.2
+lib/libbluray.so.4
 libdata/pkgconfig/libbluray.pc
 @dirrm include/libbluray