From owner-svn-ports-all@FreeBSD.ORG Fri Mar 14 15:20:37 2014 Return-Path: Delivered-To: svn-ports-all@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 DFA1FAE7; Fri, 14 Mar 2014 15:20:37 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C203883F; Fri, 14 Mar 2014 15:20:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2EFKb21046674; Fri, 14 Mar 2014 15:20:37 GMT (envelope-from olivierd@svn.freebsd.org) Received: (from olivierd@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2EFKb3k046669; Fri, 14 Mar 2014 15:20:37 GMT (envelope-from olivierd@svn.freebsd.org) Message-Id: <201403141520.s2EFKb3k046669@svn.freebsd.org> From: Olivier Duchateau Date: Fri, 14 Mar 2014 15:20:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r348254 - in head/multimedia/imagination: . 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.17 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: Fri, 14 Mar 2014 15:20:37 -0000 Author: olivierd Date: Fri Mar 14 15:20:36 2014 New Revision: 348254 URL: http://svnweb.freebsd.org/changeset/ports/348254 QAT: https://qat.redports.org/buildarchive/r348254/ Log: - Support STAGEDIR [1] - Use options helpers [1] - Move sox dependency from BUILD_DEPENDS to LIB_DEPENDS [1] - Force Imagination to use plugins [2] - Adjust GNOME dependencies - Add patch when NLS is not set - Bump PORTREVISION PR: 186596 [1], 186644 [2] Submitted by: Zsolt Udvari [1], [2] Approved by: Jesse Smith (maintainer) [1], timeout (> 1 month) [2] Added: head/multimedia/imagination/files/patch-configure (contents, props changed) head/multimedia/imagination/files/patch-use-plugins.h (contents, props changed) Modified: head/multimedia/imagination/Makefile head/multimedia/imagination/pkg-plist Modified: head/multimedia/imagination/Makefile ============================================================================== --- head/multimedia/imagination/Makefile Fri Mar 14 15:20:35 2014 (r348253) +++ head/multimedia/imagination/Makefile Fri Mar 14 15:20:36 2014 (r348254) @@ -3,36 +3,24 @@ PORTNAME= imagination PORTVERSION= 3.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/ MAINTAINER= jessefrgsmith@yahoo.ca COMMENT= DVD slideshow maker -BUILD_DEPENDS= ${LOCALBASE}/lib/gtk-2.0:${PORTSDIR}/x11-toolkits/gtk20 \ - ${LOCALBASE}/bin/sox:${PORTSDIR}/audio/sox \ - ${LOCALBASE}/bin/intltool-extract:${PORTSDIR}/textproc/intltool -RUN_DEPENDS= ${LOCALBASE}/bin/ffmpeg:${PORTSDIR}/multimedia/ffmpeg +LIB_DEPENDS= libsox.so:${PORTSDIR}/audio/sox \ + libavcodec.so:${PORTSDIR}/multimedia/ffmpeg GNU_CONFIGURE= yes -USES= gmake pkgconfig +USES= gmake pkgconfig pathfix +USE_GNOME= gtk20 intltool intlhack libxslt INSTALLS_ICONS= yes -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} - -NO_STAGE= yes - OPTIONS_DEFINE= NLS - -.include - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+= --disable-nls -PLIST_SUB+= NLS="@comment " -.endif +OPTIONS_SUB= yes +NLS_CONFIGURE_ENABLE= nls +NLS_USES= gettext .include Added: head/multimedia/imagination/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/imagination/files/patch-configure Fri Mar 14 15:20:36 2014 (r348254) @@ -0,0 +1,11 @@ +--- ./configure.orig 2011-03-06 20:06:44.000000000 +0000 ++++ ./configure 2014-03-14 15:08:46.000000000 +0000 +@@ -13029,7 +13029,7 @@ + + fi + fi +- USE_NLS=yes ++ #USE_NLS=yes + + + gt_cv_have_gettext=no Added: head/multimedia/imagination/files/patch-use-plugins.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/imagination/files/patch-use-plugins.h Fri Mar 14 15:20:36 2014 (r348254) @@ -0,0 +1,11 @@ +--- src/support.h.orig 2014-02-11 08:51:06.175251265 +0100 ++++ src/support.h 2014-02-11 08:51:14.270248604 +0100 +@@ -20,7 +20,7 @@ + #ifndef __IMAGINATION_SUPPORT_H + #define __IMAGINATION_SUPPORT_H + +-#define PLUGINS_INSTALLED 0 ++#define PLUGINS_INSTALLED 1 + + #ifdef HAVE_CONFIG_H + # include Modified: head/multimedia/imagination/pkg-plist ============================================================================== --- head/multimedia/imagination/pkg-plist Fri Mar 14 15:20:35 2014 (r348253) +++ head/multimedia/imagination/pkg-plist Fri Mar 14 15:20:36 2014 (r348254) @@ -29,21 +29,11 @@ lib/imagination/rochade.la lib/imagination/rochade.so lib/imagination/wave.la lib/imagination/wave.so -%%NLS%%lib/locale/cs/LC_MESSAGES/imagination.mo -%%NLS%%lib/locale/de/LC_MESSAGES/imagination.mo -%%NLS%%lib/locale/en_GB/LC_MESSAGES/imagination.mo -%%NLS%%lib/locale/fr/LC_MESSAGES/imagination.mo -%%NLS%%lib/locale/it/LC_MESSAGES/imagination.mo -%%NLS%%lib/locale/pt_BR/LC_MESSAGES/imagination.mo -%%NLS%%lib/locale/sv/LC_MESSAGES/imagination.mo -%%NLS%%lib/locale/zh_CN/LC_MESSAGES/imagination.mo -%%NLS%%lib/locale/zh_TW/LC_MESSAGES/imagination.mo share/applications/imagination.desktop share/icons/hicolor/16x16/apps/imagination.png share/icons/hicolor/24x24/apps/imagination.png share/icons/hicolor/48x48/apps/imagination.png share/icons/hicolor/scalable/apps/imagination.svg -share/icons/hicolor/icon-theme.cache %%DATADIR%%/pixmaps/imagination-1.gif %%DATADIR%%/pixmaps/imagination-1.png %%DATADIR%%/pixmaps/imagination-10.gif @@ -195,25 +185,15 @@ share/icons/hicolor/icon-theme.cache %%DATADIR%%/pixmaps/imagination-pos-7.png %%DATADIR%%/pixmaps/imagination-pos-8.png %%DATADIR%%/pixmaps/imagination-text.png +%%NLS%%share/locale/cs/LC_MESSAGES/imagination.mo +%%NLS%%share/locale/de/LC_MESSAGES/imagination.mo +%%NLS%%share/locale/en_GB/LC_MESSAGES/imagination.mo +%%NLS%%share/locale/fr/LC_MESSAGES/imagination.mo +%%NLS%%share/locale/it/LC_MESSAGES/imagination.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/imagination.mo +%%NLS%%share/locale/sv/LC_MESSAGES/imagination.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/imagination.mo +%%NLS%%share/locale/zh_TW/LC_MESSAGES/imagination.mo @dirrmtry %%DATADIR%%/pixmaps @dirrmtry %%DATADIR%% -%%NLS%%@dirrm lib/locale/zh_TW/LC_MESSAGES -%%NLS%%@dirrm lib/locale/zh_TW -%%NLS%%@dirrm lib/locale/zh_CN/LC_MESSAGES -%%NLS%%@dirrm lib/locale/zh_CN -%%NLS%%@dirrm lib/locale/sv/LC_MESSAGES -%%NLS%%@dirrm lib/locale/sv -%%NLS%%@dirrm lib/locale/pt_BR/LC_MESSAGES -%%NLS%%@dirrm lib/locale/pt_BR -%%NLS%%@dirrm lib/locale/it/LC_MESSAGES -%%NLS%%@dirrm lib/locale/it -%%NLS%%@dirrm lib/locale/fr/LC_MESSAGES -%%NLS%%@dirrm lib/locale/fr -%%NLS%%@dirrm lib/locale/en_GB/LC_MESSAGES -%%NLS%%@dirrm lib/locale/en_GB -%%NLS%%@dirrm lib/locale/de/LC_MESSAGES -%%NLS%%@dirrm lib/locale/de -%%NLS%%@dirrm lib/locale/cs/LC_MESSAGES -%%NLS%%@dirrm lib/locale/cs -@dirrmtry lib/locale @dirrm lib/imagination