From nobody@FreeBSD.org  Sun Apr 13 21:56:17 2014
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id AB6A5787
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 13 Apr 2014 21:56:17 +0000 (UTC)
Received: from cgiserv.freebsd.org (cgiserv.freebsd.org [IPv6:2001:1900:2254:206a::50:4])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(Client did not present a certificate)
	by mx1.freebsd.org (Postfix) with ESMTPS id 8B9E619C8
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 13 Apr 2014 21:56:17 +0000 (UTC)
Received: from cgiserv.freebsd.org ([127.0.1.6])
	by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s3DLuGeY082895
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 13 Apr 2014 21:56:16 GMT
	(envelope-from nobody@cgiserv.freebsd.org)
Received: (from nobody@localhost)
	by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s3DLuGsB082894;
	Sun, 13 Apr 2014 21:56:16 GMT
	(envelope-from nobody)
Message-Id: <201404132156.s3DLuGsB082894@cgiserv.freebsd.org>
Date: Sun, 13 Apr 2014 21:56:16 GMT
From: Dominic Fandrey <kamikaze@bsdforen.de>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [maintainer-update] multimedia/libaacs multimedia/libbluray
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         188573
>Category:       ports
>Synopsis:       [maintainer-update] multimedia/libaacs multimedia/libbluray
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    riggs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Apr 13 22:00:00 UTC 2014
>Closed-Date:    Sun Apr 27 14:25:38 UTC 2014
>Last-Modified:  Sun Apr 27 14:25:38 UTC 2014
>Originator:     Dominic Fandrey
>Release:        stable/10
>Organization:
private
>Environment:
FreeBSD AprilRyan.norad 10.0-STABLE FreeBSD 10.0-STABLE #1 r264294: Wed Apr  9 09:39:01 CEST 2014     root@AprilRyan.norad:/usr/obj/S403/amd64/usr/src/sys/S403  amd64
>Description:
Update libaacs from 0.6.0 to 0.7.0
- Library version was bumped, may require relinking of dependencies

Update libbluray from 0.3.0 to 0.5.0
- Unbreak JAVA options
- Library version was bumped, may require relinking of dependencies

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: multimedia/libaacs/Makefile
===================================================================
--- multimedia/libaacs/Makefile	(revision 351220)
+++ multimedia/libaacs/Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libaacs
-PORTVERSION=	0.6.0
+PORTVERSION=	0.7.0
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.videolan.org/pub/videolan/${PORTNAME}/${PORTVERSION}/ \
 		http://blu.opsec.eu/
@@ -30,18 +30,11 @@
 run-autotools:
 	@cd ${WRKSRC} && ${SH} bootstrap
 
-plist: build
+plist: stage
 	@${ECHO} "===> Rebuilding PLIST."
-	@${MKDIR} "${WRKDIR}/plist"
-	@cd ${WRKSRC} && ( \
-		${SETENV} ${CONFIGURE_ENV} ./configure ${CONFIGURE_ARGS} --prefix="${WRKDIR}/plist" && \
-		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} pkgconfigdir="${WRKDIR}/plist/libdata/pkgconfig" ${INSTALL_TARGET} ; \
-		${SETENV} ${CONFIGURE_ENV} ./configure ${CONFIGURE_ARGS} \
-	)
-	@${FIND} -ds "${WRKDIR}/plist/" -not -type d \
-		| ${SED} "s|${WRKDIR}/plist/||1" > ${PLIST}
-	@${FIND} -ds "${WRKDIR}/plist/" -type d -mindepth 2 \
-		| ${SED} -e "/pkgconfig/d" -e "s|${WRKDIR}/plist/|@dirrm |1" >> ${PLIST}
-	@${RM} -rf "${WRKDIR}/plist"
+	@${MTREE_CMD} -cp "${STAGEDIR}${PREFIX}/" > "${WRKDIR}/plist.mtree"
+	@${MTREE_CMD} -Sf "${WRKDIR}/plist.mtree" -f "${MTREE_FILE}" \
+		| ${SED} -ne '/ dir /{s/ .*//;s/^/@dirrm /;H;};t dirs' \
+		         -e 's/ .*//p;:dirs' -e '$${g;s/^\n//p;}' > ${PLIST}
 
 .include <bsd.port.mk>
Index: multimedia/libaacs/distinfo
===================================================================
--- multimedia/libaacs/distinfo	(revision 351220)
+++ multimedia/libaacs/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (libaacs-0.6.0.tar.bz2) = 8f1dadef40257280e5aff4242cca5bb81a0267921c7402f474156e3eb45ec1d9
-SIZE (libaacs-0.6.0.tar.bz2) = 331318
+SHA256 (libaacs-0.7.0.tar.bz2) = f0ecc8e9b2ed531da5f06d6e686992e5281eb906ab418577276e74d8f9a143c0
+SIZE (libaacs-0.7.0.tar.bz2) = 311337
Index: multimedia/libaacs/pkg-plist
===================================================================
--- multimedia/libaacs/pkg-plist	(revision 351220)
+++ multimedia/libaacs/pkg-plist	(working copy)
@@ -5,6 +5,6 @@
 lib/libaacs.a
 lib/libaacs.la
 lib/libaacs.so
-lib/libaacs.so.3
+lib/libaacs.so.4
 libdata/pkgconfig/libaacs.pc
 @dirrm include/libaacs
Index: multimedia/libbluray/Makefile
===================================================================
--- multimedia/libbluray/Makefile	(revision 351220)
+++ multimedia/libbluray/Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libbluray
-PORTVERSION=	0.3.0
+PORTVERSION=	0.5.0
 PORTEPOCH=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.videolan.org/pub/videolan/${PORTNAME}/${PORTVERSION}/ \
@@ -33,11 +33,10 @@
 .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=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.6+
 JAVA_BUILD=	yes
 JAVA_RUN=	yes
 CONFIGURE_ARGS+=	--enable-bdjava --with-bdj-type=j2se
@@ -44,21 +43,36 @@
 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: build
+plist:
 	@${ECHO} "===> Rebuilding PLIST."
-	@${MKDIR} "${WRKDIR}/plist"
-	@cd ${WRKSRC} && ( \
-		${SETENV} ${CONFIGURE_ENV} ./configure ${CONFIGURE_ARGS} --prefix="${WRKDIR}/plist" && \
-		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} pkgconfigdir="${WRKDIR}/plist/libdata/pkgconfig" ${INSTALL_TARGET} ; \
-		${SETENV} ${CONFIGURE_ENV} ./configure ${CONFIGURE_ARGS} \
-	)
-	@${FIND} -ds "${WRKDIR}/plist/" -not -type d \
-		| ${SED} "s|${WRKDIR}/plist/||1" > ${PLIST}
-	@${FIND} -ds "${WRKDIR}/plist/" -type d -mindepth 2 \
-		| ${SED} -e "/pkgconfig/d" -e "s|${WRKDIR}/plist/|@dirrm |1" >> ${PLIST}
-	@${RM} -rf "${WRKDIR}/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./}
 
 .include <bsd.port.mk>
Index: multimedia/libbluray/distinfo
===================================================================
--- multimedia/libbluray/distinfo	(revision 351220)
+++ multimedia/libbluray/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (libbluray-0.3.0.tar.bz2) = dc73ad618052ddd2d72bb847c8e5b9a1c9175db7b18d0456b21f484836c30038
-SIZE (libbluray-0.3.0.tar.bz2) = 510993
+SHA256 (libbluray-0.5.0.tar.bz2) = 19213e193e1abc5ed2de65edfb539deda1dbf6cc64dfef03e405524c9c6f7216
+SIZE (libbluray-0.5.0.tar.bz2) = 559639
Index: multimedia/libbluray/files/patch-src-Makefile.am
===================================================================
--- multimedia/libbluray/files/patch-src-Makefile.am	(revision 0)
+++ multimedia/libbluray/files/patch-src-Makefile.am	(working copy)
@@ -0,0 +1,7 @@
+--- 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)

Property changes on: multimedia/libbluray/files/patch-src-Makefile.am
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: multimedia/libbluray/files/patch-util-refcnt.h
===================================================================
--- multimedia/libbluray/files/patch-util-refcnt.h	(revision 0)
+++ multimedia/libbluray/files/patch-util-refcnt.h	(working copy)
@@ -0,0 +1,11 @@
+--- src/util/refcnt.h.orig	2014-04-13 17:52:33.000000000 +0200
++++ src/util/refcnt.h	2014-04-13 17:52:43.000000000 +0200
+@@ -18,7 +18,7 @@
+  */
+ 
+ #ifndef BD_REFCNT_H_
+-#define BD_FEFCNT_H_
++#define BD_REFCNT_H_
+ 
+ #include "attributes.h"
+ 

Property changes on: multimedia/libbluray/files/patch-util-refcnt.h
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: multimedia/libbluray/pkg-plist
===================================================================
--- multimedia/libbluray/pkg-plist	(revision 351220)
+++ multimedia/libbluray/pkg-plist	(working copy)
@@ -10,6 +10,8 @@
 lib/libbluray.a
 lib/libbluray.la
 lib/libbluray.so
-lib/libbluray.so.4
+lib/libbluray.so.6
 libdata/pkgconfig/libbluray.pc
 @dirrm include/libbluray
+%%JAVA%%lib/libbluray/libbluray.jar
+%%JAVA%%@dirrm lib/libbluray


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->riggs 
Responsible-Changed-By: riggs 
Responsible-Changed-When: Sat Apr 26 17:18:09 UTC 2014 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=188573 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/188573: commit references a PR
Date: Sun, 27 Apr 2014 14:14:34 +0000 (UTC)

 Author: riggs
 Date: Sun Apr 27 14:14:26 2014
 New Revision: 352423
 URL: http://svnweb.freebsd.org/changeset/ports/352423
 QAT: https://qat.redports.org/buildarchive/r352423/
 
 Log:
   - Update libaacs to 0.7.0
     - Add LICENSE
     - USES tar:bzip2
   - Update libbluray 0.5.0
     - Unbreak JAVA option
     - USES tar:bzip2
   - Bump PORTREVISION in depdendent ports due to shared lib version bump
   
   PR:		ports/188573
   Submitted by:	Dominic Fandrey <kamikaze@bsdforen.de> (maintainer)
   Approved by:	thierry (mentor)
 
 Added:
   head/multimedia/libbluray/files/
   head/multimedia/libbluray/files/patch-src-Makefile.am   (contents, props changed)
   head/multimedia/libbluray/files/patch-util-refcnt.h   (contents, props changed)
 Modified:
   head/multimedia/ffmpeg/Makefile
   head/multimedia/libaacs/Makefile
   head/multimedia/libaacs/distinfo
   head/multimedia/libaacs/pkg-plist
   head/multimedia/libbluray/Makefile
   head/multimedia/libbluray/distinfo
   head/multimedia/libbluray/pkg-plist
   head/multimedia/libxine/Makefile
   head/multimedia/mplayer2/Makefile
   head/multimedia/mpv/Makefile
   head/multimedia/vdr-plugin-xineliboutput/Makefile
   head/multimedia/vlc/Makefile
   head/multimedia/xbmc/Makefile
 
 Modified: head/multimedia/ffmpeg/Makefile
 ==============================================================================
 --- head/multimedia/ffmpeg/Makefile	Sun Apr 27 14:11:30 2014	(r352422)
 +++ head/multimedia/ffmpeg/Makefile	Sun Apr 27 14:14:26 2014	(r352423)
 @@ -3,7 +3,7 @@
  
  PORTNAME=	ffmpeg
  PORTVERSION=	2.1.1
 -PORTREVISION=	2
 +PORTREVISION=	3
  PORTEPOCH=	1
  CATEGORIES=	multimedia audio ipv6 net
  MASTER_SITES=	http://ffmpeg.org/releases/
 
 Modified: head/multimedia/libaacs/Makefile
 ==============================================================================
 --- head/multimedia/libaacs/Makefile	Sun Apr 27 14:11:30 2014	(r352422)
 +++ head/multimedia/libaacs/Makefile	Sun Apr 27 14:14:26 2014	(r352423)
 @@ -2,7 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	libaacs
 -PORTVERSION=	0.6.0
 +PORTVERSION=	0.7.0
  CATEGORIES=	multimedia
  MASTER_SITES=	ftp://ftp.videolan.org/pub/videolan/${PORTNAME}/${PORTVERSION}/ \
  		http://blu.opsec.eu/
 @@ -10,14 +10,15 @@ MASTER_SITES=	ftp://ftp.videolan.org/pub
  MAINTAINER=	kamikaze@bsdforen.de
  COMMENT=	Advanced Access Content System implementation
  
 +LICENSE=	LGPL21
 +
  BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
  LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt \
  		libgpg-error.so:${PORTSDIR}/security/libgpg-error
  
 -USE_BZIP2=	yes
  USE_LDCONFIG=	yes
  USE_AUTOTOOLS=	autoconf aclocal automake libtool
 -USES=		bison gettext iconv
 +USES=		bison gettext iconv tar:bzip2
  
  HAS_CONFIGURE=	yes
  CONFIGURE_ENV+=	LEX="${LOCALBASE}/bin/flex"
 @@ -30,18 +31,11 @@ MAKE_ARGS+=	pkgconfigdir="${PREFIX}/libd
  run-autotools:
  	@cd ${WRKSRC} && ${SH} bootstrap
  
 -plist: build
 +plist: stage
  	@${ECHO} "===> Rebuilding PLIST."
 -	@${MKDIR} "${WRKDIR}/plist"
 -	@cd ${WRKSRC} && ( \
 -		${SETENV} ${CONFIGURE_ENV} ./configure ${CONFIGURE_ARGS} --prefix="${WRKDIR}/plist" && \
 -		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} pkgconfigdir="${WRKDIR}/plist/libdata/pkgconfig" ${INSTALL_TARGET} ; \
 -		${SETENV} ${CONFIGURE_ENV} ./configure ${CONFIGURE_ARGS} \
 -	)
 -	@${FIND} -ds "${WRKDIR}/plist/" -not -type d \
 -		| ${SED} "s|${WRKDIR}/plist/||1" > ${PLIST}
 -	@${FIND} -ds "${WRKDIR}/plist/" -type d -mindepth 2 \
 -		| ${SED} -e "/pkgconfig/d" -e "s|${WRKDIR}/plist/|@dirrm |1" >> ${PLIST}
 -	@${RM} -rf "${WRKDIR}/plist"
 +	@${MTREE_CMD} -cp "${STAGEDIR}${PREFIX}/" > "${WRKDIR}/plist.mtree"
 +	@${MTREE_CMD} -Sf "${WRKDIR}/plist.mtree" -f "${MTREE_FILE}" \
 +		| ${SED} -ne '/ dir /{s/ .*//;s/^/@dirrm /;H;};t dirs' \
 +		         -e 's/ .*//p;:dirs' -e '$${g;s/^\n//p;}' > ${PLIST}
  
  .include <bsd.port.mk>
 
 Modified: head/multimedia/libaacs/distinfo
 ==============================================================================
 --- head/multimedia/libaacs/distinfo	Sun Apr 27 14:11:30 2014	(r352422)
 +++ head/multimedia/libaacs/distinfo	Sun Apr 27 14:14:26 2014	(r352423)
 @@ -1,2 +1,2 @@
 -SHA256 (libaacs-0.6.0.tar.bz2) = 8f1dadef40257280e5aff4242cca5bb81a0267921c7402f474156e3eb45ec1d9
 -SIZE (libaacs-0.6.0.tar.bz2) = 331318
 +SHA256 (libaacs-0.7.0.tar.bz2) = f0ecc8e9b2ed531da5f06d6e686992e5281eb906ab418577276e74d8f9a143c0
 +SIZE (libaacs-0.7.0.tar.bz2) = 311337
 
 Modified: head/multimedia/libaacs/pkg-plist
 ==============================================================================
 --- head/multimedia/libaacs/pkg-plist	Sun Apr 27 14:11:30 2014	(r352422)
 +++ head/multimedia/libaacs/pkg-plist	Sun Apr 27 14:14:26 2014	(r352423)
 @@ -5,6 +5,6 @@ include/libaacs/filesystem.h
  lib/libaacs.a
  lib/libaacs.la
  lib/libaacs.so
 -lib/libaacs.so.3
 +lib/libaacs.so.4
  libdata/pkgconfig/libaacs.pc
  @dirrm include/libaacs
 
 Modified: head/multimedia/libbluray/Makefile
 ==============================================================================
 --- head/multimedia/libbluray/Makefile	Sun Apr 27 14:11:30 2014	(r352422)
 +++ head/multimedia/libbluray/Makefile	Sun Apr 27 14:14:26 2014	(r352423)
 @@ -2,8 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	libbluray
 -PORTVERSION=	0.3.0
 -PORTREVISION=	1
 +PORTVERSION=	0.5.0
  PORTEPOCH=	1
  CATEGORIES=	multimedia
  MASTER_SITES=	ftp://ftp.videolan.org/pub/videolan/${PORTNAME}/${PORTVERSION}/ \
 @@ -14,14 +13,14 @@ COMMENT=	Blu-Ray discs playback library 
  
  LICENSE=	LGPL21
  
 -LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2
 +LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
  # dlopen dependencies, libbdplus not yet available
  LIB_DEPENDS+=	libaacs.so:${PORTSDIR}/multimedia/libaacs
  
 -USES=		iconv pkgconfig
 +USES=		iconv pkgconfig tar:bzip2
  USE_LDCONFIG=	yes
 -USE_BZIP2=	yes
  USE_AUTOTOOLS=	autoconf aclocal automake libtool
 +USE_GNOME=	libxml2
  
  HAS_CONFIGURE=	yes
  MAKE_ARGS=	pkgconfigdir="${PREFIX}/libdata/pkgconfig"
 @@ -34,32 +33,46 @@ JAVA_DESC=	Enable Blu-Ray Java support
  .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=	yes
 -JAVA_VERSION=	1.4+
 +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
  
 +# 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: build
 +plist:
  	@${ECHO} "===> Rebuilding PLIST."
 -	@${MKDIR} "${WRKDIR}/plist"
 -	@cd ${WRKSRC} && ( \
 -		${SETENV} ${CONFIGURE_ENV} ./configure ${CONFIGURE_ARGS} --prefix="${WRKDIR}/plist" && \
 -		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} pkgconfigdir="${WRKDIR}/plist/libdata/pkgconfig" ${INSTALL_TARGET} ; \
 -		${SETENV} ${CONFIGURE_ENV} ./configure ${CONFIGURE_ARGS} \
 -	)
 -	@${FIND} -ds "${WRKDIR}/plist/" -not -type d \
 -		| ${SED} "s|${WRKDIR}/plist/||1" > ${PLIST}
 -	@${FIND} -ds "${WRKDIR}/plist/" -type d -mindepth 2 \
 -		| ${SED} -e "/pkgconfig/d" -e "s|${WRKDIR}/plist/|@dirrm |1" >> ${PLIST}
 -	@${RM} -rf "${WRKDIR}/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./}
  
  .include <bsd.port.mk>
 
 Modified: head/multimedia/libbluray/distinfo
 ==============================================================================
 --- head/multimedia/libbluray/distinfo	Sun Apr 27 14:11:30 2014	(r352422)
 +++ head/multimedia/libbluray/distinfo	Sun Apr 27 14:14:26 2014	(r352423)
 @@ -1,2 +1,2 @@
 -SHA256 (libbluray-0.3.0.tar.bz2) = dc73ad618052ddd2d72bb847c8e5b9a1c9175db7b18d0456b21f484836c30038
 -SIZE (libbluray-0.3.0.tar.bz2) = 510993
 +SHA256 (libbluray-0.5.0.tar.bz2) = 19213e193e1abc5ed2de65edfb539deda1dbf6cc64dfef03e405524c9c6f7216
 +SIZE (libbluray-0.5.0.tar.bz2) = 559639
 
 Added: head/multimedia/libbluray/files/patch-src-Makefile.am
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/multimedia/libbluray/files/patch-src-Makefile.am	Sun Apr 27 14:14:26 2014	(r352423)
 @@ -0,0 +1,7 @@
 +--- 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)
 
 Added: head/multimedia/libbluray/files/patch-util-refcnt.h
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/multimedia/libbluray/files/patch-util-refcnt.h	Sun Apr 27 14:14:26 2014	(r352423)
 @@ -0,0 +1,11 @@
 +--- src/util/refcnt.h.orig	2014-04-13 17:52:33.000000000 +0200
 ++++ src/util/refcnt.h	2014-04-13 17:52:43.000000000 +0200
 +@@ -18,7 +18,7 @@
 +  */
 + 
 + #ifndef BD_REFCNT_H_
 +-#define BD_FEFCNT_H_
 ++#define BD_REFCNT_H_
 + 
 + #include "attributes.h"
 + 
 
 Modified: head/multimedia/libbluray/pkg-plist
 ==============================================================================
 --- head/multimedia/libbluray/pkg-plist	Sun Apr 27 14:11:30 2014	(r352422)
 +++ head/multimedia/libbluray/pkg-plist	Sun Apr 27 14:14:26 2014	(r352423)
 @@ -10,6 +10,8 @@ include/libbluray/overlay.h
  lib/libbluray.a
  lib/libbluray.la
  lib/libbluray.so
 -lib/libbluray.so.4
 +lib/libbluray.so.6
  libdata/pkgconfig/libbluray.pc
  @dirrm include/libbluray
 +%%JAVA%%lib/libbluray/libbluray.jar
 +%%JAVA%%@dirrm lib/libbluray
 
 Modified: head/multimedia/libxine/Makefile
 ==============================================================================
 --- head/multimedia/libxine/Makefile	Sun Apr 27 14:11:30 2014	(r352422)
 +++ head/multimedia/libxine/Makefile	Sun Apr 27 14:14:26 2014	(r352423)
 @@ -3,7 +3,7 @@
  
  PORTNAME=	xine
  PORTVERSION=	1.2.4
 -PORTREVISION=	6
 +PORTREVISION=	7
  CATEGORIES=	multimedia ipv6
  MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-lib/${PORTVERSION}
  PKGNAMEPREFIX=	lib
 
 Modified: head/multimedia/mplayer2/Makefile
 ==============================================================================
 --- head/multimedia/mplayer2/Makefile	Sun Apr 27 14:11:30 2014	(r352422)
 +++ head/multimedia/mplayer2/Makefile	Sun Apr 27 14:14:26 2014	(r352423)
 @@ -2,7 +2,7 @@
  
  PORTNAME=	mplayer2
  PORTVERSION=	${MPLAYER2_PORT_VERSION}
 -PORTREVISION=	3
 +PORTREVISION=	4
  CATEGORIES=	multimedia audio
  MASTER_SITES=	LOCAL/gblach/
  
 
 Modified: head/multimedia/mpv/Makefile
 ==============================================================================
 --- head/multimedia/mpv/Makefile	Sun Apr 27 14:11:30 2014	(r352422)
 +++ head/multimedia/mpv/Makefile	Sun Apr 27 14:14:26 2014	(r352423)
 @@ -3,7 +3,7 @@
  
  PORTNAME=	mpv
  PORTVERSION=	0.3.7
 -PORTREVISION=	1
 +PORTREVISION=	2
  PORTEPOCH=	1
  CATEGORIES=	multimedia audio
  MASTER_SITES=	GH:0 GHC:0 http://waf.googlecode.com/files/:1
 
 Modified: head/multimedia/vdr-plugin-xineliboutput/Makefile
 ==============================================================================
 --- head/multimedia/vdr-plugin-xineliboutput/Makefile	Sun Apr 27 14:11:30 2014	(r352422)
 +++ head/multimedia/vdr-plugin-xineliboutput/Makefile	Sun Apr 27 14:14:26 2014	(r352423)
 @@ -3,7 +3,7 @@
  
  PORTNAME=	vdr-plugin-xineliboutput
  PORTVERSION=	1.0.90s20120511
 -PORTREVISION=	9
 +PORTREVISION=	10
  CATEGORIES=	multimedia
  MASTER_SITES=	SF:release \
  		LOCAL:snapshot
 
 Modified: head/multimedia/vlc/Makefile
 ==============================================================================
 --- head/multimedia/vlc/Makefile	Sun Apr 27 14:11:30 2014	(r352422)
 +++ head/multimedia/vlc/Makefile	Sun Apr 27 14:14:26 2014	(r352423)
 @@ -3,7 +3,7 @@
  
  PORTNAME=	vlc
  DISTVERSION=	2.1.2
 -PORTREVISION=	5
 +PORTREVISION=	6
  PORTEPOCH=	4
  CATEGORIES=	multimedia audio ipv6 net www
  MASTER_SITES=	http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \
 
 Modified: head/multimedia/xbmc/Makefile
 ==============================================================================
 --- head/multimedia/xbmc/Makefile	Sun Apr 27 14:11:30 2014	(r352422)
 +++ head/multimedia/xbmc/Makefile	Sun Apr 27 14:14:26 2014	(r352423)
 @@ -2,7 +2,7 @@
  
  PORTNAME=	xbmc
  DISTVERSION=	13.0.beta1
 -PORTREVISION=	1
 +PORTREVISION=	2
  CATEGORIES=	multimedia
  
  MAINTAINER=	mickael.maillot@gmail.com
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: riggs 
State-Changed-When: Sun Apr 27 14:25:37 UTC 2014 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=188573 
>Unformatted:
