- Change master sites

- Change maintainer email to @FreeBSD.org
- Add DOCS Option
- Support STAGEDIR
- Change pkg-message
- Use only one WWW

Approved by:	pawel / wg (mentors, implicit)

3 files changed, 20 insertions, 21 deletions

diff --git a/games/kye/Makefile b/games/kye/Makefile
index c77d0800fb85..0afc985182ff 100644
--- a/games/kye/Makefile
+++ b/games/kye/Makefile
@@ -6,17 +6,17 @@ PORTVERSION=	1.0
 PORTREVISION=	3
 CATEGORIES=	games python
 MASTER_SITES=	http://games.moria.org.uk/kye/download/ \
-		SF/nemysisfreebsdp/kye/:nemysis
+		SF/nemysisfreebsdp/games/${PORTNAME}/:levels
 # Selection of production-ready/well-known Kye Levels
 # (Zipped levels already included from games.moria.org.uk are excluded)
 # Please contact the maintainer if a Level is missing
 DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
-		kye-data_moria_levels.20121101.tar.gz:nemysis \
-		kye-data_nuke_levels.20121101.tar.gz:nemysis \
-		kye-data_extra_levels.20120818.tar.gz:nemysis
+		kye-data_moria_levels.20121101.tar.gz:levels \
+		kye-data_nuke_levels.20121101.tar.gz:levels \
+		kye-data_extra_levels.20120818.tar.gz:levels
 DIST_SUBDIR=	kye
 
-MAINTAINER=	nemysis@gmx.ch
+MAINTAINER=	nemysis@FreeBSD.org
 COMMENT=	Puzzle game with arcade game elements
 
 LICENSE=	GPLv2
@@ -24,16 +24,16 @@ LICENSE=	GPLv2
 USE_GNOME=	pygtk2 librsvg2
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
-NO_BUILD=	yes
 
 PORTDOCS=	NEWS README
 
+OPTIONS_DEFINE=	DOCS
+
 SUB_FILES=	pkg-message
 
 DESKTOP_ENTRIES="Python Kye" "${COMMENT}" "Kye" \
 		"Kye" "Game;LogicGame;" false
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-extract-script:
@@ -43,17 +43,11 @@ post-extract-script:
 .endfor
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/kye-icon.png ${PREFIX}/share/pixmaps/Kye.png
-	${INSTALL_DATA} ${WRKSRC}/kye-edit-icon.png ${PREFIX}/share/pixmaps/Kye-edit.png
-	@cd ${WRKDIR}/${PORTNAME} && ${COPYTREE_SHARE} \* ${DATADIR}
-
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
-.endif
-
-	@${ECHO_CMD}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_CMD}
+	${INSTALL_DATA} ${WRKSRC}/kye-icon.png ${STAGEDIR}${PREFIX}/share/pixmaps/Kye.png
+	${INSTALL_DATA} ${WRKSRC}/kye-edit-icon.png ${STAGEDIR}${PREFIX}/share/pixmaps/Kye-edit.png
+	@cd ${WRKDIR}/${PORTNAME} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
+
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/games/kye/files/pkg-message.in b/games/kye/files/pkg-message.in
index cad168018ba0..6f9d12389948 100644
--- a/games/kye/files/pkg-message.in
+++ b/games/kye/files/pkg-message.in
@@ -2,6 +2,12 @@
 
 Python Kye has been installed.
 
+
+These levels are included in this package
+
+    http://www.nuke.demon.co.uk/kye/levels/
+
+
 This package does not include all Python Kye Levels.
 
 You can search for additional extra Levels here:
@@ -10,6 +16,7 @@ You can search for additional extra Levels here:
 
     http://www.classicdosgames.com/game/Kye.html
 
+
 and other Sites and put it in:
 
     %%DATADIR%%
diff --git a/games/kye/pkg-descr b/games/kye/pkg-descr
index 1b3ac458f6b8..1e87e2276932 100644
--- a/games/kye/pkg-descr
+++ b/games/kye/pkg-descr
@@ -9,5 +9,3 @@ work on any system with working Python and pygtk. It works on Windows as well,
 for instance.
 
 WWW: http://games.moria.org.uk/kye/
-WWW: http://www.nuke.demon.co.uk/kye/levels/
-WWW: https://sourceforge.net/projects/nemysisfreebsdp/files/kye/