- Update to 0.12.1

- Add LICENSE
- Trim Makefile headers
- Convert to OptionsNG

3 files changed, 56 insertions, 10 deletions

diff --git a/graphics/py-PyX/Makefile b/graphics/py-PyX/Makefile
index ec6422480795..32298c3e01cc 100644
--- a/graphics/py-PyX/Makefile
+++ b/graphics/py-PyX/Makefile
@@ -1,14 +1,8 @@
-# ex:ts=8
-# Ports collection makefile for:	PyX
-# Date created:			Jun 8, 2004
-# Whom:				ijliao
-#
+# Created by: Ying-Chieh Liao <ijliao@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	PyX
-PORTVERSION=	0.11.1
-PORTREVISION=	1
+PORTVERSION=	0.12.1
 CATEGORIES=	graphics python
 MASTER_SITES=	SF
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,9 +10,46 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	mva@FreeBSD.org
 COMMENT=	A Python package for the creation of encapsulated PostScript figures
 
+LICENSE=	GPLv2
+
 BUILD_DEPENDS=	kpsewhich:${PORTSDIR}/print/teTeX
 
 USE_PYTHON=	2.5+
 USE_PYDISTUTILS=yes
 
+OPTIONS_DEFINE=		T1CODE KPATHSEA
+OPTIONS_DEFAULT=	T1CODE KPATHSEA
+T1CODE_DESC=		Fast t1 font encoding/decoding
+KPATHSEA_DESC=		Python wrapper around kpathsea
+
+.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
+
+.if ${PORT_OPTIONS:MKPATHSEA}
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libkpathsea.a:${PORTSDIR}/print/teTeX
+LDFLAGS+=	-L${LOCALBASE}/lib
+PLIST_SUB+=	KPATHSEA=""
+.else
+PLIST_SUB+=	KPATHSEA="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MT1CODE} || ${PORT_OPTIONS:MKPATHSEA}
+do-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/distinfo b/graphics/py-PyX/distinfo
index 36f26fdc9875..ce1ed51fb4ac 100644
--- a/graphics/py-PyX/distinfo
+++ b/graphics/py-PyX/distinfo
@@ -1,2 +1,2 @@
-SHA256 (PyX-0.11.1.tar.gz) = ba3f4be3c30d33be122afa10486903a5a2881e099f9e83cbda54779ebe3a2c5a
-SIZE (PyX-0.11.1.tar.gz) = 554987
+SHA256 (PyX-0.12.1.tar.gz) = e837b26a8b1c27524cf3f3dd6c0d563451249159edaa2e366d87e7143a867e8e
+SIZE (PyX-0.12.1.tar.gz) = 561989
diff --git a/graphics/py-PyX/pkg-plist b/graphics/py-PyX/pkg-plist
index b66db701c9e2..9661c1ea5786 100644
--- a/graphics/py-PyX/pkg-plist
+++ b/graphics/py-PyX/pkg-plist
@@ -95,6 +95,7 @@
 %%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
@@ -107,6 +108,9 @@
 %%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
@@ -161,6 +165,15 @@
 %%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
@@ -182,6 +195,7 @@
 %%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
@@ -200,6 +214,7 @@
 %%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