3 files changed, 97 insertions, 33 deletions

diff --git a/games/gemdropx/Makefile b/games/gemdropx/Makefile
index 517d5c8f89ea..17b222a9a7c3 100644
--- a/games/gemdropx/Makefile
+++ b/games/gemdropx/Makefile
@@ -3,56 +3,49 @@
 
 PORTNAME=	gemdropx
 PORTVERSION=	0.9
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.tuxpaint.org/unix/x/gemdropx/src/ \
-		ftp://ftp.billsgames.com/unix/x/gemdropx/src/
+		ftp://ftp.billsgames.com/unix/x/gemdropx/src/ \
+		SF/nemysisfreebsdp/${CATEGORIES}/:icons
+DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
+		${PORTNAME}.png:icons
+EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	nemysis@FreeBSD.org
 COMMENT=	Interesting one-player puzzle game for X (SDL)
 
 LICENSE=	GPLv2
 
-ALL_TARGET=	${PORTNAME}
+USES=		gmake
 USE_SDL=	image mixer sdl
+ALL_TARGET=	${PORTNAME}
 
-USE_GMAKE=	yes
-
-PLIST_FILES=	bin/${PORTNAME} \
-		share/pixmaps/${PORTNAME}.xmp
-
-PORTDATA=	*
 PORTDOCS=	AUTHORS.txt CHANGES.txt ICON.txt README.txt TODO.txt
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	DOCS
+
+DESKTOP_ENTRIES="Gem Drop X" "" "${PORTNAME}" \
+		"${PORTNAME}" "Game;LogicGame;" ""
 
 post-patch:
-# Fix SDL, CFLAGS
 	@${REINPLACE_CMD} \
-	-e 's|sdl-config|$(SDL_CONFIG)|' \
-	-e 's|CC=gcc|CC?=g++|' \
-	-e 's|CXX=gcc|CXX?=g++|' \
-	-e 's|CFLAGS=-Wall $(SDL_CFLAGS)|CFLAGS+=$(SDL_CFLAGS)|' \
+	-e 's|sdl-config|$(SDL_CONFIG)| ; \
+	s|CC=gcc|CC?=${CC}| ; \
+	s|CXX=gcc|CXX?=${CC}| ; \
+	s|CFLAGS=-Wall $(SDL_CFLAGS)|CFLAGS+=-w $(SDL_CFLAGS)|' \
 		${WRKSRC}/Makefile
+	@${FIND} ${WRKDIR} -name .xvpics | ${XARGS} ${RM} -rf
 
 do-install:
-# Executable
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-
-# Data
-	${MKDIR} ${DATADIR}
-	@(cd ${WRKSRC}/data && ${COPYTREE_SHARE} "images sounds" ${DATADIR})
-
-# Pixmaps
-	${INSTALL_DATA} ${WRKSRC}/data/images/gemdropx-icon.xpm ${PREFIX}/share/pixmaps/${PORTNAME}.xmp
-
-# Documentation
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-.  for f in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.  endfor
-.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
+	@(cd ${WRKSRC}/data && ${COPYTREE_SHARE} "images sounds" \
+		${STAGEDIR}${DATADIR})
+
+	${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/gemdropx/distinfo b/games/gemdropx/distinfo
index 3ca497e8ef49..6ed2ad96ea3d 100644
--- a/games/gemdropx/distinfo
+++ b/games/gemdropx/distinfo
@@ -1,2 +1,4 @@
 SHA256 (gemdropx-0.9.tar.gz) = e50495d292a1d456c28044efbf07c16d8865f8d95e1caba86f4c5b2e3fb1d28f
 SIZE (gemdropx-0.9.tar.gz) = 903036
+SHA256 (gemdropx.png) = 7dd754add520e0320ca72d6bbb7699bbe112e54092a12990e304932163c10e38
+SIZE (gemdropx.png) = 697
diff --git a/games/gemdropx/pkg-plist b/games/gemdropx/pkg-plist
new file mode 100644
index 000000000000..7156396b9cc2
--- /dev/null
+++ b/games/gemdropx/pkg-plist
@@ -0,0 +1,69 @@
+bin/gemdropx
+%%DATADIR%%/images/README
+%%DATADIR%%/images/action-mask.xbm
+%%DATADIR%%/images/action.xbm
+%%DATADIR%%/images/author.bmp
+%%DATADIR%%/images/block.bmp
+%%DATADIR%%/images/bluegem.bmp
+%%DATADIR%%/images/bomb.bmp
+%%DATADIR%%/images/brick.bmp
+%%DATADIR%%/images/congratulations.bmp
+%%DATADIR%%/images/credits.bmp
+%%DATADIR%%/images/diamond.bmp
+%%DATADIR%%/images/disc.bmp
+%%DATADIR%%/images/dot.bmp
+%%DATADIR%%/images/explode0.bmp
+%%DATADIR%%/images/explode1.bmp
+%%DATADIR%%/images/explode2.bmp
+%%DATADIR%%/images/explode3.bmp
+%%DATADIR%%/images/fuji.bmp
+%%DATADIR%%/images/gemdropx-icon.xpm
+%%DATADIR%%/images/happy.bmp
+%%DATADIR%%/images/left-mask.xbm
+%%DATADIR%%/images/left.xbm
+%%DATADIR%%/images/level.bmp
+%%DATADIR%%/images/lines.bmp
+%%DATADIR%%/images/need.bmp
+%%DATADIR%%/images/nothing-mask.xbm
+%%DATADIR%%/images/nothing.xbm
+%%DATADIR%%/images/numbers.bmp
+%%DATADIR%%/images/patience.bmp
+%%DATADIR%%/images/paused.bmp
+%%DATADIR%%/images/right-mask.xbm
+%%DATADIR%%/images/right.xbm
+%%DATADIR%%/images/sad.bmp
+%%DATADIR%%/images/score.bmp
+%%DATADIR%%/images/stopwatch.bmp
+%%DATADIR%%/images/title.bmp
+%%DATADIR%%/images/triangle.bmp
+%%DATADIR%%/images/uhoh.bmp
+%%DATADIR%%/images/warning.bmp
+%%DATADIR%%/images/warning1.bmp
+%%DATADIR%%/images/warning2.bmp
+%%DATADIR%%/images/warning3.bmp
+%%DATADIR%%/images/warning4.bmp
+%%DATADIR%%/images/wildcard.bmp
+%%DATADIR%%/images/win1.bmp
+%%DATADIR%%/images/win2.bmp
+%%DATADIR%%/images/yellowgem.bmp
+%%DATADIR%%/sounds/22drops.mod
+%%DATADIR%%/sounds/2force.xm
+%%DATADIR%%/sounds/README
+%%DATADIR%%/sounds/applause.wav
+%%DATADIR%%/sounds/begin.wav
+%%DATADIR%%/sounds/bomb.wav
+%%DATADIR%%/sounds/buzzer.wav
+%%DATADIR%%/sounds/citron.mod
+%%DATADIR%%/sounds/clock.wav
+%%DATADIR%%/sounds/gameover.wav
+%%DATADIR%%/sounds/got.wav
+%%DATADIR%%/sounds/grab.wav
+%%DATADIR%%/sounds/hr_suds.xm
+%%DATADIR%%/sounds/levelselect.wav
+%%DATADIR%%/sounds/throw.wav
+%%DATADIR%%/sounds/wildcard.wav
+%%DATADIR%%/sounds/win.wav
+share/pixmaps/gemdropx.png
+@dirrm %%DATADIR%%/sounds
+@dirrm %%DATADIR%%/images
+@dirrm %%DATADIR%%