3 files changed, 119 insertions, 126 deletions

diff --git a/print/py-pyscript/Makefile b/print/py-pyscript/Makefile
index 71abce2733df..4b9239626075 100644
--- a/print/py-pyscript/Makefile
+++ b/print/py-pyscript/Makefile
@@ -11,32 +11,26 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Python module for producing high quality PostScript graphics
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-USE_TEX=	latex dvipsk
+LICENSE=	GPLv2
 
-DATADIR=	${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}
+OPTIONS_DEFAULT=	EXAMPLES
+OPTIONS_DEFINE=	EXAMPLES
 
-PYSCRIPT_EXAMPLES=	doc/examples/*.py
 PYSCRIPT_MANUAL=	doc/manual/pyscript.pdf
 
-.if defined(WITHOUT_EXAMPLES)
-PLIST_SUB=	PORTEXAMPLES="@comment "
-.else
-PLIST_SUB=	PORTEXAMPLES=""
-.endif
-
-NO_STAGE=	yes
-post-install:
+USE_PYDISTUTILS=	yes
+USE_PYTHON=	yes
+USE_TEX=	latex dvipsk
 
-.if !defined(WITHOUT_EXAMPLES)
-	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/${PYSCRIPT_EXAMPLES} ${EXAMPLESDIR}
-.endif
+.include <bsd.port.options.mk>
 
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/${PYSCRIPT_MANUAL} ${DOCSDIR}
+post-install:
+.if ${PORT_OPTIONS:MEXAMPLES}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	@(cd ${WRKSRC}/doc/examples; \
+	${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} "! -name Makefile")
 .endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${PYSCRIPT_MANUAL}  ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/print/py-pyscript/pkg-descr b/print/py-pyscript/pkg-descr
index aff35be6d3ef..348f8bf6839f 100644
--- a/print/py-pyscript/pkg-descr
+++ b/print/py-pyscript/pkg-descr
@@ -14,5 +14,4 @@ Some of the key features are:
       of figure primitives.
     * Output is publication quality.
 
-Author:	Alexei Gilchrist, Paul Cochrane
-WWW:	http://pyscript.sourceforge.net/
+WWW: http://pyscript.sourceforge.net/
diff --git a/print/py-pyscript/pkg-plist b/print/py-pyscript/pkg-plist
index 952dbca71f79..4ddc68472f58 100644
--- a/print/py-pyscript/pkg-plist
+++ b/print/py-pyscript/pkg-plist
@@ -1,103 +1,103 @@
 bin/pyscript
-%%DATADIR%%/__init__.py
-%%DATADIR%%/__init__.pyc
-%%DATADIR%%/__init__.pyo
-%%DATADIR%%/afm.py
-%%DATADIR%%/afm.pyc
-%%DATADIR%%/afm.pyo
-%%DATADIR%%/arrowheads.py
-%%DATADIR%%/arrowheads.pyc
-%%DATADIR%%/arrowheads.pyo
-%%DATADIR%%/base.py
-%%DATADIR%%/base.pyc
-%%DATADIR%%/base.pyo
-%%DATADIR%%/defaults.py
-%%DATADIR%%/defaults.pyc
-%%DATADIR%%/defaults.pyo
-%%DATADIR%%/fonts/__init__.py
-%%DATADIR%%/fonts/__init__.pyc
-%%DATADIR%%/fonts/__init__.pyo
-%%DATADIR%%/fonts/courier.py
-%%DATADIR%%/fonts/courier.pyc
-%%DATADIR%%/fonts/courier.pyo
-%%DATADIR%%/fonts/courier_bold.py
-%%DATADIR%%/fonts/courier_bold.pyc
-%%DATADIR%%/fonts/courier_bold.pyo
-%%DATADIR%%/fonts/courier_boldoblique.py
-%%DATADIR%%/fonts/courier_boldoblique.pyc
-%%DATADIR%%/fonts/courier_boldoblique.pyo
-%%DATADIR%%/fonts/courier_oblique.py
-%%DATADIR%%/fonts/courier_oblique.pyc
-%%DATADIR%%/fonts/courier_oblique.pyo
-%%DATADIR%%/fonts/helvetica.py
-%%DATADIR%%/fonts/helvetica.pyc
-%%DATADIR%%/fonts/helvetica.pyo
-%%DATADIR%%/fonts/helvetica_bold.py
-%%DATADIR%%/fonts/helvetica_bold.pyc
-%%DATADIR%%/fonts/helvetica_bold.pyo
-%%DATADIR%%/fonts/helvetica_boldoblique.py
-%%DATADIR%%/fonts/helvetica_boldoblique.pyc
-%%DATADIR%%/fonts/helvetica_boldoblique.pyo
-%%DATADIR%%/fonts/helvetica_oblique.py
-%%DATADIR%%/fonts/helvetica_oblique.pyc
-%%DATADIR%%/fonts/helvetica_oblique.pyo
-%%DATADIR%%/fonts/symbol.py
-%%DATADIR%%/fonts/symbol.pyc
-%%DATADIR%%/fonts/symbol.pyo
-%%DATADIR%%/fonts/times_bold.py
-%%DATADIR%%/fonts/times_bold.pyc
-%%DATADIR%%/fonts/times_bold.pyo
-%%DATADIR%%/fonts/times_bolditalic.py
-%%DATADIR%%/fonts/times_bolditalic.pyc
-%%DATADIR%%/fonts/times_bolditalic.pyo
-%%DATADIR%%/fonts/times_italic.py
-%%DATADIR%%/fonts/times_italic.pyc
-%%DATADIR%%/fonts/times_italic.pyo
-%%DATADIR%%/fonts/times_roman.py
-%%DATADIR%%/fonts/times_roman.pyc
-%%DATADIR%%/fonts/times_roman.pyo
-%%DATADIR%%/fonts/zapfdingbats.py
-%%DATADIR%%/fonts/zapfdingbats.pyc
-%%DATADIR%%/fonts/zapfdingbats.pyo
-%%DATADIR%%/groups.py
-%%DATADIR%%/groups.pyc
-%%DATADIR%%/groups.pyo
-%%DATADIR%%/lib/__init__.py
-%%DATADIR%%/lib/__init__.pyc
-%%DATADIR%%/lib/__init__.pyo
-%%DATADIR%%/lib/electronics.py
-%%DATADIR%%/lib/electronics.pyc
-%%DATADIR%%/lib/electronics.pyo
-%%DATADIR%%/lib/optics.py
-%%DATADIR%%/lib/optics.pyc
-%%DATADIR%%/lib/optics.pyo
-%%DATADIR%%/lib/present.py
-%%DATADIR%%/lib/present.pyc
-%%DATADIR%%/lib/present.pyo
-%%DATADIR%%/lib/presentation.py
-%%DATADIR%%/lib/presentation.pyc
-%%DATADIR%%/lib/presentation.pyo
-%%DATADIR%%/lib/qi.py
-%%DATADIR%%/lib/qi.pyc
-%%DATADIR%%/lib/qi.pyo
-%%DATADIR%%/lib/quantumcircuits.py
-%%DATADIR%%/lib/quantumcircuits.pyc
-%%DATADIR%%/lib/quantumcircuits.pyo
-%%DATADIR%%/objects.py
-%%DATADIR%%/objects.pyc
-%%DATADIR%%/objects.pyo
-%%DATADIR%%/path.py
-%%DATADIR%%/path.pyc
-%%DATADIR%%/path.pyo
-%%DATADIR%%/render.py
-%%DATADIR%%/render.pyc
-%%DATADIR%%/render.pyo
-%%DATADIR%%/vectors.py
-%%DATADIR%%/vectors.pyc
-%%DATADIR%%/vectors.pyo
-%%DATADIR%%/version.py
-%%DATADIR%%/version.pyc
-%%DATADIR%%/version.pyo
+%%PYTHON_SITELIBDIR%%/pyscript/__init__.py
+%%PYTHON_SITELIBDIR%%/pyscript/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pyscript/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pyscript/afm.py
+%%PYTHON_SITELIBDIR%%/pyscript/afm.pyc
+%%PYTHON_SITELIBDIR%%/pyscript/afm.pyo
+%%PYTHON_SITELIBDIR%%/pyscript/arrowheads.py
+%%PYTHON_SITELIBDIR%%/pyscript/arrowheads.pyc
+%%PYTHON_SITELIBDIR%%/pyscript/arrowheads.pyo
+%%PYTHON_SITELIBDIR%%/pyscript/base.py
+%%PYTHON_SITELIBDIR%%/pyscript/base.pyc
+%%PYTHON_SITELIBDIR%%/pyscript/base.pyo
+%%PYTHON_SITELIBDIR%%/pyscript/defaults.py
+%%PYTHON_SITELIBDIR%%/pyscript/defaults.pyc
+%%PYTHON_SITELIBDIR%%/pyscript/defaults.pyo
+%%PYTHON_SITELIBDIR%%/pyscript/fonts/__init__.py
+%%PYTHON_SITELIBDIR%%/pyscript/fonts/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pyscript/fonts/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pyscript/fonts/courier.py
+%%PYTHON_SITELIBDIR%%/pyscript/fonts/courier.pyc
+%%PYTHON_SITELIBDIR%%/pyscript/fonts/courier.pyo
+%%PYTHON_SITELIBDIR%%/pyscript/fonts/courier_bold.py
+%%PYTHON_SITELIBDIR%%/pyscript/fonts/courier_bold.pyc
+%%PYTHON_SITELIBDIR%%/pyscript/fonts/courier_bold.pyo
+%%PYTHON_SITELIBDIR%%/pyscript/fonts/courier_boldoblique.py
+%%PYTHON_SITELIBDIR%%/pyscript/fonts/courier_boldoblique.pyc
+%%PYTHON_SITELIBDIR%%/pyscript/fonts/courier_boldoblique.pyo
+%%PYTHON_SITELIBDIR%%/pyscript/fonts/courier_oblique.py
+%%PYTHON_SITELIBDIR%%/pyscript/fonts/courier_oblique.pyc
+%%PYTHON_SITELIBDIR%%/pyscript/fonts/courier_oblique.pyo
+%%PYTHON_SITELIBDIR%%/pyscript/fonts/helvetica.py
+%%PYTHON_SITELIBDIR%%/pyscript/fonts/helvetica.pyc
+%%PYTHON_SITELIBDIR%%/pyscript/fonts/helvetica.pyo
+%%PYTHON_SITELIBDIR%%/pyscript/fonts/helvetica_bold.py
+%%PYTHON_SITELIBDIR%%/pyscript/fonts/helvetica_bold.pyc
+%%PYTHON_SITELIBDIR%%/pyscript/fonts/helvetica_bold.pyo
+%%PYTHON_SITELIBDIR%%/pyscript/fonts/helvetica_boldoblique.py
+%%PYTHON_SITELIBDIR%%/pyscript/fonts/helvetica_boldoblique.pyc
+%%PYTHON_SITELIBDIR%%/pyscript/fonts/helvetica_boldoblique.pyo
+%%PYTHON_SITELIBDIR%%/pyscript/fonts/helvetica_oblique.py
+%%PYTHON_SITELIBDIR%%/pyscript/fonts/helvetica_oblique.pyc
+%%PYTHON_SITELIBDIR%%/pyscript/fonts/helvetica_oblique.pyo
+%%PYTHON_SITELIBDIR%%/pyscript/fonts/symbol.py
+%%PYTHON_SITELIBDIR%%/pyscript/fonts/symbol.pyc
+%%PYTHON_SITELIBDIR%%/pyscript/fonts/symbol.pyo
+%%PYTHON_SITELIBDIR%%/pyscript/fonts/times_bold.py
+%%PYTHON_SITELIBDIR%%/pyscript/fonts/times_bold.pyc
+%%PYTHON_SITELIBDIR%%/pyscript/fonts/times_bold.pyo
+%%PYTHON_SITELIBDIR%%/pyscript/fonts/times_bolditalic.py
+%%PYTHON_SITELIBDIR%%/pyscript/fonts/times_bolditalic.pyc
+%%PYTHON_SITELIBDIR%%/pyscript/fonts/times_bolditalic.pyo
+%%PYTHON_SITELIBDIR%%/pyscript/fonts/times_italic.py
+%%PYTHON_SITELIBDIR%%/pyscript/fonts/times_italic.pyc
+%%PYTHON_SITELIBDIR%%/pyscript/fonts/times_italic.pyo
+%%PYTHON_SITELIBDIR%%/pyscript/fonts/times_roman.py
+%%PYTHON_SITELIBDIR%%/pyscript/fonts/times_roman.pyc
+%%PYTHON_SITELIBDIR%%/pyscript/fonts/times_roman.pyo
+%%PYTHON_SITELIBDIR%%/pyscript/fonts/zapfdingbats.py
+%%PYTHON_SITELIBDIR%%/pyscript/fonts/zapfdingbats.pyc
+%%PYTHON_SITELIBDIR%%/pyscript/fonts/zapfdingbats.pyo
+%%PYTHON_SITELIBDIR%%/pyscript/groups.py
+%%PYTHON_SITELIBDIR%%/pyscript/groups.pyc
+%%PYTHON_SITELIBDIR%%/pyscript/groups.pyo
+%%PYTHON_SITELIBDIR%%/pyscript/lib/__init__.py
+%%PYTHON_SITELIBDIR%%/pyscript/lib/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pyscript/lib/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pyscript/lib/electronics.py
+%%PYTHON_SITELIBDIR%%/pyscript/lib/electronics.pyc
+%%PYTHON_SITELIBDIR%%/pyscript/lib/electronics.pyo
+%%PYTHON_SITELIBDIR%%/pyscript/lib/optics.py
+%%PYTHON_SITELIBDIR%%/pyscript/lib/optics.pyc
+%%PYTHON_SITELIBDIR%%/pyscript/lib/optics.pyo
+%%PYTHON_SITELIBDIR%%/pyscript/lib/present.py
+%%PYTHON_SITELIBDIR%%/pyscript/lib/present.pyc
+%%PYTHON_SITELIBDIR%%/pyscript/lib/present.pyo
+%%PYTHON_SITELIBDIR%%/pyscript/lib/presentation.py
+%%PYTHON_SITELIBDIR%%/pyscript/lib/presentation.pyc
+%%PYTHON_SITELIBDIR%%/pyscript/lib/presentation.pyo
+%%PYTHON_SITELIBDIR%%/pyscript/lib/qi.py
+%%PYTHON_SITELIBDIR%%/pyscript/lib/qi.pyc
+%%PYTHON_SITELIBDIR%%/pyscript/lib/qi.pyo
+%%PYTHON_SITELIBDIR%%/pyscript/lib/quantumcircuits.py
+%%PYTHON_SITELIBDIR%%/pyscript/lib/quantumcircuits.pyc
+%%PYTHON_SITELIBDIR%%/pyscript/lib/quantumcircuits.pyo
+%%PYTHON_SITELIBDIR%%/pyscript/objects.py
+%%PYTHON_SITELIBDIR%%/pyscript/objects.pyc
+%%PYTHON_SITELIBDIR%%/pyscript/objects.pyo
+%%PYTHON_SITELIBDIR%%/pyscript/path.py
+%%PYTHON_SITELIBDIR%%/pyscript/path.pyc
+%%PYTHON_SITELIBDIR%%/pyscript/path.pyo
+%%PYTHON_SITELIBDIR%%/pyscript/render.py
+%%PYTHON_SITELIBDIR%%/pyscript/render.pyc
+%%PYTHON_SITELIBDIR%%/pyscript/render.pyo
+%%PYTHON_SITELIBDIR%%/pyscript/vectors.py
+%%PYTHON_SITELIBDIR%%/pyscript/vectors.pyc
+%%PYTHON_SITELIBDIR%%/pyscript/vectors.pyo
+%%PYTHON_SITELIBDIR%%/pyscript/version.py
+%%PYTHON_SITELIBDIR%%/pyscript/version.pyc
+%%PYTHON_SITELIBDIR%%/pyscript/version.pyo
 %%PORTDOCS%%%%DOCSDIR%%/pyscript.pdf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/align.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/align2.py
@@ -119,8 +119,8 @@ bin/pyscript
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tex.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/twoqubitQST.py
-@dirrm %%DATADIR%%/fonts
-@dirrm %%DATADIR%%/lib
-@dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+@dirrmtry %%PYTHON_SITELIBDIR%%/pyscript/fonts
+@dirrmtry %%PYTHON_SITELIBDIR%%/pyscript/lib
+@dirrmtry %%PYTHON_SITELIBDIR%%/pyscript
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%