Index: branches/2019Q2/multimedia/libbluray/Makefile
===================================================================
--- branches/2019Q2/multimedia/libbluray/Makefile	(revision 502434)
+++ branches/2019Q2/multimedia/libbluray/Makefile	(revision 502435)
@@ -1,45 +1,51 @@
 # Created by: kamikaze@bsdforen.de
 # $FreeBSD$
 
 PORTNAME=	libbluray
-DISTVERSION=	1.0.2
+DISTVERSION=	1.1.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.videolan.org/pub/videolan/${PORTNAME}/${PORTVERSION}/ \
 		http://blu.opsec.eu/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Blu-Ray discs playback library for media players
 
 LICENSE=	LGPL21
 
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libfontconfig.so:x11-fonts/fontconfig
 # dlopen dependencies
 LIB_DEPENDS+=	libaacs.so:multimedia/libaacs \
 		libbdplus.so:multimedia/libbdplus
 
-USES=		iconv libtool pathfix pkgconfig tar:bzip2
+USES=		gnome iconv libtool pathfix pkgconfig tar:bzip2
+USE_GNOME=	libxml2
+USE_LDCONFIG=	yes
+
 GNU_CONFIGURE=	yes
+
 CONFIGURE_ARGS=	--disable-static
-USE_LDCONFIG=	yes
-USE_GNOME=	libxml2
+CONFIGURE_ENV=	PACKAGES="" # Bug #226009
+
 INSTALL_TARGET=	install-strip
 
 .include "Makefile.include"
 
 OPTIONS_DEFINE=	JAVA
 OPTIONS_SUB=	yes
+
 JAVA_DESC=	Enable Blu-Ray Java support
 
 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-jar
 JAVA_CONFIGURE_ENV=		JDK_HOME="${JAVA_HOME}"
+JAVA_USE=			JAVA=yes
+JAVA_VARS=			JAVA_VERSION=1.6+ JAVA_BUILD=yes JAVA_RUN=yes
 
 post-patch:
 	@${RLN} ${WRKSRC}/jni/linux ${WRKSRC}/jni/freebsd
 
 .include <bsd.port.mk>
Index: branches/2019Q2/multimedia/libbluray/distinfo
===================================================================
--- branches/2019Q2/multimedia/libbluray/distinfo	(revision 502434)
+++ branches/2019Q2/multimedia/libbluray/distinfo	(revision 502435)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1518820606
-SHA256 (libbluray-1.0.2.tar.bz2) = 6d9e7c4e416f664c330d9fa5a05ad79a3fb39b95adfc3fd6910cbed503b7aeff
-SIZE (libbluray-1.0.2.tar.bz2) = 733058
+TIMESTAMP = 1554632967
+SHA256 (libbluray-1.1.1.tar.bz2) = 106478a17c8bcac8c7b4174e7432b2bad5a1e6dd2926c4224791fd4669472338
+SIZE (libbluray-1.1.1.tar.bz2) = 746034
Index: branches/2019Q2/multimedia/libbluray/pkg-plist
===================================================================
--- branches/2019Q2/multimedia/libbluray/pkg-plist	(revision 502434)
+++ branches/2019Q2/multimedia/libbluray/pkg-plist	(revision 502435)
@@ -1,15 +1,16 @@
 bin/bd_info
 include/libbluray/bluray-version.h
 include/libbluray/bluray.h
 include/libbluray/clpi_data.h
 include/libbluray/filesystem.h
 include/libbluray/keys.h
 include/libbluray/log_control.h
 include/libbluray/meta_data.h
 include/libbluray/overlay.h
 include/libbluray/player_settings.h
 lib/libbluray.so
 lib/libbluray.so.2
-lib/libbluray.so.2.0.2
+lib/libbluray.so.2.1.1
 libdata/pkgconfig/libbluray.pc
-%%JAVA%%%%JAVASHAREDIR%%/libbluray-j2se-1.0.2.jar
+%%JAVA%%%%JAVASHAREDIR%%/libbluray-j2se-1.1.1.jar
+%%JAVA%%%%JAVASHAREDIR%%/libbluray-awt-j2se-1.1.1.jar
Index: branches/2019Q2
===================================================================
--- branches/2019Q2	(revision 502434)
+++ branches/2019Q2	(revision 502435)

Property changes on: branches/2019Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r498276,499532