From udvzsolt@gmail.com  Sun Feb  9 17:50:21 2014
Return-Path: <udvzsolt@gmail.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id ECA0E6FD
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  9 Feb 2014 17:50:20 +0000 (UTC)
Received: from mail-ee0-x22a.google.com (mail-ee0-x22a.google.com [IPv6:2a00:1450:4013:c00::22a])
	(using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 7F47017CB
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  9 Feb 2014 17:50:20 +0000 (UTC)
Received: by mail-ee0-f42.google.com with SMTP id b15so2478962eek.15
        for <FreeBSD-gnats-submit@freebsd.org>; Sun, 09 Feb 2014 09:50:18 -0800 (PST)
Received: from bsd-zsolt (91.83.120.6.pool.invitel.hu. [91.83.120.6])
        by mx.google.com with ESMTPSA id v6sm23989548eef.2.2014.02.09.09.50.14
        for <multiple recipients>
        (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Sun, 09 Feb 2014 09:50:16 -0800 (PST)
Received: by bsd-zsolt (sSMTP sendmail emulation); Sun, 09 Feb 2014 18:49:31 +0100
Message-Id: <52f7bfd8.86620e0a.0284.0488@mx.google.com>
Date: Sun, 09 Feb 2014 18:49:31 +0100
From: Zsolt Udvari <udvzsolt@gmail.com>
Reply-To: Zsolt Udvari <udvzsolt@gmail.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: <udvzsolt@gmail.com>
Subject: [patch] multimedia/imagination stage support, options helpers
X-Send-Pr-Version: 3.114
X-GNATS-Notify: jessefrgsmith@yahoo.ca

>Number:         186596
>Category:       ports
>Synopsis:       [patch] multimedia/imagination stage support, options helpers
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    olivierd
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Feb 09 18:00:00 UTC 2014
>Closed-Date:    Fri Mar 14 15:22:39 UTC 2014
>Last-Modified:  Fri Mar 14 15:30:01 UTC 2014
>Originator:     Zsolt Udvari
>Release:        FreeBSD 10.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD bsd-zsolt 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260789: Thu Jan 16 22:34:59 UTC 2014     root@snap.freebsd.org:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
multimedia/imagination
* supports stage (make DESTDIR works)
* using options helpers
* move sox dependency from BUILD_DEPENDS to LIB_DEPENDS
>How-To-Repeat:
>Fix:

--- imagination.diff begins here ---
diff -ur imagination.orig/Makefile imagination/Makefile
--- imagination.orig/Makefile	2014-02-09 18:42:58.541538953 +0100
+++ imagination/Makefile	2014-02-09 18:37:56.599637677 +0100
@@ -10,8 +10,8 @@
 MAINTAINER=	jessefrgsmith@yahoo.ca
 COMMENT=	DVD slideshow maker
 
+LIB_DEPENDS=libsox.so:${PORTSDIR}/audio/sox
 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
 
@@ -21,15 +21,10 @@
 
 WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=NLS
 
-.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 <bsd.port.mk>
diff -ur imagination.orig/pkg-plist imagination/pkg-plist
--- imagination.orig/pkg-plist	2014-02-09 18:42:58.541538953 +0100
+++ imagination/pkg-plist	2014-02-09 18:40:49.546582750 +0100
@@ -43,7 +43,6 @@
 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
--- imagination.diff ends here ---

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Sun Feb 9 18:00:08 UTC 2014 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: jessefrgsmith@yahoo.ca
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/186596: [patch] multimedia/imagination stage support, options helpers
Date: Sun, 9 Feb 2014 18:00:08 UT

 Maintainer of multimedia/imagination,
 
 Please note that PR ports/186596 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/186596
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
Responsible-Changed-From-To: freebsd-ports-bugs->olivierd 
Responsible-Changed-By: olivierd 
Responsible-Changed-When: Tue Feb 18 08:25:37 UTC 2014 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=186596 
State-Changed-From-To: feedback->closed 
State-Changed-By: olivierd 
State-Changed-When: Fri Mar 14 15:22:39 UTC 2014 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/186596: commit references a PR
Date: Fri, 14 Mar 2014 15:20:55 +0000 (UTC)

 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 <bsd.port.options.mk>
 -
 -.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 <bsd.port.mk>
 
 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 <config.h>
 
 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
 _______________________________________________
 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"
 
>Unformatted:
