- Fix build on -current

- Update MASTER_SITES
- Add desktop entry file
- Support staging

PR:		ports/184895
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

3 files changed, 41 insertions, 144 deletions

diff --git a/games/galaxyhack/Makefile b/games/galaxyhack/Makefile
index 533a5ec3f8f2..e5869890dc6e 100644
--- a/games/galaxyhack/Makefile
+++ b/games/galaxyhack/Makefile
@@ -3,64 +3,69 @@
 
 PORTNAME=	galaxyhack
 PORTVERSION=	1.74
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	games
-MASTER_SITES=	SF
+MASTER_SITES=	SF \
+		SF/${PORTNAME}/Fleet%20packages/020906:fleets
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@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
-FLEETS_DESC=	Install additional fleets
+OPTIONS_SUB=	yes
+FLEETS_DESC=	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}" "" ""
+
+FLEETS_DISTFILES=		gh_fleets_020906.zip:fleets
+FLEETS_EXTRACT_DEPENDS=		${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
+OPTIMIZED_CFLAGS_MAKE_ENV=	OPTIMIZED_CFLAGS=YES
+
 .include <bsd.port.options.mk>
 
+post-extract:
 .if ${PORT_OPTIONS:MFLEETS}
-EXTRACT_DEPENDS+=	${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
-DISTFILES+=	${FLEETS_FILE}
-PLIST_SUB+=	FLEETS=""
-.else
-PLIST_SUB+=	FLEETS="@comment "
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	@${UNZIP_CMD} -o ${DISTDIR}/${FLEETS_DISTFILES:S/:fleets//} \
+		-x "*/CVS/*" "*/.svn/*" -d ${STAGEDIR}${DATADIR}
 .endif
 
-.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
-MAKE_ENV+=	OPTIMIZED_CFLAGS=YES
-.endif
+post-build:
+	@(winicontoppm ${WRKSRC}/../GalaxyHack.ico | pnmtopng \
+		> ${WRKDIR}/galaxyhack.png)
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}-sh ${PREFIX}/bin/${PORTNAME}
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/libexec
-	${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/../settings.dat ${DATADIR}
+	(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
-	${CP} -R ${WRKSRC}/../${d} ${DATADIR}
+	@(cd ${WRKSRC}/.. && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR})
 .endfor
-.if ${PORT_OPTIONS:MFLEETS}
-	@${UNZIP_CMD} -o ${DISTDIR}/${FLEETS_FILE} -x "*/CVS/*" "*/.svn/*" \
-		-d ${DATADIR}
-.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}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
+	(cd ${WRKDIR} && ${INSTALL_DATA} galaxyhack.png \
+		${STAGEDIR}/${PREFIX}/share/pixmaps)
 
 .include <bsd.port.mk>
diff --git a/games/galaxyhack/files/patch-Makefile b/games/galaxyhack/files/patch-Makefile
index b55bbfdf1b97..ef26385d8848 100644
--- a/games/galaxyhack/files/patch-Makefile
+++ b/games/galaxyhack/files/patch-Makefile
@@ -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 --git a/games/galaxyhack/pkg-plist b/games/galaxyhack/pkg-plist
index c2621c0841fb..399d10d58201 100644
--- a/games/galaxyhack/pkg-plist
+++ b/games/galaxyhack/pkg-plist
@@ -780,6 +780,7 @@ libexec/galaxyhack
 %%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
@@ -800,23 +801,6 @@ libexec/galaxyhack
 @dirrm %%DATADIR%%/music
 @dirrm %%DATADIR%%/graphics
 @dirrm %%DATADIR%%/gamedata
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/the_m/unitpictures/yellow/smallship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/the_m/unitpictures/yellow/frigate
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/the_m/unitpictures/yellow/capship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/the_m/unitpictures/yellow
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/the_m/unitpictures/red/smallship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/the_m/unitpictures/red/frigate
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/the_m/unitpictures/red/capship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/the_m/unitpictures/red
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/the_m/unitpictures/green/smallship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/the_m/unitpictures/green/frigate
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/the_m/unitpictures/green/capship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/the_m/unitpictures/green
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/the_m/unitpictures/blue/smallship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/the_m/unitpictures/blue/frigate
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/the_m/unitpictures/blue/capship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/the_m/unitpictures/blue
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/the_m/unitpictures
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/the_m
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/sitducks
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/quiters
@@ -852,7 +836,6 @@ libexec/galaxyhack
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/humanoids/unitpictures/green
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/humanoids/unitpictures/blue/smallship
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/humanoids/unitpictures/blue/frigate
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/humanoids/unitpictures/blue/capship
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/humanoids/unitpictures/blue
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/humanoids/unitpictures
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/humanoids
@@ -947,20 +930,12 @@ libexec/galaxyhack
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/atenyn/unitpictures
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/atenyn
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/alfarninas/unitpictures/yellow/smallship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/alfarninas/unitpictures/yellow/frigate
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/alfarninas/unitpictures/yellow/capship
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/alfarninas/unitpictures/yellow
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/alfarninas/unitpictures/red/smallship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/alfarninas/unitpictures/red/frigate
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/alfarninas/unitpictures/red/capship
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/alfarninas/unitpictures/red
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/alfarninas/unitpictures/green/smallship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/alfarninas/unitpictures/green/frigate
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/alfarninas/unitpictures/green/capship
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/alfarninas/unitpictures/green
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/alfarninas/unitpictures/blue/smallship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/alfarninas/unitpictures/blue/frigate
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/alfarninas/unitpictures/blue/capship
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/alfarninas/unitpictures/blue
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/alfarninas/unitpictures
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/alfarninas
@@ -993,38 +968,26 @@ libexec/galaxyhack
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/The VKY/unitpictures/blue
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/The VKY/unitpictures
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/The VKY
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/Tedingtons/unitpictures/yellow/smallship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/Tedingtons/unitpictures/yellow/frigate
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Tedingtons/unitpictures/yellow/capship
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Tedingtons/unitpictures/yellow
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/Tedingtons/unitpictures/red/smallship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/Tedingtons/unitpictures/red/frigate
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Tedingtons/unitpictures/red/capship
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Tedingtons/unitpictures/red
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/Tedingtons/unitpictures/green/smallship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/Tedingtons/unitpictures/green/frigate
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Tedingtons/unitpictures/green/capship
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Tedingtons/unitpictures/green
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/Tedingtons/unitpictures/blue/smallship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/Tedingtons/unitpictures/blue/frigate
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Tedingtons/unitpictures/blue/capship
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Tedingtons/unitpictures/blue
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Tedingtons/unitpictures
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Tedingtons
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Star Wars/unitpictures/yellow/smallship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/Star Wars/unitpictures/yellow/frigate
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Star Wars/unitpictures/yellow/capship
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Star Wars/unitpictures/yellow
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Star Wars/unitpictures/red/smallship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/Star Wars/unitpictures/red/frigate
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Star Wars/unitpictures/red/capship
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Star Wars/unitpictures/red
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Star Wars/unitpictures/green/smallship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/Star Wars/unitpictures/green/frigate
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Star Wars/unitpictures/green/capship
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Star Wars/unitpictures/green
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Star Wars/unitpictures/blue/smallship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/Star Wars/unitpictures/blue/frigate
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Star Wars/unitpictures/blue/capship
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Star Wars/unitpictures/blue
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Star Wars/unitpictures
@@ -1032,23 +995,6 @@ libexec/galaxyhack
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Space Superiority
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/SS-Rings-2
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/SS-Rings
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/Rushers/unitpictures/yellow/smallship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/Rushers/unitpictures/yellow/frigate
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/Rushers/unitpictures/yellow/capship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/Rushers/unitpictures/yellow
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/Rushers/unitpictures/red/smallship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/Rushers/unitpictures/red/frigate
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/Rushers/unitpictures/red/capship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/Rushers/unitpictures/red
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/Rushers/unitpictures/green/smallship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/Rushers/unitpictures/green/frigate
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/Rushers/unitpictures/green/capship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/Rushers/unitpictures/green
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/Rushers/unitpictures/blue/smallship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/Rushers/unitpictures/blue/frigate
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/Rushers/unitpictures/blue/capship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/Rushers/unitpictures/blue
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/Rushers/unitpictures
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Rushers
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Renennians
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Qurennians
@@ -1074,41 +1020,7 @@ libexec/galaxyhack
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Orbital V2
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Orbital
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Omicron
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/MiserableStingers/unitpictures/yellow/smallship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/MiserableStingers/unitpictures/yellow/frigate
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/MiserableStingers/unitpictures/yellow/capship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/MiserableStingers/unitpictures/yellow
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/MiserableStingers/unitpictures/red/smallship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/MiserableStingers/unitpictures/red/frigate
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/MiserableStingers/unitpictures/red/capship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/MiserableStingers/unitpictures/red
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/MiserableStingers/unitpictures/green/smallship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/MiserableStingers/unitpictures/green/frigate
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/MiserableStingers/unitpictures/green/capship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/MiserableStingers/unitpictures/green
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/MiserableStingers/unitpictures/blue/smallship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/MiserableStingers/unitpictures/blue/frigate
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/MiserableStingers/unitpictures/blue/capship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/MiserableStingers/unitpictures/blue
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/MiserableStingers/unitpictures
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/MiserableStingers
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/MMM/unitpictures/yellow/smallship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/MMM/unitpictures/yellow/frigate
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/MMM/unitpictures/yellow/capship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/MMM/unitpictures/yellow
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/MMM/unitpictures/red/smallship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/MMM/unitpictures/red/frigate
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/MMM/unitpictures/red/capship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/MMM/unitpictures/red
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/MMM/unitpictures/green/smallship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/MMM/unitpictures/green/frigate
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/MMM/unitpictures/green/capship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/MMM/unitpictures/green
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/MMM/unitpictures/blue/smallship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/MMM/unitpictures/blue/frigate
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/MMM/unitpictures/blue/capship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/MMM/unitpictures/blue
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/MMM/unitpictures
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/MMM
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Kpovieta
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Kamikaza
@@ -1133,39 +1045,23 @@ libexec/galaxyhack
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/IR2 The Swarm/unitpictures
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/IR2 The Swarm
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/IR Evadies
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/Hirvikankaalaiset/unitpictures/yellow/smallship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/Hirvikankaalaiset/unitpictures/yellow/frigate
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/Hirvikankaalaiset/unitpictures/yellow/capship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/Hirvikankaalaiset/unitpictures/yellow
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Hirvikankaalaiset/unitpictures/red/smallship
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Hirvikankaalaiset/unitpictures/red/frigate
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Hirvikankaalaiset/unitpictures/red/capship
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Hirvikankaalaiset/unitpictures/red
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/Hirvikankaalaiset/unitpictures/green/smallship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/Hirvikankaalaiset/unitpictures/green/frigate
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/Hirvikankaalaiset/unitpictures/green/capship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/Hirvikankaalaiset/unitpictures/green
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/Hirvikankaalaiset/unitpictures/blue/smallship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/Hirvikankaalaiset/unitpictures/blue/frigate
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/Hirvikankaalaiset/unitpictures/blue/capship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/Hirvikankaalaiset/unitpictures/blue
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Hirvikankaalaiset/unitpictures
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Hirvikankaalaiset
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Ghost v1
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Fereans/unitpictures/yellow/smallship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/Fereans/unitpictures/yellow/frigate
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Fereans/unitpictures/yellow/capship
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Fereans/unitpictures/yellow
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Fereans/unitpictures/red/smallship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/Fereans/unitpictures/red/frigate
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Fereans/unitpictures/red/capship
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Fereans/unitpictures/red
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Fereans/unitpictures/green/smallship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/Fereans/unitpictures/green/frigate
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Fereans/unitpictures/green/capship
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Fereans/unitpictures/green
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Fereans/unitpictures/blue/smallship
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/Fereans/unitpictures/blue/frigate
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Fereans/unitpictures/blue/capship
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Fereans/unitpictures/blue
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Fereans/unitpictures
@@ -1192,19 +1088,15 @@ libexec/galaxyhack
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Cowards
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Carcinogeneticans/unitpictures/yellow/smallship
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Carcinogeneticans/unitpictures/yellow/frigate
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/Carcinogeneticans/unitpictures/yellow/capship
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Carcinogeneticans/unitpictures/yellow
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Carcinogeneticans/unitpictures/red/smallship
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Carcinogeneticans/unitpictures/red/frigate
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/Carcinogeneticans/unitpictures/red/capship
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Carcinogeneticans/unitpictures/red
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Carcinogeneticans/unitpictures/green/smallship
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Carcinogeneticans/unitpictures/green/frigate
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/Carcinogeneticans/unitpictures/green/capship
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Carcinogeneticans/unitpictures/green
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Carcinogeneticans/unitpictures/blue/smallship
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Carcinogeneticans/unitpictures/blue/frigate
-%%FLEETS%%@dirrm %%DATADIR%%/fleets/Carcinogeneticans/unitpictures/blue/capship
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Carcinogeneticans/unitpictures/blue
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Carcinogeneticans/unitpictures
 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Carcinogeneticans