- Change Makefile header

- Bump PORTREVISION
- Change master sites and icon
- Remove dependency for graphics/netpbm
- USES gmake instead of USE_GMAKE
- Use pkg-plist instead of PLIST_FILES and PORTDATA
- Add DOCS Option
- Support STAGEDIR
- Change Desktop entry file

Approved by:	pawel / wg (mentors, implicit)

3 files changed, 60 insertions, 33 deletions

diff --git a/games/sdl_lopan/Makefile b/games/sdl_lopan/Makefile
index f37768133d67..7e17bbe844f9 100644
--- a/games/sdl_lopan/Makefile
+++ b/games/sdl_lopan/Makefile
@@ -1,13 +1,14 @@
+# Created by: Rusmir Dusko <nemysis@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	sdl_lopan
 PORTVERSION=	10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://www.linuxmotors.com/sdllopan/downloads/ \
-		http://www.linuxmotors.com/sdllopan/:icons
+		SF/nemysisfreebsdp/${CATEGORIES}/:icons
 DISTFILES=	sdllopan-${DISTVERSION}.tgz \
-		sdllopan.gif:icons
+		${PORTNAME}.png:icons
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	sdllopan-${DISTVERSION}.tgz
 
@@ -16,46 +17,32 @@ COMMENT=	Mahjong game remake
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	giftopnm:${PORTSDIR}/graphics/netpbm
-
 WRKSRC=		${WRKDIR}/sdllopan-${PORTVERSION}
 
+USES=		gmake
 USE_SDL=	sdl image mixer
-USE_GMAKE=	yes
-
 ALL_TARGET=
 
-PLIST_FILES=	bin/sdllopan \
-		share/pixmaps/sdllopan.png
-
-PORTDATA=	*
 PORTDOCS=	Changelog README
 
-DESKTOP_ENTRIES="SDL Lopan" "${COMMENT}" "sdllopan" \
-		"sdllopan" "Game;ArcadeGame;" ${FALSE}
+OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+DESKTOP_ENTRIES="SDL Lopan" "" "${PORTNAME}" \
+		"${PORTNAME}" "Game;BoardGame;" ""
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|data/bg%d.pcx|${DATADIR}/data/bg%d.pcx|' \
-	-e 's|data/tiles%d.pcx|${DATADIR}/data/tiles%d.pcx|' \
-	-e 's|char temp\[64\];|char temp\[256\];|' \
+	@${REINPLACE_CMD} -e 's|data/bg%d.pcx|${DATADIR}/data/bg%d.pcx| ; \
+	s|data/tiles%d.pcx|${DATADIR}/data/tiles%d.pcx| ; \
+	s|char temp\[64\];|char temp\[256\];|' \
 		${WRKSRC}/lopan.c
 
-post-build:
-	@(cd ${WRKSRC} && \
-		${LOCALBASE}/bin/giftopnm ${DISTDIR}/${DIST_SUBDIR}/sdllopan.gif | \
-		${LOCALBASE}/bin/pamscale .1 | ${LOCALBASE}/bin/pnmtopng > sdllopan.png)
-
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/lopan ${PREFIX}/bin/sdllopan
-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} data ${DATADIR})
-	${INSTALL_DATA} ${WRKSRC}/sdllopan.png ${PREFIX}/share/pixmaps
-
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
-.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/lopan ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} data ${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/sdl_lopan/distinfo b/games/sdl_lopan/distinfo
index 94ae6a7d2758..906a1ca58a43 100644
--- a/games/sdl_lopan/distinfo
+++ b/games/sdl_lopan/distinfo
@@ -1,4 +1,4 @@
 SHA256 (sdl_lopan/sdllopan-10.tgz) = 386de065bc8c3449c3b0b5e5651cb035cb1bdc242b425c865dd387c54ce708c3
 SIZE (sdl_lopan/sdllopan-10.tgz) = 380102
-SHA256 (sdl_lopan/sdllopan.gif) = 390f26f4792e1116b4f4456a1e2b9713bca6b9fd200badb85e4b9be403a0988a
-SIZE (sdl_lopan/sdllopan.gif) = 45164
+SHA256 (sdl_lopan/sdl_lopan.png) = 2f5847124d95fb56ef027d34968567e10701168731910ab724078289a64f3a94
+SIZE (sdl_lopan/sdl_lopan.png) = 5906
diff --git a/games/sdl_lopan/pkg-plist b/games/sdl_lopan/pkg-plist
new file mode 100644
index 000000000000..dc70a2e71947
--- /dev/null
+++ b/games/sdl_lopan/pkg-plist
@@ -0,0 +1,40 @@
+bin/sdl_lopan
+share/pixmaps/sdl_lopan.png
+%%DATADIR%%/data/bg0.pcx
+%%DATADIR%%/data/bg1.pcx
+%%DATADIR%%/data/bg10.pcx
+%%DATADIR%%/data/bg11.pcx
+%%DATADIR%%/data/bg12.pcx
+%%DATADIR%%/data/bg13.pcx
+%%DATADIR%%/data/bg14.pcx
+%%DATADIR%%/data/bg15.pcx
+%%DATADIR%%/data/bg16.pcx
+%%DATADIR%%/data/bg17.pcx
+%%DATADIR%%/data/bg18.pcx
+%%DATADIR%%/data/bg19.pcx
+%%DATADIR%%/data/bg2.pcx
+%%DATADIR%%/data/bg20.pcx
+%%DATADIR%%/data/bg21.pcx
+%%DATADIR%%/data/bg22.pcx
+%%DATADIR%%/data/bg23.pcx
+%%DATADIR%%/data/bg24.pcx
+%%DATADIR%%/data/bg25.pcx
+%%DATADIR%%/data/bg26.pcx
+%%DATADIR%%/data/bg27.pcx
+%%DATADIR%%/data/bg28.pcx
+%%DATADIR%%/data/bg29.pcx
+%%DATADIR%%/data/bg3.pcx
+%%DATADIR%%/data/bg30.pcx
+%%DATADIR%%/data/bg31.pcx
+%%DATADIR%%/data/bg32.pcx
+%%DATADIR%%/data/bg33.pcx
+%%DATADIR%%/data/bg4.pcx
+%%DATADIR%%/data/bg5.pcx
+%%DATADIR%%/data/bg6.pcx
+%%DATADIR%%/data/bg7.pcx
+%%DATADIR%%/data/bg8.pcx
+%%DATADIR%%/data/bg9.pcx
+%%DATADIR%%/data/tiles0.pcx
+%%DATADIR%%/data/tiles1.pcx
+@dirrm %%DATADIR%%/data
+@dirrm %%DATADIR%%