Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 05 Jun 2013 12:38:24 +0200
From:      nemysis <nemysis@gmx.ch>
To:        FreeBSD-gnats-submit@freebsd.org
Cc:        jpaetzel@freebsd.org
Subject:   ports/179327: [PATCH] games/gtktetcolor: Update to 0.6.5pre3, fix port
Message-ID:  <20130605103828.4C9F6C17@hub.freebsd.org>
Resent-Message-ID: <201306051040.r55Ae2No008801@freefall.freebsd.org>

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

>Number:         179327
>Category:       ports
>Synopsis:       [PATCH] games/gtktetcolor: Update to 0.6.5pre3, fix port
>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:   Wed Jun 05 10:40:01 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:

- Update to 0.6.5pre3
- Fix port
- Trim master sites
- Change Icon
- Add dependencies for BZIP2 and desktop
- Trim new Uses
- Add docs
- Add NLS Options
- Add OptionsNG
- Trim Desktop entry file
- Fix mtree, pkg-plist

Generated and tested manually, tested with port test and with RedPorts, sent with FreeBSD Port Tools 0.99_7 (mode: change, diff: ports)
>How-To-Repeat:

http://portsmon.freebsd.org/portoverview.py?category=games&portname=gtktetcolor

Build log

https://redports.org/buildarchive/20130604103900-48119/

>Fix:

--- gtktetcolor-0.6.5.p3.patch begins here ---
diff -ruN /usr/ports/games/gtktetcolor/Makefile ./Makefile
--- /usr/ports/games/gtktetcolor/Makefile	2013-06-02 18:54:42.000000000 +0200
+++ ./Makefile	2013-06-04 12:34:22.000000000 +0200
@@ -2,11 +2,13 @@
 # $FreeBSD: head/games/gtktetcolor/Makefile 315433 2013-03-28 03:28:30Z eadler $
 
 PORTNAME=	gtktetcolor
-PORTVERSION=	0.6.4
-PORTREVISION=	11
+DISTVERSION=	0.6.5pre3
 CATEGORIES=	games gnome
-MASTER_SITES=	SUNSITE/games \
-		http://canopus.iacp.dvo.ru/~panov/gtktetcolor/
+MASTER_SITES=	ftp://canopus.iacp.dvo.ru/pub/Games/gtktetcolor/ \
+		SF/nemysisfreebsdp/:icons
+DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
+		${PORTNAME}.png:icons
+EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Game for GNOME that resembles well-known Tetris and Columns
@@ -14,19 +16,48 @@
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-USES=        pathfix
+USE_BZIP2=	yes
+USES=		desktop-file-utils pathfix pkgconfig
 USE_GNOME=	gnomeprefix intlhack libgnomeui
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+PORTDOCS=	AUTHORS ChangeLog NEWS README TODO
+
+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
+
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|games\.games|games:games|g' ${WRKSRC}/Makefile.in
 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
 		's|-D.*_DISABLE_DEPRECATED||g'
+	@${REINPLACE_CMD} -e 's|^Icon.*|Icon=${PORTNAME}|' \
+		${WRKSRC}/src/gtktetcolor.desktop.in
+
+.if ! ${PORT_OPTIONS:MNLS}
+	@${REINPLACE_CMD} -e '/^SUBDIRS/s|po||g' ${WRKSRC}/Makefile.in
+.endif
+
+post-install:
+	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png ${PREFIX}/share/pixmaps
+
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
diff -ruN /usr/ports/games/gtktetcolor/distinfo ./distinfo
--- /usr/ports/games/gtktetcolor/distinfo	2013-06-02 18:54:42.000000000 +0200
+++ ./distinfo	2013-06-04 12:37:05.000000000 +0200
@@ -1,2 +1,4 @@
-SHA256 (gtktetcolor-0.6.4.tar.gz) = 1d70d9d4c87ab6f42366dc491e8a467dae01ce168d3bbf4b9fc5215227ce5628
-SIZE (gtktetcolor-0.6.4.tar.gz) = 198699
+SHA256 (gtktetcolor-0.6.5pre3.tar.bz2) = c11a02377d0ed83ef59e5dd1cf7ea82491bbdbfb19957e5bc2774b871e93b049
+SIZE (gtktetcolor-0.6.5pre3.tar.bz2) = 172629
+SHA256 (gtktetcolor.png) = 1dd71abedfe4a7878e5ce802b3e19f8fec795834c09bdc31f219a8dc8db76427
+SIZE (gtktetcolor.png) = 910
diff -ruN /usr/ports/games/gtktetcolor/pkg-plist ./pkg-plist
--- /usr/ports/games/gtktetcolor/pkg-plist	2013-06-02 18:54:42.000000000 +0200
+++ ./pkg-plist	2013-06-04 12:31:56.000000000 +0200
@@ -2,12 +2,14 @@
 etc/sound/events/gtktetcolor.soundlist
 share/applications/gtktetcolor.desktop
 share/games/gtktetcolor.scores
+%%NLS%%share/locale/de/LC_MESSAGES/gtktetcolor.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/gtktetcolor.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/gtktetcolor.mo
+share/pixmaps/gtktetcolor.png
 share/pixmaps/gtktetcolor.xpm
 share/sounds/gtktetcolor/bonus.wav
 share/sounds/gtktetcolor/gameover.wav
 share/sounds/gtktetcolor/linerem.wav
-share/locale/de/LC_MESSAGES/gtktetcolor.mo
-share/locale/fr/LC_MESSAGES/gtktetcolor.mo
-share/locale/ru/LC_MESSAGES/gtktetcolor.mo
 @dirrm share/sounds/gtktetcolor
+@dirrmtry share/games
 @dirrmtry share/applications
--- gtktetcolor-0.6.5.p3.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?20130605103828.4C9F6C17>