- Update to 0.12.2

- Change maintainer email gmx.ch --> FreeBSD.org
- Add more levels
- Use new Options Helpers

Approved by:	wg/pawel (mentors)

3 files changed, 30 insertions, 26 deletions

diff --git a/games/xye/Makefile b/games/xye/Makefile
index 4b10e16b7a34..dc037f53c39d 100644
--- a/games/xye/Makefile
+++ b/games/xye/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xye
-PORTVERSION=	0.12.1
-PORTREVISION=	1
+PORTVERSION=	0.12.2
 CATEGORIES=	games
 MASTER_SITES=	SF:game \
 		http://xye.sourceforge.net/levels/ \
@@ -24,20 +23,22 @@ EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
 		xye_extra_levels.20121109.zip \
 		${SKINS:S/$/.zip/}
 
-MAINTAINER=	nemysis@gmx.ch
+MAINTAINER=	nemysis@FreeBSD.org
 COMMENT=	Puzzle games like sokoban or boulderdash
 
 LICENSE=	ZLIB
 
-EXTRACT_DEPENDS=${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip
+EXTRACT_DEPENDS=${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
 
+USES=		gmake
 USE_SDL=	sdl image ttf
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-docdir=${PREFIX}/share/doc
-USE_GMAKE=	yes
 
-LEVELS=		Xye%20level%20-%20Open%20Ended Xye%20level%20-%20Sorting \
-		Xye%20level%20-%20The%20insider Xye%20level%20-%20The%20slow%20speedrun \
+LEVELS=		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 \
 		Xye%20level%20-%20disturbingarrows Xye%20level%20-%20Duels%20of%20fate \
 		nuffmagnets Xye%20levels%20-%20Pyramid%20treasure afirflood \
 		Xye%20level%20-%20Blob%20prison Xye%20levels%20-%20ActionReplay \
@@ -47,6 +48,8 @@ LEVELS_XYE=	dungeon turnaround chekhov
 
 SKINS=		XMASKYESKIN Xye%20skin%20-%20classic%20kye
 
+PORTDOCS=	*
+
 DESKTOP_ENTRIES="Xye" "${COMMENT}" "${PORTNAME}" \
 		"${PORTNAME}" "Game;LogicGame;" false
 
@@ -56,22 +59,18 @@ OPTIONS_DEFINE=	DOCS SKINS
 OPTIONS_DEFAULT=	SKINS
 SKINS_DESC=	Install additional skins
 
-.include <bsd.port.options.mk>
+OPTIONS_SUB=	yes
 
-.if defined(WITH_SKINS)
-PLIST_SUB+=	SKINS=""
-.else
-PLIST_SUB+=	SKINS="@comment "
-.endif
+.include <bsd.port.options.mk>
 
 post-extract-script:
 .for l in ${LEVELS:S/$/.zip/} xmas-xye-2009.zip xye_extra_levels.20121109.zip
-	@${UNZIP_CMD} -qoj -d ${WRKDIR} ${DISTDIR}/${DIST_SUBDIR}/${l}
+	@${UNZIP_CMD} -qoj -d ${WRKDIR} ${_DISTDIR}/${l}
 .endfor
 
 .if ${PORT_OPTIONS:MSKINS}
 .  for s in ${SKINS:S/$/.zip/}
-	@${UNZIP_CMD} -qoj -d ${WRKDIR}/skins ${DISTDIR}/${DIST_SUBDIR}/${s}
+	@${UNZIP_CMD} -qoj -d ${WRKDIR}/skins ${_DISTDIR}/${s}
 .  endfor
 .endif
 
@@ -79,16 +78,16 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|docedir = $$(datadir)|docedir = ${PREFIX}/share/doc|' \
 		${WRKSRC}/Makefile.in
 
-.if !${PORT_OPTIONS:MDOCS}
+.if ! ${PORT_OPTIONS:MDOCS}
 	@${REINPLACE_CMD} '/install-data-am:/s/install-doceDATA//' \
 		${WRKSRC}/Makefile.in
 .endif
 
 post-install:
-	@cd ${WRKDIR} && ${COPYTREE_SHARE} "*.xye *.txt" ${DATADIR}/levels
+	@(cd ${WRKDIR} && ${COPYTREE_SHARE} "*.xye *.txt" ${DATADIR}/levels)
 
 .if ${PORT_OPTIONS:MSKINS}
-	@cd ${WRKDIR}/skins && ${COPYTREE_SHARE} \* ${DATADIR}/res
+	@(cd ${WRKDIR}/skins && ${COPYTREE_SHARE} . ${DATADIR}/res)
 .endif
 
 	${LN} -sf ${DATADIR}/res/detailed_icon.png ${PREFIX}/share/pixmaps/${PORTNAME}.png
diff --git a/games/xye/distinfo b/games/xye/distinfo
index 64bb91c36ae4..90d17082e851 100644
--- a/games/xye/distinfo
+++ b/games/xye/distinfo
@@ -1,5 +1,11 @@
-SHA256 (xye/xye-0.12.1.tar.gz) = bbeb3265b0795f14deb2851b4a3bda7dde9b07d624a7ca5fb88cd7acabcf3967
-SIZE (xye/xye-0.12.1.tar.gz) = 2850776
+SHA256 (xye/xye-0.12.2.tar.gz) = 5d7c04f37d6b4a1821594512c7ddbc8189f968e08ecfd5af55231302f2f917d8
+SIZE (xye/xye-0.12.2.tar.gz) = 2860290
+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
+SIZE (xye/Xye%20level%20-%20Controller.zip) = 2462
+SHA256 (xye/Xye%20level%20-%20At%20once.zip) = f7fa1d49300e980e2933205c75cccc98cbd515b09a7c3f657d7292d72b57b1f9
+SIZE (xye/Xye%20level%20-%20At%20once.zip) = 2422
 SHA256 (xye/Xye%20level%20-%20Open%20Ended.zip) = ef3076a0f7b77ce1195195788da7e62939513fac7a7bdd883618d115f3712348
 SIZE (xye/Xye%20level%20-%20Open%20Ended.zip) = 3244
 SHA256 (xye/Xye%20level%20-%20Sorting.zip) = f74894d02a99523f3b2f74d93613ea2bd0202cabd0c3467f57daabae20594457
@@ -8,6 +14,8 @@ SHA256 (xye/Xye%20level%20-%20The%20insider.zip) = d4f11e82727732012268178e824c4
 SIZE (xye/Xye%20level%20-%20The%20insider.zip) = 2658
 SHA256 (xye/Xye%20level%20-%20The%20slow%20speedrun.zip) = 266e3c72c0584c4f0c77339321827957e753d4611a248dd8bf4b4778fd847536
 SIZE (xye/Xye%20level%20-%20The%20slow%20speedrun.zip) = 2871
+SHA256 (xye/Xye%20levels%20-%20SuperJustin.zip) = 97053b735920583e9f7789023460d8eff440276be6f500948483cf53816d896f
+SIZE (xye/Xye%20levels%20-%20SuperJustin.zip) = 17463
 SHA256 (xye/Xye%20level%20-%20disturbingarrows.zip) = d11a31cdfa015cc4a452363e10938eaa006811043b98308c077919f7e8464e8c
 SIZE (xye/Xye%20level%20-%20disturbingarrows.zip) = 2784
 SHA256 (xye/Xye%20level%20-%20Duels%20of%20fate.zip) = 64c5002e0fe9128277ff7798baf03af6d0c4bc174a79a20513e2a8900fac9cb2
diff --git a/games/xye/pkg-plist b/games/xye/pkg-plist
index 109fe8fb969e..13f1024b22ae 100644
--- a/games/xye/pkg-plist
+++ b/games/xye/pkg-plist
@@ -1,9 +1,4 @@
 bin/xye
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/ReadMe.html
-%%PORTDOCS%%%%DOCSDIR%%/xye.svg
 share/pixmaps/xye.png
 %%DATADIR%%/levels/5levels.xye
 %%DATADIR%%/levels/ActionReplay v.1.xye
@@ -17,8 +12,10 @@ share/pixmaps/xye.png
 %%DATADIR%%/levels/Pyramid Treasure.xye
 %%DATADIR%%/levels/SuperJustin.xye
 %%DATADIR%%/levels/afirflood.xye
+%%DATADIR%%/levels/atonce.xye
 %%DATADIR%%/levels/blobprison.xye
 %%DATADIR%%/levels/complexity.xye
+%%DATADIR%%/levels/controller.xye
 %%DATADIR%%/levels/cracked.xye
 %%DATADIR%%/levels/decision.xye
 %%DATADIR%%/levels/disturbingarrows.xye
@@ -43,6 +40,7 @@ share/pixmaps/xye.png
 %%DATADIR%%/levels/snowforts.xye
 %%DATADIR%%/levels/sorting.xye
 %%DATADIR%%/levels/sphinx.xye
+%%DATADIR%%/levels/theplan.xye
 %%DATADIR%%/levels/tutorials.xye
 %%DATADIR%%/levels/twoinone.xye
 %%DATADIR%%/levels/xmas2009.xye
@@ -87,4 +85,3 @@ share/pixmaps/xye.png
 @dirrm %%DATADIR%%/res
 @dirrm %%DATADIR%%/levels
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%