From jgh@FreeBSD.org  Mon Jun  3 07:32:42 2013
Return-Path: <jgh@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	by hub.freebsd.org (Postfix) with ESMTP id 1543261F
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  3 Jun 2013 07:32:42 +0000 (UTC)
	(envelope-from jgh@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87])
	by mx1.freebsd.org (Postfix) with ESMTP id EB1151C1C
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  3 Jun 2013 07:32:41 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r537Wf9h070775
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 3 Jun 2013 07:32:41 GMT
	(envelope-from jgh@freefall.freebsd.org)
Received: (from jgh@localhost)
	by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r537Wfhx070774;
	Mon, 3 Jun 2013 07:32:41 GMT
	(envelope-from jgh)
Message-Id: <201306030732.r537Wfhx070774@freefall.freebsd.org>
Date: Mon, 3 Jun 2013 07:32:41 GMT
From: Jason Helfman <jgh@FreeBSD.org>
Reply-To: Jason Helfman <jgh@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] adopt USES for desktop-file-utils, support NLS on/off
X-Send-Pr-Version: 3.114
X-GNATS-Notify:

>Number:         179249
>Category:       ports
>Synopsis:       [patch] editors/leafpad adopt USES for desktop-file-utils, support NLS on/off
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    wen
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jun 03 07:40:00 UTC 2013
>Closed-Date:    Fri Jul 19 08:34:11 UTC 2013
>Last-Modified:  Fri Jul 19 08:40:00 UTC 2013
>Originator:     Jason Helfman
>Release:        FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD freefall.freebsd.org 10.0-CURRENT FreeBSD 10.0-CURRENT #1 r251226: Sat Jun 1 21:56:43 UTC 2013 peter@freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL amd64


	
>Description:
move to USES for desktop-file-utils
support NLS conditionally

>How-To-Repeat:
	
>Fix:

Index: editors/leafpad/Makefile
===================================================================
--- editors/leafpad/Makefile	(revision 319757)
+++ editors/leafpad/Makefile	(working copy)
@@ -11,8 +11,8 @@
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	GTK+ based simple text editor
 
-USE_GNOME=	gtk20 desktopfileutils intlhack
-USES=		gettext
+USE_GNOME=	gtk20 intlhack
+USES=		desktop-file-utils
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-chooser
@@ -22,16 +22,31 @@
 
 PORTDOCS=	AUTHORS COPYING ChangeLog INSTALL README
 
+OPTIONS_DEFINE=	NLS
+
 post-extract:
 	@${CHMOD} a+x ${WRKSRC}/install-sh
 
 .include <bsd.port.options.mk>
 
+post-patch-script:
+.if ! ${PORT_OPTIONS:MNLS}
+	@${REINPLACE_CMD} -e 's|SUBDIRS = src data po|SUBDIRS = src data|g' \
+		${WRKSRC}/Makefile.in
+.endif
+
+.if ${PORT_OPTIONS:MNLS}
+USES+=			gettext
+PLIST_SUB+=		NLS=""
+.else
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=		NLS="@comment "
+.endif
+
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	@${INSTALL} -d ${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
 .endif
-	-@update-desktop-database
 
 .include <bsd.port.mk>
Index: editors/leafpad/pkg-plist
===================================================================
--- editors/leafpad/pkg-plist	(revision 319757)
+++ editors/leafpad/pkg-plist	(working copy)
@@ -5,46 +5,44 @@
 share/icons/hicolor/24x24/apps/leafpad.png
 share/icons/hicolor/32x32/apps/leafpad.png
 share/icons/hicolor/scalable/apps/leafpad.svg
-share/locale/bg/LC_MESSAGES/leafpad.mo
-share/locale/br/LC_MESSAGES/leafpad.mo
-share/locale/ca/LC_MESSAGES/leafpad.mo
-share/locale/cs/LC_MESSAGES/leafpad.mo
-share/locale/da/LC_MESSAGES/leafpad.mo
-share/locale/de/LC_MESSAGES/leafpad.mo
-share/locale/el/LC_MESSAGES/leafpad.mo
-share/locale/eo/LC_MESSAGES/leafpad.mo
-share/locale/es/LC_MESSAGES/leafpad.mo
-share/locale/eu/LC_MESSAGES/leafpad.mo
-share/locale/fi/LC_MESSAGES/leafpad.mo
-share/locale/fr/LC_MESSAGES/leafpad.mo
-share/locale/ga/LC_MESSAGES/leafpad.mo
-share/locale/gl/LC_MESSAGES/leafpad.mo
-share/locale/he/LC_MESSAGES/leafpad.mo
-share/locale/hu/LC_MESSAGES/leafpad.mo
-share/locale/id/LC_MESSAGES/leafpad.mo
-share/locale/it/LC_MESSAGES/leafpad.mo
-share/locale/ja/LC_MESSAGES/leafpad.mo
-share/locale/ko/LC_MESSAGES/leafpad.mo
-share/locale/lt/LC_MESSAGES/leafpad.mo
-share/locale/lv/LC_MESSAGES/leafpad.mo
-share/locale/nl/LC_MESSAGES/leafpad.mo
-share/locale/nn/LC_MESSAGES/leafpad.mo
-share/locale/pl/LC_MESSAGES/leafpad.mo
-share/locale/pt/LC_MESSAGES/leafpad.mo
-share/locale/pt_BR/LC_MESSAGES/leafpad.mo
-share/locale/ru/LC_MESSAGES/leafpad.mo
-share/locale/sk/LC_MESSAGES/leafpad.mo
-share/locale/sl/LC_MESSAGES/leafpad.mo
-share/locale/sr/LC_MESSAGES/leafpad.mo
-share/locale/sv/LC_MESSAGES/leafpad.mo
-share/locale/ta/LC_MESSAGES/leafpad.mo
-share/locale/tr/LC_MESSAGES/leafpad.mo
-share/locale/uk/LC_MESSAGES/leafpad.mo
-share/locale/vi/LC_MESSAGES/leafpad.mo
-share/locale/zh_CN/LC_MESSAGES/leafpad.mo
-share/locale/zh_TW/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/br/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/da/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/de/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/el/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/es/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/he/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/id/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/it/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/nn/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/ta/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/leafpad.mo
 share/pixmaps/leafpad.png
 share/pixmaps/leafpad.xpm
 @dirrmtry share/applications
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->wen 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Jun 3 09:12:21 UTC 2013 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=179249 
State-Changed-From-To: open->closed 
State-Changed-By: wen 
State-Changed-When: Fri Jul 19 08:34:10 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/179249: commit references a PR
Date: Fri, 19 Jul 2013 08:33:20 +0000 (UTC)

 Author: wen
 Date: Fri Jul 19 08:33:06 2013
 New Revision: 323272
 URL: http://svnweb.freebsd.org/changeset/ports/323272
 
 Log:
   - Move to USES for desktop-file-utils [1]
   - Support NLS conditionally [1]
   - Drop maintainership
   
   PR:		179249 [1]
   Submitted by:	jgh@ [1]
 
 Modified:
   head/editors/leafpad/Makefile
   head/editors/leafpad/pkg-plist
 
 Modified: head/editors/leafpad/Makefile
 ==============================================================================
 --- head/editors/leafpad/Makefile	Fri Jul 19 08:28:34 2013	(r323271)
 +++ head/editors/leafpad/Makefile	Fri Jul 19 08:33:06 2013	(r323272)
 @@ -8,11 +8,11 @@ CATEGORIES=	editors
  MASTER_SITES=	SAVANNAH
  MASTER_SITE_SUBDIR=	${PORTNAME}
  
 -MAINTAINER=	wen@FreeBSD.org
 +MAINTAINER=	ports@FreeBSD.org
  COMMENT=	GTK+ based simple text editor
  
 -USE_GNOME=	gtk20 desktopfileutils intlhack
 -USES=		gettext
 +USE_GNOME=	gtk20 intlhack
 +USES=		desktop-file-utils
  USE_GMAKE=	yes
  GNU_CONFIGURE=	yes
  CONFIGURE_ARGS=	--enable-chooser
 @@ -22,16 +22,31 @@ LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_L
  
  PORTDOCS=	AUTHORS COPYING ChangeLog INSTALL README
  
 +OPTIONS_DEFINE=	NLS
 +
  post-extract:
  	@${CHMOD} a+x ${WRKSRC}/install-sh
  
  .include <bsd.port.options.mk>
  
 +.if ${PORT_OPTIONS:MNLS}
 +USES+=			gettext
 +PLIST_SUB+=		NLS=""
 +.else
 +CONFIGURE_ARGS+=	--disable-nls
 +PLIST_SUB+=		NLS="@comment "
 +.endif
 +
 +post-patch:
 +.if ! ${PORT_OPTIONS:MNLS}
 +	@${REINPLACE_CMD} -e 's|SUBDIRS = src data po|SUBDIRS = src data|g' \
 +		${WRKSRC}/Makefile.in
 +.endif
 +
  post-install:
  .if ${PORT_OPTIONS:MDOCS}
  	@${INSTALL} -d ${DOCSDIR}
  	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
  .endif
 -	-@update-desktop-database
  
  .include <bsd.port.mk>
 
 Modified: head/editors/leafpad/pkg-plist
 ==============================================================================
 --- head/editors/leafpad/pkg-plist	Fri Jul 19 08:28:34 2013	(r323271)
 +++ head/editors/leafpad/pkg-plist	Fri Jul 19 08:33:06 2013	(r323272)
 @@ -5,46 +5,44 @@ share/icons/hicolor/22x22/apps/leafpad.p
  share/icons/hicolor/24x24/apps/leafpad.png
  share/icons/hicolor/32x32/apps/leafpad.png
  share/icons/hicolor/scalable/apps/leafpad.svg
 -share/locale/bg/LC_MESSAGES/leafpad.mo
 -share/locale/br/LC_MESSAGES/leafpad.mo
 -share/locale/ca/LC_MESSAGES/leafpad.mo
 -share/locale/cs/LC_MESSAGES/leafpad.mo
 -share/locale/da/LC_MESSAGES/leafpad.mo
 -share/locale/de/LC_MESSAGES/leafpad.mo
 -share/locale/el/LC_MESSAGES/leafpad.mo
 -share/locale/eo/LC_MESSAGES/leafpad.mo
 -share/locale/es/LC_MESSAGES/leafpad.mo
 -share/locale/eu/LC_MESSAGES/leafpad.mo
 -share/locale/fi/LC_MESSAGES/leafpad.mo
 -share/locale/fr/LC_MESSAGES/leafpad.mo
 -share/locale/ga/LC_MESSAGES/leafpad.mo
 -share/locale/gl/LC_MESSAGES/leafpad.mo
 -share/locale/he/LC_MESSAGES/leafpad.mo
 -share/locale/hu/LC_MESSAGES/leafpad.mo
 -share/locale/id/LC_MESSAGES/leafpad.mo
 -share/locale/it/LC_MESSAGES/leafpad.mo
 -share/locale/ja/LC_MESSAGES/leafpad.mo
 -share/locale/ko/LC_MESSAGES/leafpad.mo
 -share/locale/lt/LC_MESSAGES/leafpad.mo
 -share/locale/lv/LC_MESSAGES/leafpad.mo
 -share/locale/nl/LC_MESSAGES/leafpad.mo
 -share/locale/nn/LC_MESSAGES/leafpad.mo
 -share/locale/pl/LC_MESSAGES/leafpad.mo
 -share/locale/pt/LC_MESSAGES/leafpad.mo
 -share/locale/pt_BR/LC_MESSAGES/leafpad.mo
 -share/locale/ru/LC_MESSAGES/leafpad.mo
 -share/locale/sk/LC_MESSAGES/leafpad.mo
 -share/locale/sl/LC_MESSAGES/leafpad.mo
 -share/locale/sr/LC_MESSAGES/leafpad.mo
 -share/locale/sv/LC_MESSAGES/leafpad.mo
 -share/locale/ta/LC_MESSAGES/leafpad.mo
 -share/locale/tr/LC_MESSAGES/leafpad.mo
 -share/locale/uk/LC_MESSAGES/leafpad.mo
 -share/locale/vi/LC_MESSAGES/leafpad.mo
 -share/locale/zh_CN/LC_MESSAGES/leafpad.mo
 -share/locale/zh_TW/LC_MESSAGES/leafpad.mo
 +%%NLS%%share/locale/bg/LC_MESSAGES/leafpad.mo
 +%%NLS%%share/locale/br/LC_MESSAGES/leafpad.mo
 +%%NLS%%share/locale/ca/LC_MESSAGES/leafpad.mo
 +%%NLS%%share/locale/cs/LC_MESSAGES/leafpad.mo
 +%%NLS%%share/locale/da/LC_MESSAGES/leafpad.mo
 +%%NLS%%share/locale/de/LC_MESSAGES/leafpad.mo
 +%%NLS%%share/locale/el/LC_MESSAGES/leafpad.mo
 +%%NLS%%share/locale/eo/LC_MESSAGES/leafpad.mo
 +%%NLS%%share/locale/es/LC_MESSAGES/leafpad.mo
 +%%NLS%%share/locale/eu/LC_MESSAGES/leafpad.mo
 +%%NLS%%share/locale/fi/LC_MESSAGES/leafpad.mo
 +%%NLS%%share/locale/fr/LC_MESSAGES/leafpad.mo
 +%%NLS%%share/locale/ga/LC_MESSAGES/leafpad.mo
 +%%NLS%%share/locale/gl/LC_MESSAGES/leafpad.mo
 +%%NLS%%share/locale/he/LC_MESSAGES/leafpad.mo
 +%%NLS%%share/locale/hu/LC_MESSAGES/leafpad.mo
 +%%NLS%%share/locale/id/LC_MESSAGES/leafpad.mo
 +%%NLS%%share/locale/it/LC_MESSAGES/leafpad.mo
 +%%NLS%%share/locale/ja/LC_MESSAGES/leafpad.mo
 +%%NLS%%share/locale/ko/LC_MESSAGES/leafpad.mo
 +%%NLS%%share/locale/lt/LC_MESSAGES/leafpad.mo
 +%%NLS%%share/locale/lv/LC_MESSAGES/leafpad.mo
 +%%NLS%%share/locale/nl/LC_MESSAGES/leafpad.mo
 +%%NLS%%share/locale/nn/LC_MESSAGES/leafpad.mo
 +%%NLS%%share/locale/pl/LC_MESSAGES/leafpad.mo
 +%%NLS%%share/locale/pt/LC_MESSAGES/leafpad.mo
 +%%NLS%%share/locale/pt_BR/LC_MESSAGES/leafpad.mo
 +%%NLS%%share/locale/ru/LC_MESSAGES/leafpad.mo
 +%%NLS%%share/locale/sk/LC_MESSAGES/leafpad.mo
 +%%NLS%%share/locale/sl/LC_MESSAGES/leafpad.mo
 +%%NLS%%share/locale/sr/LC_MESSAGES/leafpad.mo
 +%%NLS%%share/locale/sv/LC_MESSAGES/leafpad.mo
 +%%NLS%%share/locale/ta/LC_MESSAGES/leafpad.mo
 +%%NLS%%share/locale/tr/LC_MESSAGES/leafpad.mo
 +%%NLS%%share/locale/uk/LC_MESSAGES/leafpad.mo
 +%%NLS%%share/locale/vi/LC_MESSAGES/leafpad.mo
 +%%NLS%%share/locale/zh_CN/LC_MESSAGES/leafpad.mo
 +%%NLS%%share/locale/zh_TW/LC_MESSAGES/leafpad.mo
  share/pixmaps/leafpad.png
  share/pixmaps/leafpad.xpm
  @dirrmtry share/applications
 -@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 -@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 _______________________________________________
 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:
