- Add stage support

- Add DOCS and NLS options
- Update WWW

PR:		ports/191300
Submitted by:	Muhammad Moinur Rahman <5u623l20@gmail.com>

3 files changed, 45 insertions, 43 deletions

diff --git a/multimedia/photofilmstrip/Makefile b/multimedia/photofilmstrip/Makefile
index 519aae627f0e..9e903dcd55c2 100644
--- a/multimedia/photofilmstrip/Makefile
+++ b/multimedia/photofilmstrip/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	photofilmstrip
 PORTVERSION=	1.5.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia python
 MASTER_SITES=	SF/photostoryx/${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -24,12 +24,14 @@ USE_PYTHON=	yes
 USE_WX=		2.8+
 WX_COMPS=	python:lib
 WX_UNICODE=	yes
-USES=		gettext
 ALL_TARGET=	compile
 
 PFSDIR=		${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	DOCS NLS
+OPTIONS_SUB=	yes
+NLS_USES=	gettext
+
 pre-everything::
 	@${ECHO_MSG} "To run ${PORTNAME}, you must have sqlite3 installed with extensions enabled."
 
@@ -54,26 +56,26 @@ post-patch:
 		 /^OnlyShowIn/d' ${WRKSRC}/build/${PORTNAME}.desktop
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/build/${PORTNAME} ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/build/${PORTNAME}-cli ${PREFIX}/bin
-	@${MKDIR} ${PFSDIR}
-	${INSTALL_DATA} ${WRKSRC}/src/${PORTNAME}-cli.py ${PFSDIR}
-	${INSTALL_DATA} ${WRKSRC}/src/${PORTNAME}-gui.py ${PFSDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/build/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/build/${PORTNAME}-cli ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${PFSDIR}
+	${INSTALL_DATA} ${WRKSRC}/src/${PORTNAME}-cli.py ${STAGEDIR}${PFSDIR}
+	${INSTALL_DATA} ${WRKSRC}/src/${PORTNAME}-gui.py ${STAGEDIR}${PFSDIR}
 .for dir in cli core gui lib res
 	@(cd ${WRKSRC}/src && \
 		${FIND} ${dir} ! \( -name '*.bak' -o -name '*.orig' \) | \
-		${CPIO} -pdm -R ${SHAREOWN}:${SHAREGRP} ${PFSDIR})
+		${CPIO} -pdm -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${PFSDIR})
 .endfor
-	@${MKDIR} ${PFSDIR}/doc
-	${INSTALL_DATA} ${WRKSRC}/doc/photofilmstrip/* ${PFSDIR}/doc
-	@${FIND} ${PFSDIR} -type d | ${XARGS} ${CHMOD} a+rx
-	@${FIND} ${PFSDIR} -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
-	${INSTALL_DATA} ${WRKSRC}/build/${PORTNAME}.desktop ${PREFIX}/share/applications
+	@${MKDIR} ${STAGEDIR}${PFSDIR}/doc
+	${INSTALL_DATA} ${WRKSRC}/doc/photofilmstrip/* ${STAGEDIR}${PFSDIR}/doc
+	@${FIND} ${STAGEDIR}${PFSDIR} -type d | ${XARGS} ${CHMOD} a+rx
+	@${FIND} ${STAGEDIR}${PFSDIR} -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
+	${INSTALL_DATA} ${WRKSRC}/build/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications
 .for lang in cs de en fr it ko nl pt tr
-	@${MKDIR} ${PREFIX}/share/locale/${lang}/LC_MESSAGES
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/${lang}/LC_MESSAGES
 	${INSTALL_DATA} ${WRKSRC}/po/${lang}.mo \
-		${PREFIX}/share/locale/${lang}/LC_MESSAGES/PhotoFilmStrip.mo
+		${STAGEDIR}${PREFIX}/share/locale/${lang}/LC_MESSAGES/PhotoFilmStrip.mo
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/build/${PORTNAME}.xpm ${PREFIX}/share/pixmaps
+	${INSTALL_DATA} ${WRKSRC}/build/${PORTNAME}.xpm ${STAGEDIR}${PREFIX}/share/pixmaps
 
 .include <bsd.port.mk>
diff --git a/multimedia/photofilmstrip/pkg-descr b/multimedia/photofilmstrip/pkg-descr
index ad47fa466e01..d62d5a2866ca 100644
--- a/multimedia/photofilmstrip/pkg-descr
+++ b/multimedia/photofilmstrip/pkg-descr
@@ -8,4 +8,4 @@ the pictures are generated into a subtitle file. Furthermore an
 audio file can be specified to setup the background musice for the
 slide show.
 
-WWW:	http://www.photofilmstrip.org/1-1-Home.html
+WWW: http://www.photofilmstrip.org/
diff --git a/multimedia/photofilmstrip/pkg-plist b/multimedia/photofilmstrip/pkg-plist
index 68ae271b63c1..95f26f42ef8e 100644
--- a/multimedia/photofilmstrip/pkg-plist
+++ b/multimedia/photofilmstrip/pkg-plist
@@ -54,21 +54,21 @@ bin/photofilmstrip-cli
 %%PYTHON_SITELIBDIR%%/photofilmstrip/core/util.py
 %%PYTHON_SITELIBDIR%%/photofilmstrip/core/util.pyc
 %%PYTHON_SITELIBDIR%%/photofilmstrip/core/util.pyo
-%%PYTHON_SITELIBDIR%%/photofilmstrip/doc/back.gif
-%%PYTHON_SITELIBDIR%%/photofilmstrip/doc/contents.gif
-%%PYTHON_SITELIBDIR%%/photofilmstrip/doc/copyright.html
-%%PYTHON_SITELIBDIR%%/photofilmstrip/doc/createpfs.html
-%%PYTHON_SITELIBDIR%%/photofilmstrip/doc/forward.gif
-%%PYTHON_SITELIBDIR%%/photofilmstrip/doc/index.html
-%%PYTHON_SITELIBDIR%%/photofilmstrip/doc/introduction.html
-%%PYTHON_SITELIBDIR%%/photofilmstrip/doc/more.html
-%%PYTHON_SITELIBDIR%%/photofilmstrip/doc/photofilmstrip.chm
-%%PYTHON_SITELIBDIR%%/photofilmstrip/doc/photofilmstrip.css
-%%PYTHON_SITELIBDIR%%/photofilmstrip/doc/photofilmstrip.hhc
-%%PYTHON_SITELIBDIR%%/photofilmstrip/doc/photofilmstrip.hhk
-%%PYTHON_SITELIBDIR%%/photofilmstrip/doc/photofilmstrip.hhp
-%%PYTHON_SITELIBDIR%%/photofilmstrip/doc/renderpfs.html
-%%PYTHON_SITELIBDIR%%/photofilmstrip/doc/up.gif
+%%PORTDOCS%%%%PYTHON_SITELIBDIR%%/photofilmstrip/doc/back.gif
+%%PORTDOCS%%%%PYTHON_SITELIBDIR%%/photofilmstrip/doc/contents.gif
+%%PORTDOCS%%%%PYTHON_SITELIBDIR%%/photofilmstrip/doc/copyright.html
+%%PORTDOCS%%%%PYTHON_SITELIBDIR%%/photofilmstrip/doc/createpfs.html
+%%PORTDOCS%%%%PYTHON_SITELIBDIR%%/photofilmstrip/doc/forward.gif
+%%PORTDOCS%%%%PYTHON_SITELIBDIR%%/photofilmstrip/doc/index.html
+%%PORTDOCS%%%%PYTHON_SITELIBDIR%%/photofilmstrip/doc/introduction.html
+%%PORTDOCS%%%%PYTHON_SITELIBDIR%%/photofilmstrip/doc/more.html
+%%PORTDOCS%%%%PYTHON_SITELIBDIR%%/photofilmstrip/doc/photofilmstrip.chm
+%%PORTDOCS%%%%PYTHON_SITELIBDIR%%/photofilmstrip/doc/photofilmstrip.css
+%%PORTDOCS%%%%PYTHON_SITELIBDIR%%/photofilmstrip/doc/photofilmstrip.hhc
+%%PORTDOCS%%%%PYTHON_SITELIBDIR%%/photofilmstrip/doc/photofilmstrip.hhk
+%%PORTDOCS%%%%PYTHON_SITELIBDIR%%/photofilmstrip/doc/photofilmstrip.hhp
+%%PORTDOCS%%%%PYTHON_SITELIBDIR%%/photofilmstrip/doc/renderpfs.html
+%%PORTDOCS%%%%PYTHON_SITELIBDIR%%/photofilmstrip/doc/up.gif
 %%PYTHON_SITELIBDIR%%/photofilmstrip/gui/ActionManager.py
 %%PYTHON_SITELIBDIR%%/photofilmstrip/gui/ActionManager.pyc
 %%PYTHON_SITELIBDIR%%/photofilmstrip/gui/ActionManager.pyo
@@ -186,15 +186,15 @@ bin/photofilmstrip-cli
 %%PYTHON_SITELIBDIR%%/photofilmstrip/res/license.pyc
 %%PYTHON_SITELIBDIR%%/photofilmstrip/res/license.pyo
 share/applications/photofilmstrip.desktop
-share/locale/cs/LC_MESSAGES/PhotoFilmStrip.mo
-share/locale/de/LC_MESSAGES/PhotoFilmStrip.mo
-share/locale/en/LC_MESSAGES/PhotoFilmStrip.mo
-share/locale/fr/LC_MESSAGES/PhotoFilmStrip.mo
-share/locale/it/LC_MESSAGES/PhotoFilmStrip.mo
-share/locale/ko/LC_MESSAGES/PhotoFilmStrip.mo
-share/locale/nl/LC_MESSAGES/PhotoFilmStrip.mo
-share/locale/pt/LC_MESSAGES/PhotoFilmStrip.mo
-share/locale/tr/LC_MESSAGES/PhotoFilmStrip.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/PhotoFilmStrip.mo
+%%NLS%%share/locale/de/LC_MESSAGES/PhotoFilmStrip.mo
+%%NLS%%share/locale/en/LC_MESSAGES/PhotoFilmStrip.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/PhotoFilmStrip.mo
+%%NLS%%share/locale/it/LC_MESSAGES/PhotoFilmStrip.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/PhotoFilmStrip.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/PhotoFilmStrip.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/PhotoFilmStrip.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/PhotoFilmStrip.mo
 share/pixmaps/photofilmstrip.xpm
 @dirrm %%PYTHON_SITELIBDIR%%/photofilmstrip/res
 @dirrm %%PYTHON_SITELIBDIR%%/photofilmstrip/lib/common
@@ -202,7 +202,7 @@ share/pixmaps/photofilmstrip.xpm
 @dirrm %%PYTHON_SITELIBDIR%%/photofilmstrip/gui/util
 @dirrm %%PYTHON_SITELIBDIR%%/photofilmstrip/gui/ctrls
 @dirrm %%PYTHON_SITELIBDIR%%/photofilmstrip/gui
-@dirrm %%PYTHON_SITELIBDIR%%/photofilmstrip/doc
+%%PORTDOCS%%@dirrm %%PYTHON_SITELIBDIR%%/photofilmstrip/doc
 @dirrm %%PYTHON_SITELIBDIR%%/photofilmstrip/core/renderer
 @dirrm %%PYTHON_SITELIBDIR%%/photofilmstrip/core
 @dirrm %%PYTHON_SITELIBDIR%%/photofilmstrip/cli