From nemysis@gmx.ch  Tue Jun  4 01:48:29 2013
Return-Path: <nemysis@gmx.ch>
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
	by hub.freebsd.org (Postfix) with ESMTP id 4B6A02EA
	for <freebsd-gnats-submit@freebsd.org>; Tue,  4 Jun 2013 01:48:29 +0000 (UTC)
	(envelope-from nemysis@gmx.ch)
Received: from mout.gmx.net (mout.gmx.net [212.227.17.20])
	by mx1.freebsd.org (Postfix) with ESMTP id D33F01226
	for <freebsd-gnats-submit@freebsd.org>; Tue,  4 Jun 2013 01:48:28 +0000 (UTC)
Received: from mailout-de.gmx.net ([10.1.76.12]) by mrigmx.server.lan
 (mrigmx002) with ESMTP (Nemesis) id 0MHuiJ-1Ug6vG0TRF-003hmw for
 <FreeBSD-gnats-submit@freebsd.org>; Tue, 04 Jun 2013 03:48:27 +0200
Received: (qmail invoked by alias); 04 Jun 2013 01:48:26 -0000
Received: from 5-80.77-83.cust.bluewin.ch (EHLO something.email.com) [83.77.80.5]
  by mail.gmx.net (mp012) with SMTP; 04 Jun 2013 03:48:26 +0200
Received: by something.email.com (sSMTP sendmail emulation); Tue, 04 Jun 2013 03:48:25 +0200
Message-Id: <20130604014829.4B6A02EA@hub.freebsd.org>
Date: Tue, 04 Jun 2013 03:48:25 +0200
From: nemysis <nemysis@gmx.ch>
To: FreeBSD-gnats-submit@freebsd.org
Cc: jpaetzel@freebsd.org
Subject: [PATCH] games/gno3dtet: Fix typo, add dependencies, NLS, OptionsNG
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         179286
>Category:       ports
>Synopsis:       [PATCH] games/gno3dtet: Fix typo, add dependencies, NLS, OptionsNG
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    nemysis
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jun 04 01:50:00 UTC 2013
>Closed-Date:    Sat Mar 22 16:01:11 UTC 2014
>Last-Modified:  Sat Mar 22 16:20:00 UTC 2014
>Originator:     nemysis
>Release:        FreeBSD 9.1-RELEASE-p3 amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.1-RELEASE-p3 FreeBSD 9.1-RELEASE-p3 #0: Mon Apr 29 18:27:25 UTC 2013
>Description:

- Fix typo
- Add dependencies for pkgconfig and desktop
- Add NLS Options
- Add OptionsNG
- Trim pkg-plist

Generated with FreeBSD Port Tools 0.99_7 (mode: change, diff: ports)
>How-To-Repeat:

Build log

https://redports.org/buildarchive/20130603225201-15138/

>Fix:

--- gno3dtet-1.96.1_11.patch begins here ---
diff -ruN /usr/ports/games/gno3dtet/Makefile ./Makefile
--- /usr/ports/games/gno3dtet/Makefile	2013-06-02 18:54:27.000000000 +0200
+++ ./Makefile	2013-06-04 00:23:31.000000000 +0200
@@ -5,7 +5,7 @@
 PORTVERSION=	1.96.1
 PORTREVISION=	11
 CATEGORIES=	games gnome
-MASTER_SITES=	http://eseb.net/ftp/gno3dtet/
+MASTER_SITES=	http://eseb.net/ftp/${PORTNAME}/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
@@ -13,15 +13,27 @@
 
 EXTRACT_DEPENDS=intltoolize:${PORTSDIR}/textproc/intltool
 
-USES=        pathfix
+USES=		desktop-file-utils pathfix pkgconfig
 USE_GNOME=	gnomeprefix intlhack libgnomeui librsvg2
+INSTALLS_OMF=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	autoheader automake aclocal autoconf
 ACLOCAL_ARGS=	-I m4 -I ${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal
 AUTOMAKE_ARGS=	-a -c -f
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-INSTALLS_OMF=	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
 
 run-autotools:: run-autotools-aclocal run-autotools-autoheader \
 		run-autotools-automake run-autotools-autoconf
@@ -31,7 +43,11 @@
 
 post-patch:
 	@${REINPLACE_CMD} -e '/LIBTOOL/d ; \
-		 s|gnome-games|gno3dtet|g' ${WRKSRC}/configure.in
+		s|gnome-games|gno3dtet|g' ${WRKSRC}/configure.in
+
+.if ! ${PORT_OPTIONS:MNLS}
+	@${REINPLACE_CMD} -e '/^always_built_SUBDIRS/s|po||g' ${WRKSRC}/Makefile.am
+.endif
 
 pre-configure:
 	@${INSTALL_SCRIPT} ${AUTOMAKE_DIR}/mkinstalldirs ${WRKSRC}
diff -ruN /usr/ports/games/gno3dtet/pkg-plist ./pkg-plist
--- /usr/ports/games/gno3dtet/pkg-plist	2013-06-02 18:54:27.000000000 +0200
+++ ./pkg-plist	2013-05-21 15:25:49.000000000 +0200
@@ -3,6 +3,7 @@
 share/games/gno3dtet.hof
 share/gnome/help/gno3dtet/C/gno3dtet.xml
 share/gnome/help/gno3dtet/C/legal.xml
+%%NLS%%share/locale/fr/LC_MESSAGES/gno3dtet.mo
 share/omf/gno3dtet/gno3dtet-C.omf
 share/pixmaps/gno3dtet.png
 share/sounds/gno3dtet/danger.wav
@@ -15,10 +16,9 @@
 share/sounds/gno3dtet/pause.wav
 share/sounds/gno3dtet/score.wav
 share/sounds/gno3dtet/screwd.wav
-share/locale/fr/LC_MESSAGES/gno3dtet.mo
 @dirrm share/sounds/gno3dtet
 @dirrm share/omf/gno3dtet
 @dirrm share/gnome/help/gno3dtet/C
 @dirrm share/gnome/help/gno3dtet
-@dirrmtry share/applications
 @dirrmtry share/games
+@dirrmtry share/applications
--- gno3dtet-1.96.1_11.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->beech 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue Jun 4 01:50:09 UTC 2013 
Responsible-Changed-Why:  
beech@ wants this submitter's PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=179286 
Responsible-Changed-From-To: beech->nemysis 
Responsible-Changed-By: tabthorpe 
Responsible-Changed-When: Fri Jan 10 03:39:43 UTC 2014 
Responsible-Changed-Why:  
Submitter is committer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=179286 
State-Changed-From-To: open->closed 
State-Changed-By: nemysis 
State-Changed-When: Sat Mar 22 16:01:10 UTC 2014 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/179286: commit references a PR
Date: Sat, 22 Mar 2014 16:17:55 +0000 (UTC)

 Author: nemysis
 Date: Sat Mar 22 16:17:51 2014
 New Revision: 348799
 URL: http://svnweb.freebsd.org/changeset/ports/348799
 QAT: https://qat.redports.org/buildarchive/r348799/
 
 Log:
   - Bump PORTREVISION for dependency change
   - Add license (GPLv2)
   - Use tabulator instead of whitespace
   - Remove run-autotools:: according to bsd.autotools.mk
   - Add NLS Option, add REINPLACE and install conditional
   - Add OPTIONS_SUB
   - Add dependency for devel/gettext
   - Change REINPLACE, cosmetical changes
   
   PR:		ports/179286
   Submitted by:	nemysis (self)
 
 Modified:
   head/games/gno3dtet/Makefile
   head/games/gno3dtet/pkg-plist
 
 Modified: head/games/gno3dtet/Makefile
 ==============================================================================
 --- head/games/gno3dtet/Makefile	Sat Mar 22 15:43:33 2014	(r348798)
 +++ head/games/gno3dtet/Makefile	Sat Mar 22 16:17:51 2014	(r348799)
 @@ -3,7 +3,7 @@
  
  PORTNAME=	gno3dtet
  PORTVERSION=	1.96.1
 -PORTREVISION=	11
 +PORTREVISION=	12
  CATEGORIES=	games gnome
  MASTER_SITES=	http://eseb.net/ftp/gno3dtet/
  EXTRACT_SUFX=	.tgz
 @@ -11,9 +11,11 @@ EXTRACT_SUFX=	.tgz
  MAINTAINER=	ports@FreeBSD.org
  COMMENT=	GNOME version of the classic 3D-ified T*tris
  
 +LICENSE=	GPLv2
 +
  EXTRACT_DEPENDS=	intltoolize:${PORTSDIR}/textproc/intltool
  
 -USES=        pathfix gmake pkgconfig
 +USES=		pathfix gmake pkgconfig
  USE_GNOME=	gnomeprefix intlhack libgnomeui librsvg2
  USE_AUTOTOOLS=	autoheader automake aclocal autoconf
  ACLOCAL_ARGS=	-I m4 -I ${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal
 @@ -22,15 +24,23 @@ CPPFLAGS+=	-I${LOCALBASE}/include
  LDFLAGS+=	-L${LOCALBASE}/lib
  INSTALLS_OMF=	yes
  
 -run-autotools:: run-autotools-aclocal run-autotools-autoheader \
 -		run-autotools-automake run-autotools-autoconf
 +OPTIONS_DEFINE=	NLS
 +OPTIONS_SUB=	yes
 +
 +NLS_USES=	gettext
 +
 +.include <bsd.port.options.mk>
  
  post-extract:
  	@cd ${WRKSRC} && ${LOCALBASE}/bin/intltoolize -c -f
  
  post-patch:
 -	@${REINPLACE_CMD} -e '/LIBTOOL/d ; \
 -		 s|gnome-games|gno3dtet|g' ${WRKSRC}/configure.in
 +	@${REINPLACE_CMD} -e '/LIBTOOL/d; \
 +		s|gnome-games|gno3dtet|' ${WRKSRC}/configure.in
 +
 +.if ! ${PORT_OPTIONS:MNLS}
 +	@${REINPLACE_CMD} -e '/^always_built_SUBDIRS/s|po||' ${WRKSRC}/Makefile.am
 +.endif
  
  pre-configure:
  	@${INSTALL_SCRIPT} ${AUTOMAKE_DIR}/mkinstalldirs ${WRKSRC}
 
 Modified: head/games/gno3dtet/pkg-plist
 ==============================================================================
 --- head/games/gno3dtet/pkg-plist	Sat Mar 22 15:43:33 2014	(r348798)
 +++ head/games/gno3dtet/pkg-plist	Sat Mar 22 16:17:51 2014	(r348799)
 @@ -23,7 +23,7 @@ share/sounds/gno3dtet/new.wav
  share/sounds/gno3dtet/pause.wav
  share/sounds/gno3dtet/score.wav
  share/sounds/gno3dtet/screwd.wav
 -share/locale/fr/LC_MESSAGES/gno3dtet.mo
 +%%NLS%%share/locale/fr/LC_MESSAGES/gno3dtet.mo
  @dirrm share/sounds/gno3dtet
  @dirrm share/omf/gno3dtet
  @dirrm share/gnome/help/gno3dtet/C
 _______________________________________________
 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:
