ports/184895: games/galaxyhack: Fix build on -current

[KATO Tsuguru]

>Number:         184895
>Category:       ports
>Synopsis:       games/galaxyhack: Fix build on -current
>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:   Mon Dec 16 18:10:27 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 8.4-RELEASE-p4 i386
>Organization:
>Environment:
>Description:
- Fix build on -current
- Update MASTER_SITES
- Add DESKTOP_ENTRIES

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/games/galaxyhack/Makefile games/galaxyhack/Makefile
--- /usr/ports/games/galaxyhack/Makefile	2013-12-12 21:50:17.000000000 +0900
+++ games/galaxyhack/Makefile	2013-12-17 00:00:00.000000000 +0900
@@ -3,64 +3,72 @@
 
 PORTNAME=	galaxyhack
 PORTVERSION=	1.74
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	games
-MASTER_SITES=	SF
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+MASTER_SITES=	SF \
+		SF/${PORTNAME}/Fleet%20packages/020906:fleets
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${FLEETS_FILE:S/$/:fleets/}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	AI script based strategy game
 
+LICENSE=	GPLv2
+
+BUILD_DEPENDS=	winicontoppm:${PORTSDIR}/graphics/netpbm
 LIB_DEPENDS=	libboost_filesystem.so:${PORTSDIR}/devel/boost-libs \
 		libfreetype.so:${PORTSDIR}/print/freetype2
 
-USES=		dos2unix gmake
-USE_BZIP2=	yes
-USE_SDL=	gfx image mixer sdl
-WRKSRC=		${WRKDIR}/${PORTNAME}/src
-
 OPTIONS_DEFINE=	FLEETS OPTIMIZED_CFLAGS
 OPTIONS_DEFAULT=	OPTIMIZED_CFLAGS
+OPTIONS_SUB=	yes
 FLEETS_DESC=	Install additional fleets
 
+WRKSRC=		${WRKDIR}/${PORTNAME}/src
+
+USE_BZIP2=	yes
+USES=		dos2unix gmake
+USE_SDL=	gfx image mixer sdl
 ALL_TARGET=	${PORTNAME}
+
 SUB_FILES=	${PORTNAME}-sh
-FLEETS_FILE=	gh_fleets_020906.zip
 
-NO_STAGE=	yes
+DESKTOP_ENTRIES="GalaxyHack" "" "${PREFIX}/share/pixmaps/galaxyhack.png" \
+		"${PORTNAME}" "" ""
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MFLEETS}
-EXTRACT_DEPENDS+=	${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
-DISTFILES+=	${FLEETS_FILE}
-PLIST_SUB+=	FLEETS=""
-.else
-PLIST_SUB+=	FLEETS="@comment "
+FLEETS_FILE=	gh_fleets_020906.zip
 .endif
 
 .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 MAKE_ENV+=	OPTIMIZED_CFLAGS=YES
 .endif
 
-do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}-sh ${PREFIX}/bin/${PORTNAME}
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/libexec
-	${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/../settings.dat ${DATADIR}
-.for d in fleets gamedata graphics music standardpictures
-	${CP} -R ${WRKSRC}/../${d} ${DATADIR}
-.endfor
+post-extract:
 .if ${PORT_OPTIONS:MFLEETS}
-	@${UNZIP_CMD} -o ${DISTDIR}/${FLEETS_FILE} -x "*/CVS/*" "*/.svn/*" \
-		-d ${DATADIR}
+	(${TAR} -C ${WRKSRC}/.. --exclude "CVS" --exclude ".svn" \
+		--unlink -xf ${DISTDIR}/${FLEETS_FILE})
 .endif
 
-post-install:
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}
-	@${FIND} ${DATADIR} -type f -print0 | \
-		${XARGS} -0 ${CHMOD} ${SHAREMODE}
-	@${FIND} ${DATADIR} -type d -print0 | \
-		${XARGS} -0 ${CHMOD} ${BINMODE}
+post-build:
+	@(winicontoppm ${WRKSRC}/../GalaxyHack.ico | pnmtopng \
+		> ${WRKDIR}/galaxyhack.png)
+
+do-install:
+	(cd ${WRKDIR} && ${INSTALL_SCRIPT} ${PORTNAME}-sh \
+		${STAGEDIR}${PREFIX}/bin/${PORTNAME})
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} \
+		${STAGEDIR}${PREFIX}/libexec)
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	(cd ${WRKSRC}/.. && ${INSTALL_DATA} settings.dat \
+		${STAGEDIR}${DATADIR})
+.for d in fleets gamedata graphics music standardpictures
+	@(cd ${WRKSRC}/.. && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR})
+.endfor
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
+	(cd ${WRKDIR} && ${INSTALL_DATA} galaxyhack.png \
+		${STAGEDIR}/${PREFIX}/share/pixmaps)
 
 .include <bsd.port.mk>
diff -urN /usr/ports/games/galaxyhack/files/patch-Makefile games/galaxyhack/files/patch-Makefile
--- /usr/ports/games/galaxyhack/files/patch-Makefile	2013-11-06 22:01:14.000000000 +0900
+++ games/galaxyhack/files/patch-Makefile	2013-12-17 00:00:00.000000000 +0900
@@ -9,7 +9,7 @@
 -LDFLAGS = $(shell sdl-config --libs) -lSDL_image -lSDL_mixer -lboost_filesystem
 +CXX ?= g++
 +CXXFLAGS += $(shell $(SDL_CONFIG) --cflags)
-+LDFLAGS += $(shell $(SDL_CONFIG) --libs) -lSDL_image -lSDL_mixer -lboost_filesystem
++LDFLAGS += $(shell $(SDL_CONFIG) --libs) -lSDL_image -lSDL_mixer -lboost_filesystem -lboost_system
 +
 +ifdef OPTIMIZED_CFLAGS
 +CXXFLAGS += -O3
diff -urN /usr/ports/games/galaxyhack/pkg-plist games/galaxyhack/pkg-plist
--- /usr/ports/games/galaxyhack/pkg-plist	2013-11-06 22:01:14.000000000 +0900
+++ games/galaxyhack/pkg-plist	2013-12-17 00:00:00.000000000 +0900
@@ -780,6 +780,7 @@
 %%DATADIR%%/standardpictures/yellow/smallship/kpovieta_ft1.png
 %%DATADIR%%/standardpictures/yellow/smallship/ss1-hshape-j.png
 %%DATADIR%%/standardpictures/yellow/smallship/ss2-xshape-j.png
+share/pixmaps/galaxyhack.png
 @dirrm %%DATADIR%%/standardpictures/yellow/smallship
 @dirrm %%DATADIR%%/standardpictures/yellow/frigate
 @dirrm %%DATADIR%%/standardpictures/yellow/capship
>Release-Note:
>Audit-Trail:
>Unformatted: