3 files changed, 45 insertions, 16 deletions

diff --git a/games/gtktetcolor/Makefile b/games/gtktetcolor/Makefile
index 7d7924a320e1..e056eb95c4e6 100644
--- a/games/gtktetcolor/Makefile
+++ b/games/gtktetcolor/Makefile
@@ -2,30 +2,55 @@
 # $FreeBSD$
 
 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/games/${PORTNAME}/:icons
+DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
+		${PORTNAME}.png:icons
+EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	nemysis@FreeBSD.org
 COMMENT=	Game for GNOME that resembles well-known Tetris and Columns
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-USES=        pathfix gmake pkgconfig
+USE_BZIP2=	yes
+USES=		desktop-file-utils gmake pathfix pkgconfig
 USE_GNOME=	gnomeprefix intlhack libgnomeui
 GNU_CONFIGURE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-NO_STAGE=	yes
+PORTDOCS=	AUTHORS ChangeLog NEWS README TODO
+
+OPTIONS_DEFINE=	DOCS NLS
+OPTIONS_SUB=	yes
+
+NLS_USES=	gettext
+
+.include <bsd.port.options.mk>
+
 post-patch:
-	@${REINPLACE_CMD} -e \
-		's|games\.games|games:games|g' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} \
+		-e 's|games.games|root.games|' \
+		-e 's|scoredir = $$(localstatedir)/games|scoredir = /var/games|' \
+		${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 ${STAGEDIR}${PREFIX}/share/pixmaps/
+
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/games/gtktetcolor/distinfo b/games/gtktetcolor/distinfo
index 205b29adcf25..61db9e58ee8b 100644
--- a/games/gtktetcolor/distinfo
+++ b/games/gtktetcolor/distinfo
@@ -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 --git a/games/gtktetcolor/pkg-plist b/games/gtktetcolor/pkg-plist
index 0f5275412433..88c6ec91a94c 100644
--- a/games/gtktetcolor/pkg-plist
+++ b/games/gtktetcolor/pkg-plist
@@ -1,13 +1,15 @@
 bin/gtktetcolor
 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
+@unexec if [ -s /var/games/gtktetcolor.scores ] ; then rm -f /var/games/gtktetcolor.scores ; fi
+/var/games/gtktetcolor.scores
+@exec if [ ! -f /var/games/gtktetcolor.scores ] ; then cp -p /var/games/gtktetcolor.scores ; fi
 @dirrm share/sounds/gtktetcolor
-@dirrmtry share/games