- Convert to OptionsNG framework

- Trim Makefile headers
- Pass maintainership to submitter

PR:		ports/172679
Submitted by:	nemysis <nemysis@gmx.ch>

4 files changed, 59 insertions, 136 deletions

diff --git a/games/pyawale/Makefile b/games/pyawale/Makefile
index c6d92872eb87..9b768ddc99ab 100644
--- a/games/pyawale/Makefile
+++ b/games/pyawale/Makefile
@@ -1,53 +1,60 @@
-# New ports collection makefile for:	pyawale
-# Date created:		14 August 2007
-# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
-#
+# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	pyawale
 PORTVERSION=	0.4.0
-PORTREVISION=	2
-CATEGORIES=	games
+PORTREVISION=	3
+CATEGORIES=	games python
 MASTER_SITES=	http://download.gna.org/pyawale/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	nemysis@gmx.ch
 COMMENT=	African board game
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	py*-game>=1.7.1:${PORTSDIR}/devel/py-game
+RUN_DEPENDS=	${PYGAME}
 
 USE_PYTHON=	yes
 
+PLIST_FILES=	bin/${PORTNAME} \
+		share/applications/${PORTNAME}.desktop \
+		share/pixmaps/${PORTNAME}.png
+PLIST_DIRSTRY=	share/applications
+
+PORTDATA=	*
+PORTDOCS=	*
+
+DOCSRCDIR1=	${WRKSRC}
+DOC_FILES1=	AUTHORS ChangeLog LISEZMOI NEWS README
+
+DOCSRCDIR2=	${WRKSRC}/docs
+DOCSDIR2=	${DOCSDIR}/docs
+DOC_FILES2=	*.rest *.html *.jpg
+
+SUB_FILES=	${PORTNAME}
+
+.include <bsd.port.options.mk>
+
+post-patch:
+	@${FIND} ${WRKSRC} -name '*.py' | ${XARGS} \
+		${REINPLACE_CMD} -e 's|/usr/bin/python|${PYTHON_CMD}|'
+	@${FIND} ${WRKSRC} -name "*.bak" -delete
+
 do-build:
-	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/src
-	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/src
-	@${ECHO_CMD} "#!/bin/sh" > ${WRKSRC}/${PORTNAME}
-	@${ECHO_CMD} "exec ${PYTHON_CMD} \
-		${PYTHONPREFIX_SITELIBDIR}/pyAwale/${PORTNAME}.py" \
-		>> ${WRKSRC}/${PORTNAME}
+	@${PYTHON_CMD} -m compileall ${WRKSRC}
+	@${PYTHON_CMD} -O -m compileall ${WRKSRC}
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	@${MKDIR} ${PYTHONPREFIX_SITELIBDIR}/pyAwale
-	@(cd ${WRKSRC}/src \
-		&& ${COPYTREE_SHARE} . ${PYTHONPREFIX_SITELIBDIR}/pyAwale)
-	@${MKDIR} ${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKSRC}/docs/${PORTNAME}.desktop \
-		${PREFIX}/share/applications
-	@${MKDIR} ${PREFIX}/share/pixmaps
-	${INSTALL_DATA} ${WRKSRC}/docs/${PORTNAME}.png \
-		${PREFIX}/share/pixmaps
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for i in AUTHORS ChangeLog NEWS README
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
-.endfor
-	@${MKDIR} ${DOCSDIR}/docs
-	${INSTALL_DATA} ${WRKSRC}/docs/*.jpg ${DOCSDIR}/docs
-	${INSTALL_DATA} ${WRKSRC}/docs/*.html ${DOCSDIR}/docs
-	${INSTALL_DATA} ${WRKSRC}/docs/*.rest ${DOCSDIR}/docs
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
+	${MKDIR} ${DATADIR}
+	@(cd ${WRKSRC}/src && ${COPYTREE_SHARE} \* ${DATADIR})
+	${INSTALL_DATA} ${WRKSRC}/docs/${PORTNAME}.png ${PREFIX}/share/pixmaps
+	${MKDIR} ${PREFIX}/share/applications
+	${INSTALL_DATA} ${WRKSRC}/docs/${PORTNAME}.desktop ${PREFIX}/share/applications
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${DOCSDIR}
+	${MKDIR} ${DOCSDIR2}
+	${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${DOCSDIR2}
 .endif
-
 .include <bsd.port.mk>
diff --git a/games/pyawale/files/pyawale.in b/games/pyawale/files/pyawale.in
new file mode 100644
index 000000000000..209558ce87df
--- /dev/null
+++ b/games/pyawale/files/pyawale.in
@@ -0,0 +1,7 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+cd "%%DATADIR%%"
+exec /usr/bin/env python ./pyawale.py
diff --git a/games/pyawale/pkg-descr b/games/pyawale/pkg-descr
index 3f60d2cd7389..fe41c8639908 100644
--- a/games/pyawale/pkg-descr
+++ b/games/pyawale/pkg-descr
@@ -1,5 +1,13 @@
 Awale or Oware is a game of great antiquity, and has been played around
-the world in various forms for millenia.  Currently it is the official
-board game of Africa. Wikipedia: Oware
+the world in various forms for millenia. Currently it is the official
+board game of Africa.
+
+Wikipedia Oware
+
+Member of the Mancala family of board games. There are many variants
+to the rules of this game, which is for two players. This version is
+between a player and the computer.
+
+Wikipedia Mancala
 
 WWW: https://gna.org/projects/pyawale/
diff --git a/games/pyawale/pkg-plist b/games/pyawale/pkg-plist
deleted file mode 100644
index 99864eaa3427..000000000000
--- a/games/pyawale/pkg-plist
+++ /dev/null
@@ -1,99 +0,0 @@
-bin/pyawale
-%%PYTHON_SITELIBDIR%%/pyAwale/__init__.py
-%%PYTHON_SITELIBDIR%%/pyAwale/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pyAwale/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pyAwale/awale.py
-%%PYTHON_SITELIBDIR%%/pyAwale/awale.pyc
-%%PYTHON_SITELIBDIR%%/pyAwale/awale.pyo
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_board_closed.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_board_empty.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_north_0.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_north_1.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_north_10.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_north_11.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_north_12.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_north_13.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_north_14.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_north_15.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_north_16.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_north_17.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_north_18.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_north_19.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_north_2.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_north_20.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_north_21.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_north_22.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_north_23.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_north_24.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_north_25.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_north_3.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_north_4.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_north_5.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_north_6.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_north_7.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_north_8.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_north_9.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_seed_0.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_seed_10d.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_seed_11d.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_seed_12d.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_seed_12d_13.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_seed_14d.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_seed_15d.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_seed_1d.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_seed_2c.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_seed_3b.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_seed_4D.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_seed_5d.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_seed_6c.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_seed_7b.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_seed_8e.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_seed_9d.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_south_0.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_south_1.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_south_10.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_south_11.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_south_12.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_south_13.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_south_14.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_south_15.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_south_16.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_south_17.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_south_18.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_south_19.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_south_2.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_south_20.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_south_21.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_south_22.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_south_23.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_south_24.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_south_25.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_south_3.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_south_4.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_south_5.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_south_6.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_south_7.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_south_8.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/awale_south_9.png
-%%PYTHON_SITELIBDIR%%/pyAwale/images/freesansbold.ttf
-%%PYTHON_SITELIBDIR%%/pyAwale/pyawale.py
-%%PYTHON_SITELIBDIR%%/pyAwale/pyawale.pyc
-%%PYTHON_SITELIBDIR%%/pyAwale/pyawale.pyo
-share/applications/pyawale.desktop
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/docs/awale_algos.rest
-%%PORTDOCS%%%%DOCSDIR%%/docs/awale_module.rest
-%%PORTDOCS%%%%DOCSDIR%%/docs/pyawale.html
-%%PORTDOCS%%%%DOCSDIR%%/docs/pyawale.rest
-%%PORTDOCS%%%%DOCSDIR%%/docs/pyawale_end.jpg
-%%PORTDOCS%%%%DOCSDIR%%/docs/pyawale_gui.jpg
-%%PORTDOCS%%%%DOCSDIR%%/docs/pyawale_intro.jpg
-share/pixmaps/pyawale.png
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry share/applications
-@dirrm %%PYTHON_SITELIBDIR%%/pyAwale/images
-@dirrm %%PYTHON_SITELIBDIR%%/pyAwale