Skip site navigation (1)Skip section navigation (2)
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:   ports/179286: [PATCH] games/gno3dtet: Fix typo, add dependencies, NLS, OptionsNG
Message-ID:  <20130604014829.4B6A02EA@hub.freebsd.org>
Resent-Message-ID: <201306040150.r541o00J002361@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         179286
>Category:       ports
>Synopsis:       [PATCH] games/gno3dtet: Fix typo, add dependencies, NLS, OptionsNG
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jun 04 01:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>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:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130604014829.4B6A02EA>