From owner-svn-ports-all@freebsd.org Mon Apr 25 21:58:47 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0A246B1C78E; Mon, 25 Apr 2016 21:58:47 +0000 (UTC) (envelope-from kami@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B8B951990; Mon, 25 Apr 2016 21:58:46 +0000 (UTC) (envelope-from kami@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3PLwjWS024530; Mon, 25 Apr 2016 21:58:45 GMT (envelope-from kami@FreeBSD.org) Received: (from kami@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3PLwjSP024524; Mon, 25 Apr 2016 21:58:45 GMT (envelope-from kami@FreeBSD.org) Message-Id: <201604252158.u3PLwjSP024524@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kami set sender to kami@FreeBSD.org using -f From: Dominic Fandrey Date: Mon, 25 Apr 2016 21:58:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r414031 - in head/multimedia: libaacs libaacs/files libbluray libbluray/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Apr 2016 21:58:47 -0000 Author: kami Date: Mon Apr 25 21:58:45 2016 New Revision: 414031 URL: https://svnweb.freebsd.org/changeset/ports/414031 Log: Update libbluray and related libraries Also clean up/modernise Makefiles. Reviewed by: cs Approved by: cs Differential Revision: https://reviews.freebsd.org/D5743 Deleted: head/multimedia/libaacs/files/ head/multimedia/libbluray/files/ Modified: 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 Modified: head/multimedia/libaacs/Makefile ============================================================================== --- head/multimedia/libaacs/Makefile Mon Apr 25 21:40:52 2016 (r414030) +++ head/multimedia/libaacs/Makefile Mon Apr 25 21:58:45 2016 (r414031) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libaacs -PORTVERSION= 0.8.0 +PORTVERSION= 0.8.1 CATEGORIES= multimedia MASTER_SITES= ftp://ftp.videolan.org/pub/videolan/${PORTNAME}/${PORTVERSION}/ \ http://blu.opsec.eu/ Modified: head/multimedia/libaacs/distinfo ============================================================================== --- head/multimedia/libaacs/distinfo Mon Apr 25 21:40:52 2016 (r414030) +++ head/multimedia/libaacs/distinfo Mon Apr 25 21:58:45 2016 (r414031) @@ -1,2 +1,2 @@ -SHA256 (libaacs-0.8.0.tar.bz2) = 5e44545c7c4cb48bea49ff6b19d148416663593d6125ac8734776df21154ba94 -SIZE (libaacs-0.8.0.tar.bz2) = 311904 +SHA256 (libaacs-0.8.1.tar.bz2) = 95c344a02c47c9753c50a5386fdfb8313f9e4e95949a5c523a452f0bcb01bbe8 +SIZE (libaacs-0.8.1.tar.bz2) = 315231 Modified: head/multimedia/libaacs/pkg-plist ============================================================================== --- head/multimedia/libaacs/pkg-plist Mon Apr 25 21:40:52 2016 (r414030) +++ head/multimedia/libaacs/pkg-plist Mon Apr 25 21:58:45 2016 (r414031) @@ -5,5 +5,5 @@ include/libaacs/filesystem.h lib/libaacs.a lib/libaacs.so lib/libaacs.so.0 -lib/libaacs.so.0.5.0 +lib/libaacs.so.0.5.1 libdata/pkgconfig/libaacs.pc Modified: head/multimedia/libbluray/Makefile ============================================================================== --- head/multimedia/libbluray/Makefile Mon Apr 25 21:40:52 2016 (r414030) +++ head/multimedia/libbluray/Makefile Mon Apr 25 21:58:45 2016 (r414031) @@ -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 - -.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 Modified: head/multimedia/libbluray/distinfo ============================================================================== --- head/multimedia/libbluray/distinfo Mon Apr 25 21:40:52 2016 (r414030) +++ head/multimedia/libbluray/distinfo Mon Apr 25 21:58:45 2016 (r414031) @@ -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 Modified: head/multimedia/libbluray/pkg-plist ============================================================================== --- head/multimedia/libbluray/pkg-plist Mon Apr 25 21:40:52 2016 (r414030) +++ head/multimedia/libbluray/pkg-plist Mon Apr 25 21:58:45 2016 (r414031) @@ -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