From owner-svn-ports-all@FreeBSD.ORG Sun May 3 16:32:29 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 71652C97; Sun, 3 May 2015 16:32:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 5E47D1E96; Sun, 3 May 2015 16:32:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t43GWT2c076497; Sun, 3 May 2015 16:32:29 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t43GWSqc076489; Sun, 3 May 2015 16:32:28 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201505031632.t43GWSqc076489@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sun, 3 May 2015 16:32:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r385287 - in head/multimedia/dvdstyler: . 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.20 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: Sun, 03 May 2015 16:32:29 -0000 Author: riggs Date: Sun May 3 16:32:27 2015 New Revision: 385287 URL: https://svnweb.freebsd.org/changeset/ports/385287 Log: - Update to upstream version 2.9.2 - USE_AUTOTOOLS -> USES - Pet portlint - Add -std=c++11 to CXXFLAGS for gcc (does not build on pre-10.x system without it) PR: 199245 Submitted by: tkato432@yahoo.com Reviewed by: riggs Modified: head/multimedia/dvdstyler/Makefile head/multimedia/dvdstyler/distinfo head/multimedia/dvdstyler/files/patch-configure.ac head/multimedia/dvdstyler/files/patch-docs-Makefile.in head/multimedia/dvdstyler/pkg-plist Modified: head/multimedia/dvdstyler/Makefile ============================================================================== --- head/multimedia/dvdstyler/Makefile Sun May 3 16:07:14 2015 (r385286) +++ head/multimedia/dvdstyler/Makefile Sun May 3 16:32:27 2015 (r385287) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= dvdstyler -PORTVERSION= 2.8 -PORTREVISION= 3 +PORTVERSION= 2.9.2 PORTEPOCH= 2 CATEGORIES= multimedia MASTER_SITES= SF @@ -30,14 +29,14 @@ RUN_DEPENDS= zip:${PORTSDIR}/archivers/z mkisofs:${PORTSDIR}/sysutils/cdrtools \ growisofs:${PORTSDIR}/sysutils/dvd+rw-tools -USES= gettext gmake pkgconfig tar:bzip2 +USES= autoreconf compiler:c++11-lib gettext gmake pkgconfig tar:bzip2 USE_WX= 3.0 +GNU_CONFIGURE= yes WX_UNICODE= yes WX_CONF_ARGS= absolute -USE_AUTOTOOLS= aclocal automake autoconf ACLOCAL_ARGS= -I ${WRKSRC} AUTOMAKE_ARGS= --add-missing --copy --force-missing --foreign -CONFIGURE_ENV= ac_cv_path_AVCONV_PATH="" +CONFIGURE_ENV= ac_cv_path_AVCONV_PATH="" OBJCXX="${CXX}" CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -47,7 +46,7 @@ OPTIONS_DEFINE= DOCS GNOME GNOME_USE= GNOME=libgnomeui GNOME_CONFIGURE_WITH= gnome -.include +.include .if defined(WITH_DVD_DEVICE) DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE} @@ -55,6 +54,10 @@ DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE} DEFAULT_DVD_DEVICE=/dev/cd0 .endif +.if ${CHOSEN_COMPILER_TYPE} == "gcc" +CXXFLAGS+= -std=c++11 +.endif + pre-everything:: .if !defined(WITH_DVD_DEVICE) @${ECHO_MSG} "===>" @@ -63,9 +66,6 @@ pre-everything:: @${ECHO_MSG} "===> For example, 'make WITH_DVD_DEVICE=\"/dev/somedevice\"'" .endif -post-extract: - @${ECHO_CMD} -n > ${WRKSRC}/NEWS - post-patch: @${REINPLACE_CMD} -e '/doc_DATA/s|COPYING||' \ ${WRKSRC}/Makefile.am @@ -76,4 +76,4 @@ post-patch: @${REINPLACE_CMD} -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|g' \ ${WRKSRC}/src/Config.h -.include +.include Modified: head/multimedia/dvdstyler/distinfo ============================================================================== --- head/multimedia/dvdstyler/distinfo Sun May 3 16:07:14 2015 (r385286) +++ head/multimedia/dvdstyler/distinfo Sun May 3 16:32:27 2015 (r385287) @@ -1,2 +1,2 @@ -SHA256 (DVDStyler-2.8.tar.bz2) = 90fabb6f97f980c0dbc244c658b9b7bf80336e2059eb8e70998bfcc5b8b3bba2 -SIZE (DVDStyler-2.8.tar.bz2) = 6341733 +SHA256 (DVDStyler-2.9.2.tar.bz2) = 88abd17b0dcdfccbdfffe6e80bcfa59df023f1ff2eed782e58d1f793a81dbd1f +SIZE (DVDStyler-2.9.2.tar.bz2) = 7861116 Modified: head/multimedia/dvdstyler/files/patch-configure.ac ============================================================================== --- head/multimedia/dvdstyler/files/patch-configure.ac Sun May 3 16:07:14 2015 (r385286) +++ head/multimedia/dvdstyler/files/patch-configure.ac Sun May 3 16:32:27 2015 (r385287) @@ -1,6 +1,6 @@ ---- configure.ac.orig +--- configure.ac.orig 2015-02-17 21:14:03 UTC +++ configure.ac -@@ -9,6 +9,7 @@ +@@ -9,6 +9,7 @@ AM_MAINTAINER_MODE dnl options AM_OPTIONS_WXCONFIG AC_ARG_ENABLE(debug, [ --enable-debug Enable debugging information], USE_DEBUG="$enableval", USE_DEBUG="no") @@ -8,7 +8,7 @@ AC_MSG_CHECKING(for install location) case "$prefix" in -@@ -111,7 +112,9 @@ +@@ -112,7 +113,9 @@ if test "x$WXSVGLIBAV" = x"no"; then fi dnl check gnomeui-2.0 Modified: head/multimedia/dvdstyler/files/patch-docs-Makefile.in ============================================================================== --- head/multimedia/dvdstyler/files/patch-docs-Makefile.in Sun May 3 16:07:14 2015 (r385286) +++ head/multimedia/dvdstyler/files/patch-docs-Makefile.in Sun May 3 16:32:27 2015 (r385287) @@ -1,11 +1,11 @@ ---- docs/Makefile.in.orig +--- docs/Makefile.in.orig 2015-02-17 21:35:57 UTC +++ docs/Makefile.in -@@ -461,7 +461,7 @@ uninstall-man: uninstall-man1 +@@ -551,7 +551,7 @@ uninstall-man: uninstall-man1 help_%.zip: DVDStylerGuide_%.xml t=`mktemp -d tempXXXXXXX`; \ - (cd "$$t" && $(XMLTO) --skip-validation htmlhelp ../DVDStylerGuide_$*.xml && rm -f *.hh* && $(ZIP) ../help_$*.zip *.html); \ + (cd "$$t" && $(XMLTO) --skip-validation htmlhelp ../DVDStylerGuide_$*.xml && rm -f *.hh* *.proc && $(ZIP) ../help_$*.zip *.html); \ rm -f "$$t"/*.html; \ + rm -f "$$t"/*.proc; \ if [ -d "images/$*" ]; then \ - $(ZIP) help_$*.zip htmlhelp.hhp toc.hhc images/$*/*.png images/$*/*.jpg; \ Modified: head/multimedia/dvdstyler/pkg-plist ============================================================================== --- head/multimedia/dvdstyler/pkg-plist Sun May 3 16:07:14 2015 (r385286) +++ head/multimedia/dvdstyler/pkg-plist Sun May 3 16:32:27 2015 (r385287) @@ -25,6 +25,7 @@ share/applications/dvdstyler.desktop %%DATADIR%%/backgrounds/40_swans.jpg %%DATADIR%%/backgrounds/45_nevado.jpg %%DATADIR%%/backgrounds/46_paisaje.jpg +%%DATADIR%%/backgrounds/Cake.jpg %%DATADIR%%/backgrounds/blue_treetops.jpg %%DATADIR%%/backgrounds/dark_wedding.jpg %%DATADIR%%/backgrounds/frosty_forest.jpg @@ -128,6 +129,7 @@ share/applications/dvdstyler.desktop %%DATADIR%%/rc/add.png %%DATADIR%%/rc/addVideo.png %%DATADIR%%/rc/dvdstyler.png +%%DATADIR%%/rc/error.png %%DATADIR%%/rc/files.png %%DATADIR%%/rc/help.png %%DATADIR%%/rc/justifyCenter.png @@ -144,9 +146,11 @@ share/applications/dvdstyler.desktop %%DATADIR%%/rc/new.png %%DATADIR%%/rc/noaudio.png %%DATADIR%%/rc/nwse.cur +%%DATADIR%%/rc/ok.png %%DATADIR%%/rc/open.png %%DATADIR%%/rc/plus.png %%DATADIR%%/rc/preferences.png +%%DATADIR%%/rc/refresh.png %%DATADIR%%/rc/remove.png %%DATADIR%%/rc/rotate.cur %%DATADIR%%/rc/run.png