- Bump PORTREVISION

- Change master sites
- Add more levels
- Support STAGEDIR
- Change pkg-plist

Approved by:	pawel / wg (mentors, implicit

3 files changed, 27 insertions, 20 deletions

diff --git a/games/xye/Makefile b/games/xye/Makefile
index 05eb620708dc..07864b6086bd 100644
--- a/games/xye/Makefile
+++ b/games/xye/Makefile
@@ -3,25 +3,22 @@
 
 PORTNAME=	xye
 PORTVERSION=	0.12.2
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF:game \
 		http://xye.sourceforge.net/levels/ \
 		http://xye.sourceforge.net/:xmas \
-		SF/nemysisfreebsdp/:nemysis \
+		SF/nemysisfreebsdp/${CATEGORIES}/${PORTNAME}/:nemysis \
 		http://xye.sourceforge.net/skins/:skins
 DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}:game \
 		${LEVELS:S/$/.zip/} \
 		${LEVELS_XYE:S/$/.xye/} \
 		xmas-xye-2009.zip:xmas \
 		xye_extra_levels.20121109.zip:nemysis \
-		XMASKYESKIN.zip:skins \
-		Xye%20skin%20-%20classic%20kye.zip:skins
+		Xye%20skin%20-%20classic%20kye.zip:skins \
+		XMASKYESKIN.zip:skins
 DIST_SUBDIR=	${PORTNAME}
-EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
-		${LEVELS:S/$/.zip/} \
-		xmas-xye-2009.zip \
-		xye_extra_levels.20121109.zip \
-		${SKINS:S/$/.zip/}
+EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	nemysis@FreeBSD.org
 COMMENT=	Puzzle games like sokoban or boulderdash
@@ -35,7 +32,9 @@ USE_SDL=	sdl image ttf
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-docdir=${PREFIX}/share/doc
 
-LEVELS=		Xye%20level%20-%20The%20plan Xye%20level%20-%20Controller \
+LEVELS=		Xye%20level%20-%204corners Xye%20level%20-%20Against%20the%20force \
+		Xye%20level%20-%20Stop%20that%20cab Xye%20level%20-%20Helping%20Hand \
+		Xye%20level%20-%20The%20plan Xye%20level%20-%20Controller \
 		Xye%20level%20-%20At%20once Xye%20level%20-%20Open%20Ended \
 		Xye%20level%20-%20Sorting Xye%20level%20-%20The%20insider \
 		Xye%20level%20-%20The%20slow%20speedrun Xye%20levels%20-%20SuperJustin \
@@ -46,7 +45,7 @@ LEVELS=		Xye%20level%20-%20The%20plan Xye%20level%20-%20Controller \
 
 LEVELS_XYE=	dungeon turnaround chekhov
 
-SKINS=		XMASKYESKIN Xye%20skin%20-%20classic%20kye
+SKINS=		Xye%20skin%20-%20classic%20kye XMASKYESKIN
 
 PORTDOCS=	*
 
@@ -61,7 +60,6 @@ SKINS_DESC=	Install additional skins
 
 OPTIONS_SUB=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-extract-script:
@@ -85,16 +83,13 @@ post-patch:
 .endif
 
 post-install:
-	@(cd ${WRKDIR} && ${COPYTREE_SHARE} "*.xye *.txt" ${DATADIR}/levels)
+	@(cd ${WRKDIR} && ${COPYTREE_SHARE} "*.xye *.txt" ${STAGEDIR}${DATADIR}/levels)
 
 .if ${PORT_OPTIONS:MSKINS}
-	@(cd ${WRKDIR}/skins && ${COPYTREE_SHARE} . ${DATADIR}/res)
+	@(cd ${WRKDIR}/skins && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/res)
 .endif
 
-	${LN} -sf ${DATADIR}/res/detailed_icon.png ${PREFIX}/share/pixmaps/${PORTNAME}.png
-
-	@${ECHO_CMD}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_CMD}
+	${LN} -sf ${DATADIR}/res/detailed_icon.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
 
 .include <bsd.port.mk>
diff --git a/games/xye/distinfo b/games/xye/distinfo
index 90d17082e851..83264ae2e00d 100644
--- a/games/xye/distinfo
+++ b/games/xye/distinfo
@@ -1,5 +1,13 @@
 SHA256 (xye/xye-0.12.2.tar.gz) = 5d7c04f37d6b4a1821594512c7ddbc8189f968e08ecfd5af55231302f2f917d8
 SIZE (xye/xye-0.12.2.tar.gz) = 2860290
+SHA256 (xye/Xye%20level%20-%204corners.zip) = b17743cf6f5676f572c3e20b06705b1ca3bc09e1d23ececa0ad7328c35acc1f8
+SIZE (xye/Xye%20level%20-%204corners.zip) = 2217
+SHA256 (xye/Xye%20level%20-%20Against%20the%20force.zip) = 924226afee0f9dfc2dbf65be55536a0692f0ad753334a53a6cf615fbcfb8e5c7
+SIZE (xye/Xye%20level%20-%20Against%20the%20force.zip) = 2546
+SHA256 (xye/Xye%20level%20-%20Stop%20that%20cab.zip) = af750a97b795fafb2e55c9c13596e9533a25c7c2aa32d883383935dbdee47453
+SIZE (xye/Xye%20level%20-%20Stop%20that%20cab.zip) = 2720
+SHA256 (xye/Xye%20level%20-%20Helping%20Hand.zip) = 687169193e026ec314a7554f64d1fce4e865970ab4936e2e43dbc94763f5a374
+SIZE (xye/Xye%20level%20-%20Helping%20Hand.zip) = 2468
 SHA256 (xye/Xye%20level%20-%20The%20plan.zip) = 03eafa3756b87e9bd91d05e663c780fa59853d39747ba1d624b196d77c09b7fa
 SIZE (xye/Xye%20level%20-%20The%20plan.zip) = 2250
 SHA256 (xye/Xye%20level%20-%20Controller.zip) = 9a0604a07bb965ee7a2bf9ad259c694c081268f382cfda5a2d892c18c8910856
@@ -44,7 +52,7 @@ SHA256 (xye/xmas-xye-2009.zip) = 2db90f4155a16ad9a8edb343747b37adba82f1138b253b8
 SIZE (xye/xmas-xye-2009.zip) = 9763
 SHA256 (xye/xye_extra_levels.20121109.zip) = 3912f4b9b6849cc197733a38792ca623569e4e82428a910341cadea66579ef87
 SIZE (xye/xye_extra_levels.20121109.zip) = 47941
-SHA256 (xye/XMASKYESKIN.zip) = dcc3323eda62ccb81b1ecd8c06cd9412a68e4c27cf0cd64273a9b046b16c8524
-SIZE (xye/XMASKYESKIN.zip) = 45993
 SHA256 (xye/Xye%20skin%20-%20classic%20kye.zip) = 8c8b15afbc6f9aa363e78d8c986eaa86f2d74494e8c358642664ca68a36897f7
 SIZE (xye/Xye%20skin%20-%20classic%20kye.zip) = 81926
+SHA256 (xye/XMASKYESKIN.zip) = dcc3323eda62ccb81b1ecd8c06cd9412a68e4c27cf0cd64273a9b046b16c8524
+SIZE (xye/XMASKYESKIN.zip) = 45993
diff --git a/games/xye/pkg-plist b/games/xye/pkg-plist
index 13f1024b22ae..461568d0f770 100644
--- a/games/xye/pkg-plist
+++ b/games/xye/pkg-plist
@@ -1,5 +1,6 @@
 bin/xye
 share/pixmaps/xye.png
+%%DATADIR%%/levels/4corners.xye
 %%DATADIR%%/levels/5levels.xye
 %%DATADIR%%/levels/ActionReplay v.1.xye
 %%DATADIR%%/levels/ActionReplay v.2.xye
@@ -12,8 +13,10 @@ share/pixmaps/xye.png
 %%DATADIR%%/levels/Pyramid Treasure.xye
 %%DATADIR%%/levels/SuperJustin.xye
 %%DATADIR%%/levels/afirflood.xye
+%%DATADIR%%/levels/againstforce.xye
 %%DATADIR%%/levels/atonce.xye
 %%DATADIR%%/levels/blobprison.xye
+%%DATADIR%%/levels/cab.xye
 %%DATADIR%%/levels/complexity.xye
 %%DATADIR%%/levels/controller.xye
 %%DATADIR%%/levels/cracked.xye
@@ -23,6 +26,7 @@ share/pixmaps/xye.png
 %%DATADIR%%/levels/fast.xye
 %%DATADIR%%/levels/find1.xye
 %%DATADIR%%/levels/gravity.xye
+%%DATADIR%%/levels/helpinghand.xye
 %%DATADIR%%/levels/insider.xye
 %%DATADIR%%/levels/levels.xye
 %%DATADIR%%/levels/logo.xye