2 files changed, 9 insertions, 250 deletions

diff --git a/graphics/py-PyX/Makefile b/graphics/py-PyX/Makefile
index 750fc3000f5b..d7aa062852a5 100644
--- a/graphics/py-PyX/Makefile
+++ b/graphics/py-PyX/Makefile
@@ -8,12 +8,13 @@ MASTER_SITES=	SF
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	mva@FreeBSD.org
-COMMENT=	A Python package for the creation of encapsulated PostScript figures
+COMMENT=	Python package for creating encapsulated PostScript figures
 
 LICENSE=	GPLv2
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
+USE_PYTHON=		yes
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 USE_TEX=	latex:build
 
 OPTIONS_DEFINE=		T1CODE KPATHSEA
@@ -21,34 +22,18 @@ OPTIONS_DEFAULT=	T1CODE KPATHSEA
 T1CODE_DESC=		Fast t1 font encoding/decoding
 KPATHSEA_DESC=		Python wrapper around kpathsea
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MT1CODE} || ${PORT_OPTIONS:MKPATHSEA}
-CFLAGS+=	-I${LOCALBASE}/include
-.endif
-
-.if ${PORT_OPTIONS:MT1CODE}
-PLIST_SUB+=	T1CODE=""
-.else
-PLIST_SUB+=	T1CODE="@comment "
-.endif
+T1CODE_CFLAGS=		-I${LOCALBASE}/include
+KPATHSEA_CFLAGS=	-I${LOCALBASE}/include
+KPATHSEA_LDFLAGS=	-L${LOCALBASE}/lib
 
-.if ${PORT_OPTIONS:MKPATHSEA}
-LDFLAGS+=	-L${LOCALBASE}/lib
-PLIST_SUB+=	KPATHSEA=""
-.else
-PLIST_SUB+=	KPATHSEA="@comment "
-.endif
+.include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MT1CODE} || ${PORT_OPTIONS:MKPATHSEA}
-do-patch:
+post-patch:
 .if ${PORT_OPTIONS:MT1CODE}
 	@${REINPLACE_CMD} -e 's|build_t1code=0|build_t1code=1|' ${WRKSRC}/setup.cfg
 .endif
 .if ${PORT_OPTIONS:MKPATHSEA}
 	@${REINPLACE_CMD} -e 's|build_pykpathsea=0|build_pykpathsea=1|' ${WRKSRC}/setup.cfg
 .endif
-.endif
 
 .include <bsd.port.mk>
diff --git a/graphics/py-PyX/pkg-plist b/graphics/py-PyX/pkg-plist
deleted file mode 100644
index 9661c1ea5786..000000000000
--- a/graphics/py-PyX/pkg-plist
+++ /dev/null
@@ -1,226 +0,0 @@
-%%PYTHON_SITELIBDIR%%/pyx/__init__.py
-%%PYTHON_SITELIBDIR%%/pyx/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pyx/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pyx/attr.py
-%%PYTHON_SITELIBDIR%%/pyx/attr.pyc
-%%PYTHON_SITELIBDIR%%/pyx/attr.pyo
-%%PYTHON_SITELIBDIR%%/pyx/bbox.py
-%%PYTHON_SITELIBDIR%%/pyx/bbox.pyc
-%%PYTHON_SITELIBDIR%%/pyx/bbox.pyo
-%%PYTHON_SITELIBDIR%%/pyx/bitmap.py
-%%PYTHON_SITELIBDIR%%/pyx/bitmap.pyc
-%%PYTHON_SITELIBDIR%%/pyx/bitmap.pyo
-%%PYTHON_SITELIBDIR%%/pyx/box.py
-%%PYTHON_SITELIBDIR%%/pyx/box.pyc
-%%PYTHON_SITELIBDIR%%/pyx/box.pyo
-%%PYTHON_SITELIBDIR%%/pyx/canvas.py
-%%PYTHON_SITELIBDIR%%/pyx/canvas.pyc
-%%PYTHON_SITELIBDIR%%/pyx/canvas.pyo
-%%PYTHON_SITELIBDIR%%/pyx/canvasitem.py
-%%PYTHON_SITELIBDIR%%/pyx/canvasitem.pyc
-%%PYTHON_SITELIBDIR%%/pyx/canvasitem.pyo
-%%PYTHON_SITELIBDIR%%/pyx/color.py
-%%PYTHON_SITELIBDIR%%/pyx/color.pyc
-%%PYTHON_SITELIBDIR%%/pyx/color.pyo
-%%PYTHON_SITELIBDIR%%/pyx/config.py
-%%PYTHON_SITELIBDIR%%/pyx/config.pyc
-%%PYTHON_SITELIBDIR%%/pyx/config.pyo
-%%PYTHON_SITELIBDIR%%/pyx/connector.py
-%%PYTHON_SITELIBDIR%%/pyx/connector.pyc
-%%PYTHON_SITELIBDIR%%/pyx/connector.pyo
-%%PYTHON_SITELIBDIR%%/pyx/data/afm/Courier-Bold.afm
-%%PYTHON_SITELIBDIR%%/pyx/data/afm/Courier-BoldOblique.afm
-%%PYTHON_SITELIBDIR%%/pyx/data/afm/Courier-Oblique.afm
-%%PYTHON_SITELIBDIR%%/pyx/data/afm/Courier.afm
-%%PYTHON_SITELIBDIR%%/pyx/data/afm/Helvetica-Bold.afm
-%%PYTHON_SITELIBDIR%%/pyx/data/afm/Helvetica-BoldOblique.afm
-%%PYTHON_SITELIBDIR%%/pyx/data/afm/Helvetica-Oblique.afm
-%%PYTHON_SITELIBDIR%%/pyx/data/afm/Helvetica.afm
-%%PYTHON_SITELIBDIR%%/pyx/data/afm/MustRead.html
-%%PYTHON_SITELIBDIR%%/pyx/data/afm/Symbol.afm
-%%PYTHON_SITELIBDIR%%/pyx/data/afm/Times-Bold.afm
-%%PYTHON_SITELIBDIR%%/pyx/data/afm/Times-BoldItalic.afm
-%%PYTHON_SITELIBDIR%%/pyx/data/afm/Times-Italic.afm
-%%PYTHON_SITELIBDIR%%/pyx/data/afm/Times-Roman.afm
-%%PYTHON_SITELIBDIR%%/pyx/data/afm/ZapfDingbats.afm
-%%PYTHON_SITELIBDIR%%/pyx/data/def/pyx.def
-%%PYTHON_SITELIBDIR%%/pyx/data/lfs/10pt.lfs
-%%PYTHON_SITELIBDIR%%/pyx/data/lfs/10ptex.lfs
-%%PYTHON_SITELIBDIR%%/pyx/data/lfs/11pt.lfs
-%%PYTHON_SITELIBDIR%%/pyx/data/lfs/11ptex.lfs
-%%PYTHON_SITELIBDIR%%/pyx/data/lfs/12pt.lfs
-%%PYTHON_SITELIBDIR%%/pyx/data/lfs/12ptex.lfs
-%%PYTHON_SITELIBDIR%%/pyx/data/lfs/createlfs.py
-%%PYTHON_SITELIBDIR%%/pyx/data/lfs/createlfs.pyc
-%%PYTHON_SITELIBDIR%%/pyx/data/lfs/createlfs.pyo
-%%PYTHON_SITELIBDIR%%/pyx/data/lfs/createlfs.tex
-%%PYTHON_SITELIBDIR%%/pyx/data/lfs/foils17pt.lfs
-%%PYTHON_SITELIBDIR%%/pyx/data/lfs/foils20pt.lfs
-%%PYTHON_SITELIBDIR%%/pyx/data/lfs/foils25pt.lfs
-%%PYTHON_SITELIBDIR%%/pyx/data/lfs/foils30pt.lfs
-%%PYTHON_SITELIBDIR%%/pyx/data/pyxrc
-%%PYTHON_SITELIBDIR%%/pyx/deco.py
-%%PYTHON_SITELIBDIR%%/pyx/deco.pyc
-%%PYTHON_SITELIBDIR%%/pyx/deco.pyo
-%%PYTHON_SITELIBDIR%%/pyx/deformer.py
-%%PYTHON_SITELIBDIR%%/pyx/deformer.pyc
-%%PYTHON_SITELIBDIR%%/pyx/deformer.pyo
-%%PYTHON_SITELIBDIR%%/pyx/document.py
-%%PYTHON_SITELIBDIR%%/pyx/document.pyc
-%%PYTHON_SITELIBDIR%%/pyx/document.pyo
-%%PYTHON_SITELIBDIR%%/pyx/dvi/__init__.py
-%%PYTHON_SITELIBDIR%%/pyx/dvi/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pyx/dvi/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pyx/dvi/dvifile.py
-%%PYTHON_SITELIBDIR%%/pyx/dvi/dvifile.pyc
-%%PYTHON_SITELIBDIR%%/pyx/dvi/dvifile.pyo
-%%PYTHON_SITELIBDIR%%/pyx/dvi/encfile.py
-%%PYTHON_SITELIBDIR%%/pyx/dvi/encfile.pyc
-%%PYTHON_SITELIBDIR%%/pyx/dvi/encfile.pyo
-%%PYTHON_SITELIBDIR%%/pyx/dvi/mapfile.py
-%%PYTHON_SITELIBDIR%%/pyx/dvi/mapfile.pyc
-%%PYTHON_SITELIBDIR%%/pyx/dvi/mapfile.pyo
-%%PYTHON_SITELIBDIR%%/pyx/dvi/texfont.py
-%%PYTHON_SITELIBDIR%%/pyx/dvi/texfont.pyc
-%%PYTHON_SITELIBDIR%%/pyx/dvi/texfont.pyo
-%%PYTHON_SITELIBDIR%%/pyx/dvi/tfmfile.py
-%%PYTHON_SITELIBDIR%%/pyx/dvi/tfmfile.pyc
-%%PYTHON_SITELIBDIR%%/pyx/dvi/tfmfile.pyo
-%%PYTHON_SITELIBDIR%%/pyx/dvi/vffile.py
-%%PYTHON_SITELIBDIR%%/pyx/dvi/vffile.pyc
-%%PYTHON_SITELIBDIR%%/pyx/dvi/vffile.pyo
-%%PYTHON_SITELIBDIR%%/pyx/epsfile.py
-%%PYTHON_SITELIBDIR%%/pyx/epsfile.pyc
-%%PYTHON_SITELIBDIR%%/pyx/epsfile.pyo
-%%PYTHON_SITELIBDIR%%/pyx/filelocator.py
-%%PYTHON_SITELIBDIR%%/pyx/filelocator.pyc
-%%PYTHON_SITELIBDIR%%/pyx/filelocator.pyo
-%%T1CODE%%%%PYTHON_SITELIBDIR%%/pyx/font/_t1code.so
-%%PYTHON_SITELIBDIR%%/pyx/font/__init__.py
-%%PYTHON_SITELIBDIR%%/pyx/font/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pyx/font/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pyx/font/afmfile.py
-%%PYTHON_SITELIBDIR%%/pyx/font/afmfile.pyc
-%%PYTHON_SITELIBDIR%%/pyx/font/afmfile.pyo
-%%PYTHON_SITELIBDIR%%/pyx/font/font.py
-%%PYTHON_SITELIBDIR%%/pyx/font/font.pyc
-%%PYTHON_SITELIBDIR%%/pyx/font/font.pyo
-%%PYTHON_SITELIBDIR%%/pyx/font/metric.py
-%%PYTHON_SITELIBDIR%%/pyx/font/metric.pyc
-%%PYTHON_SITELIBDIR%%/pyx/font/metric.pyo
-%%PYTHON_SITELIBDIR%%/pyx/font/pfmfile.py
-%%PYTHON_SITELIBDIR%%/pyx/font/pfmfile.pyc
-%%PYTHON_SITELIBDIR%%/pyx/font/pfmfile.pyo
-%%PYTHON_SITELIBDIR%%/pyx/font/t1code.py
-%%PYTHON_SITELIBDIR%%/pyx/font/t1code.pyc
-%%PYTHON_SITELIBDIR%%/pyx/font/t1code.pyo
-%%PYTHON_SITELIBDIR%%/pyx/font/t1file.py
-%%PYTHON_SITELIBDIR%%/pyx/font/t1file.pyc
-%%PYTHON_SITELIBDIR%%/pyx/font/t1file.pyo
-%%PYTHON_SITELIBDIR%%/pyx/graph/__init__.py
-%%PYTHON_SITELIBDIR%%/pyx/graph/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pyx/graph/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pyx/graph/axis/__init__.py
-%%PYTHON_SITELIBDIR%%/pyx/graph/axis/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pyx/graph/axis/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pyx/graph/axis/axis.py
-%%PYTHON_SITELIBDIR%%/pyx/graph/axis/axis.pyc
-%%PYTHON_SITELIBDIR%%/pyx/graph/axis/axis.pyo
-%%PYTHON_SITELIBDIR%%/pyx/graph/axis/painter.py
-%%PYTHON_SITELIBDIR%%/pyx/graph/axis/painter.pyc
-%%PYTHON_SITELIBDIR%%/pyx/graph/axis/painter.pyo
-%%PYTHON_SITELIBDIR%%/pyx/graph/axis/parter.py
-%%PYTHON_SITELIBDIR%%/pyx/graph/axis/parter.pyc
-%%PYTHON_SITELIBDIR%%/pyx/graph/axis/parter.pyo
-%%PYTHON_SITELIBDIR%%/pyx/graph/axis/positioner.py
-%%PYTHON_SITELIBDIR%%/pyx/graph/axis/positioner.pyc
-%%PYTHON_SITELIBDIR%%/pyx/graph/axis/positioner.pyo
-%%PYTHON_SITELIBDIR%%/pyx/graph/axis/rater.py
-%%PYTHON_SITELIBDIR%%/pyx/graph/axis/rater.pyc
-%%PYTHON_SITELIBDIR%%/pyx/graph/axis/rater.pyo
-%%PYTHON_SITELIBDIR%%/pyx/graph/axis/texter.py
-%%PYTHON_SITELIBDIR%%/pyx/graph/axis/texter.pyc
-%%PYTHON_SITELIBDIR%%/pyx/graph/axis/texter.pyo
-%%PYTHON_SITELIBDIR%%/pyx/graph/axis/tick.py
-%%PYTHON_SITELIBDIR%%/pyx/graph/axis/tick.pyc
-%%PYTHON_SITELIBDIR%%/pyx/graph/axis/tick.pyo
-%%PYTHON_SITELIBDIR%%/pyx/graph/axis/timeaxis.py
-%%PYTHON_SITELIBDIR%%/pyx/graph/axis/timeaxis.pyc
-%%PYTHON_SITELIBDIR%%/pyx/graph/axis/timeaxis.pyo
-%%PYTHON_SITELIBDIR%%/pyx/graph/data.py
-%%PYTHON_SITELIBDIR%%/pyx/graph/data.pyc
-%%PYTHON_SITELIBDIR%%/pyx/graph/data.pyo
-%%PYTHON_SITELIBDIR%%/pyx/graph/graph.py
-%%PYTHON_SITELIBDIR%%/pyx/graph/graph.pyc
-%%PYTHON_SITELIBDIR%%/pyx/graph/graph.pyo
-%%PYTHON_SITELIBDIR%%/pyx/graph/key.py
-%%PYTHON_SITELIBDIR%%/pyx/graph/key.pyc
-%%PYTHON_SITELIBDIR%%/pyx/graph/key.pyo
-%%PYTHON_SITELIBDIR%%/pyx/graph/style.py
-%%PYTHON_SITELIBDIR%%/pyx/graph/style.pyc
-%%PYTHON_SITELIBDIR%%/pyx/graph/style.pyo
-%%PYTHON_SITELIBDIR%%/pyx/mathutils.py
-%%PYTHON_SITELIBDIR%%/pyx/mathutils.pyc
-%%PYTHON_SITELIBDIR%%/pyx/mathutils.pyo
-%%PYTHON_SITELIBDIR%%/pyx/mesh.py
-%%PYTHON_SITELIBDIR%%/pyx/mesh.pyc
-%%PYTHON_SITELIBDIR%%/pyx/mesh.pyo
-%%PYTHON_SITELIBDIR%%/pyx/metapost/__init__.py
-%%PYTHON_SITELIBDIR%%/pyx/metapost/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pyx/metapost/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pyx/metapost/mp_path.py
-%%PYTHON_SITELIBDIR%%/pyx/metapost/mp_path.pyc
-%%PYTHON_SITELIBDIR%%/pyx/metapost/mp_path.pyo
-%%PYTHON_SITELIBDIR%%/pyx/metapost/path.py
-%%PYTHON_SITELIBDIR%%/pyx/metapost/path.pyc
-%%PYTHON_SITELIBDIR%%/pyx/metapost/path.pyo
-%%PYTHON_SITELIBDIR%%/pyx/normpath.py
-%%PYTHON_SITELIBDIR%%/pyx/normpath.pyc
-%%PYTHON_SITELIBDIR%%/pyx/normpath.pyo
-%%PYTHON_SITELIBDIR%%/pyx/path.py
-%%PYTHON_SITELIBDIR%%/pyx/path.pyc
-%%PYTHON_SITELIBDIR%%/pyx/path.pyo
-%%PYTHON_SITELIBDIR%%/pyx/pattern.py
-%%PYTHON_SITELIBDIR%%/pyx/pattern.pyc
-%%PYTHON_SITELIBDIR%%/pyx/pattern.pyo
-%%PYTHON_SITELIBDIR%%/pyx/pdfextra.py
-%%PYTHON_SITELIBDIR%%/pyx/pdfextra.pyc
-%%PYTHON_SITELIBDIR%%/pyx/pdfextra.pyo
-%%PYTHON_SITELIBDIR%%/pyx/pdfwriter.py
-%%PYTHON_SITELIBDIR%%/pyx/pdfwriter.pyc
-%%PYTHON_SITELIBDIR%%/pyx/pdfwriter.pyo
-%%PYTHON_SITELIBDIR%%/pyx/pswriter.py
-%%PYTHON_SITELIBDIR%%/pyx/pswriter.pyc
-%%PYTHON_SITELIBDIR%%/pyx/pswriter.pyo
-%%PYTHON_SITELIBDIR%%/pyx/pycompat.py
-%%PYTHON_SITELIBDIR%%/pyx/pycompat.pyc
-%%PYTHON_SITELIBDIR%%/pyx/pycompat.pyo
-%%KPATHSEA%%%%PYTHON_SITELIBDIR%%/pyx/pykpathsea.so
-%%PYTHON_SITELIBDIR%%/pyx/reader.py
-%%PYTHON_SITELIBDIR%%/pyx/reader.pyc
-%%PYTHON_SITELIBDIR%%/pyx/reader.pyo
-%%PYTHON_SITELIBDIR%%/pyx/style.py
-%%PYTHON_SITELIBDIR%%/pyx/style.pyc
-%%PYTHON_SITELIBDIR%%/pyx/style.pyo
-%%PYTHON_SITELIBDIR%%/pyx/text.py
-%%PYTHON_SITELIBDIR%%/pyx/text.pyc
-%%PYTHON_SITELIBDIR%%/pyx/text.pyo
-%%PYTHON_SITELIBDIR%%/pyx/trafo.py
-%%PYTHON_SITELIBDIR%%/pyx/trafo.pyc
-%%PYTHON_SITELIBDIR%%/pyx/trafo.pyo
-%%PYTHON_SITELIBDIR%%/pyx/unit.py
-%%PYTHON_SITELIBDIR%%/pyx/unit.pyc
-%%PYTHON_SITELIBDIR%%/pyx/unit.pyo
-%%PYTHON_SITELIBDIR%%/pyx/version.py
-%%PYTHON_SITELIBDIR%%/pyx/version.pyc
-%%PYTHON_SITELIBDIR%%/pyx/version.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/pyx/metapost
-@dirrm %%PYTHON_SITELIBDIR%%/pyx/graph/axis
-@dirrm %%PYTHON_SITELIBDIR%%/pyx/graph
-@dirrm %%PYTHON_SITELIBDIR%%/pyx/font
-@dirrm %%PYTHON_SITELIBDIR%%/pyx/dvi
-@dirrm %%PYTHON_SITELIBDIR%%/pyx/data/lfs
-@dirrm %%PYTHON_SITELIBDIR%%/pyx/data/def
-@dirrm %%PYTHON_SITELIBDIR%%/pyx/data/afm
-@dirrm %%PYTHON_SITELIBDIR%%/pyx/data
-@dirrm %%PYTHON_SITELIBDIR%%/pyx