summaryrefslogtreecommitdiff
path: root/textproc
diff options
context:
space:
mode:
Diffstat (limited to 'textproc')
-rw-r--r--textproc/py-X/Makefile27
-rw-r--r--textproc/py-X/PLIST127
-rw-r--r--textproc/py-X/distinfo9
-rw-r--r--textproc/py-X/patches/patch-aa13
4 files changed, 102 insertions, 74 deletions
diff --git a/textproc/py-X/Makefile b/textproc/py-X/Makefile
index 0ae80128713..1e86883d3f6 100644
--- a/textproc/py-X/Makefile
+++ b/textproc/py-X/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2012/10/25 06:56:48 asau Exp $
-#
+# $NetBSD: Makefile,v 1.15 2014/01/20 12:37:04 wiz Exp $
-DISTNAME= PyX-0.9
-PKGNAME= ${PYPKGPREFIX}-X-0.9
-PKGREVISION= 4
+DISTNAME= PyX-0.13
+PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/Py//}
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pyx/}
@@ -19,25 +17,12 @@ DEPENDS+= tex-tex-[0-9]*:../../print/tex-tex
USE_LANGUAGES= #none
-CONF_FILES= ${PREFIX}/share/examples/PyX/pyxrc \
+CONF_FILES= ${PYSITELIB}/pyx/data/pyxrc \
${PKG_SYSCONFDIR}/pyxrc
-SUBST_CLASSES+= conf
-SUBST_STAGE.conf= post-patch
-SUBST_MESSAGE.conf= Fixing configuration files.
-SUBST_FILES.conf= setup.py
-SUBST_SED.conf+= -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
-
-INSTALLATION_DIRS= share/examples/PyX
-
PYTHON_SELF_CONFLICT= yes
-
-pre-install:
- ${CP} ${WRKSRC}/pyxrc ${WRKSRC}/pyxrc.default
-
-post-install:
- ${CP} ${WRKSRC}/pyxrc ${DESTDIR}${PREFIX}/share/examples/PyX/pyxrc
+PYTHON_VERSIONS_INCOMPATIBLE= 26 27
+PYTHON_VERSIONS_INCLUDE_3X= yes
.include "../../lang/python/distutils.mk"
-.include "../../lang/python/application.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/py-X/PLIST b/textproc/py-X/PLIST
index 07ae9f7f65d..1fcac6ebe83 100644
--- a/textproc/py-X/PLIST
+++ b/textproc/py-X/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2012/04/08 20:21:57 wiz Exp $
-etc/pyxrc.default
+@comment $NetBSD: PLIST,v 1.7 2014/01/20 12:37:04 wiz Exp $
${PYSITELIB}/${EGG_FILE}
${PYSITELIB}/pyx/__init__.py
${PYSITELIB}/pyx/__init__.pyc
@@ -7,6 +6,9 @@ ${PYSITELIB}/pyx/__init__.pyo
${PYSITELIB}/pyx/attr.py
${PYSITELIB}/pyx/attr.pyc
${PYSITELIB}/pyx/attr.pyo
+${PYSITELIB}/pyx/baseclasses.py
+${PYSITELIB}/pyx/baseclasses.pyc
+${PYSITELIB}/pyx/baseclasses.pyo
${PYSITELIB}/pyx/bbox.py
${PYSITELIB}/pyx/bbox.pyc
${PYSITELIB}/pyx/bbox.pyo
@@ -28,6 +30,37 @@ ${PYSITELIB}/pyx/config.pyo
${PYSITELIB}/pyx/connector.py
${PYSITELIB}/pyx/connector.pyc
${PYSITELIB}/pyx/connector.pyo
+${PYSITELIB}/pyx/data/afm/Courier-Bold.afm
+${PYSITELIB}/pyx/data/afm/Courier-BoldOblique.afm
+${PYSITELIB}/pyx/data/afm/Courier-Oblique.afm
+${PYSITELIB}/pyx/data/afm/Courier.afm
+${PYSITELIB}/pyx/data/afm/Helvetica-Bold.afm
+${PYSITELIB}/pyx/data/afm/Helvetica-BoldOblique.afm
+${PYSITELIB}/pyx/data/afm/Helvetica-Oblique.afm
+${PYSITELIB}/pyx/data/afm/Helvetica.afm
+${PYSITELIB}/pyx/data/afm/MustRead.html
+${PYSITELIB}/pyx/data/afm/Symbol.afm
+${PYSITELIB}/pyx/data/afm/Times-Bold.afm
+${PYSITELIB}/pyx/data/afm/Times-BoldItalic.afm
+${PYSITELIB}/pyx/data/afm/Times-Italic.afm
+${PYSITELIB}/pyx/data/afm/Times-Roman.afm
+${PYSITELIB}/pyx/data/afm/ZapfDingbats.afm
+${PYSITELIB}/pyx/data/def/pyx.def
+${PYSITELIB}/pyx/data/lfs/10pt.lfs
+${PYSITELIB}/pyx/data/lfs/10ptex.lfs
+${PYSITELIB}/pyx/data/lfs/11pt.lfs
+${PYSITELIB}/pyx/data/lfs/11ptex.lfs
+${PYSITELIB}/pyx/data/lfs/12pt.lfs
+${PYSITELIB}/pyx/data/lfs/12ptex.lfs
+${PYSITELIB}/pyx/data/lfs/createlfs.py
+${PYSITELIB}/pyx/data/lfs/createlfs.pyc
+${PYSITELIB}/pyx/data/lfs/createlfs.pyo
+${PYSITELIB}/pyx/data/lfs/createlfs.tex
+${PYSITELIB}/pyx/data/lfs/foils17pt.lfs
+${PYSITELIB}/pyx/data/lfs/foils20pt.lfs
+${PYSITELIB}/pyx/data/lfs/foils25pt.lfs
+${PYSITELIB}/pyx/data/lfs/foils30pt.lfs
+${PYSITELIB}/pyx/data/pyxrc
${PYSITELIB}/pyx/deco.py
${PYSITELIB}/pyx/deco.pyc
${PYSITELIB}/pyx/deco.pyo
@@ -37,27 +70,51 @@ ${PYSITELIB}/pyx/deformer.pyo
${PYSITELIB}/pyx/document.py
${PYSITELIB}/pyx/document.pyc
${PYSITELIB}/pyx/document.pyo
-${PYSITELIB}/pyx/dvifile.py
-${PYSITELIB}/pyx/dvifile.pyc
-${PYSITELIB}/pyx/dvifile.pyo
+${PYSITELIB}/pyx/dvi/__init__.py
+${PYSITELIB}/pyx/dvi/__init__.pyc
+${PYSITELIB}/pyx/dvi/__init__.pyo
+${PYSITELIB}/pyx/dvi/dvifile.py
+${PYSITELIB}/pyx/dvi/dvifile.pyc
+${PYSITELIB}/pyx/dvi/dvifile.pyo
+${PYSITELIB}/pyx/dvi/encfile.py
+${PYSITELIB}/pyx/dvi/encfile.pyc
+${PYSITELIB}/pyx/dvi/encfile.pyo
+${PYSITELIB}/pyx/dvi/mapfile.py
+${PYSITELIB}/pyx/dvi/mapfile.pyc
+${PYSITELIB}/pyx/dvi/mapfile.pyo
+${PYSITELIB}/pyx/dvi/texfont.py
+${PYSITELIB}/pyx/dvi/texfont.pyc
+${PYSITELIB}/pyx/dvi/texfont.pyo
+${PYSITELIB}/pyx/dvi/tfmfile.py
+${PYSITELIB}/pyx/dvi/tfmfile.pyc
+${PYSITELIB}/pyx/dvi/tfmfile.pyo
+${PYSITELIB}/pyx/dvi/vffile.py
+${PYSITELIB}/pyx/dvi/vffile.pyc
+${PYSITELIB}/pyx/dvi/vffile.pyo
${PYSITELIB}/pyx/epsfile.py
${PYSITELIB}/pyx/epsfile.pyc
${PYSITELIB}/pyx/epsfile.pyo
${PYSITELIB}/pyx/font/__init__.py
${PYSITELIB}/pyx/font/__init__.pyc
${PYSITELIB}/pyx/font/__init__.pyo
-${PYSITELIB}/pyx/font/afm.py
-${PYSITELIB}/pyx/font/afm.pyc
-${PYSITELIB}/pyx/font/afm.pyo
-${PYSITELIB}/pyx/font/encoding.py
-${PYSITELIB}/pyx/font/encoding.pyc
-${PYSITELIB}/pyx/font/encoding.pyo
+${PYSITELIB}/pyx/font/afmfile.py
+${PYSITELIB}/pyx/font/afmfile.pyc
+${PYSITELIB}/pyx/font/afmfile.pyo
+${PYSITELIB}/pyx/font/font.py
+${PYSITELIB}/pyx/font/font.pyc
+${PYSITELIB}/pyx/font/font.pyo
+${PYSITELIB}/pyx/font/metric.py
+${PYSITELIB}/pyx/font/metric.pyc
+${PYSITELIB}/pyx/font/metric.pyo
+${PYSITELIB}/pyx/font/pfmfile.py
+${PYSITELIB}/pyx/font/pfmfile.pyc
+${PYSITELIB}/pyx/font/pfmfile.pyo
${PYSITELIB}/pyx/font/t1code.py
${PYSITELIB}/pyx/font/t1code.pyc
${PYSITELIB}/pyx/font/t1code.pyo
-${PYSITELIB}/pyx/font/t1font.py
-${PYSITELIB}/pyx/font/t1font.pyc
-${PYSITELIB}/pyx/font/t1font.pyo
+${PYSITELIB}/pyx/font/t1file.py
+${PYSITELIB}/pyx/font/t1file.pyc
+${PYSITELIB}/pyx/font/t1file.pyo
${PYSITELIB}/pyx/graph/__init__.py
${PYSITELIB}/pyx/graph/__init__.pyc
${PYSITELIB}/pyx/graph/__init__.pyo
@@ -103,6 +160,18 @@ ${PYSITELIB}/pyx/graph/style.pyo
${PYSITELIB}/pyx/mathutils.py
${PYSITELIB}/pyx/mathutils.pyc
${PYSITELIB}/pyx/mathutils.pyo
+${PYSITELIB}/pyx/mesh.py
+${PYSITELIB}/pyx/mesh.pyc
+${PYSITELIB}/pyx/mesh.pyo
+${PYSITELIB}/pyx/metapost/__init__.py
+${PYSITELIB}/pyx/metapost/__init__.pyc
+${PYSITELIB}/pyx/metapost/__init__.pyo
+${PYSITELIB}/pyx/metapost/mp_path.py
+${PYSITELIB}/pyx/metapost/mp_path.pyc
+${PYSITELIB}/pyx/metapost/mp_path.pyo
+${PYSITELIB}/pyx/metapost/path.py
+${PYSITELIB}/pyx/metapost/path.pyc
+${PYSITELIB}/pyx/metapost/path.pyo
${PYSITELIB}/pyx/normpath.py
${PYSITELIB}/pyx/normpath.pyc
${PYSITELIB}/pyx/normpath.pyo
@@ -112,18 +181,18 @@ ${PYSITELIB}/pyx/path.pyo
${PYSITELIB}/pyx/pattern.py
${PYSITELIB}/pyx/pattern.pyc
${PYSITELIB}/pyx/pattern.pyo
+${PYSITELIB}/pyx/pdfextra.py
+${PYSITELIB}/pyx/pdfextra.pyc
+${PYSITELIB}/pyx/pdfextra.pyo
${PYSITELIB}/pyx/pdfwriter.py
${PYSITELIB}/pyx/pdfwriter.pyc
${PYSITELIB}/pyx/pdfwriter.pyo
${PYSITELIB}/pyx/pswriter.py
${PYSITELIB}/pyx/pswriter.pyc
${PYSITELIB}/pyx/pswriter.pyo
-${PYSITELIB}/pyx/pykpathsea/__init__.py
-${PYSITELIB}/pyx/pykpathsea/__init__.pyc
-${PYSITELIB}/pyx/pykpathsea/__init__.pyo
-${PYSITELIB}/pyx/siteconfig.py
-${PYSITELIB}/pyx/siteconfig.pyc
-${PYSITELIB}/pyx/siteconfig.pyo
+${PYSITELIB}/pyx/reader.py
+${PYSITELIB}/pyx/reader.pyc
+${PYSITELIB}/pyx/reader.pyo
${PYSITELIB}/pyx/style.py
${PYSITELIB}/pyx/style.pyc
${PYSITELIB}/pyx/style.pyo
@@ -133,24 +202,12 @@ ${PYSITELIB}/pyx/text.pyo
${PYSITELIB}/pyx/trafo.py
${PYSITELIB}/pyx/trafo.pyc
${PYSITELIB}/pyx/trafo.pyo
-${PYSITELIB}/pyx/type1font.py
-${PYSITELIB}/pyx/type1font.pyc
-${PYSITELIB}/pyx/type1font.pyo
${PYSITELIB}/pyx/unit.py
${PYSITELIB}/pyx/unit.pyc
${PYSITELIB}/pyx/unit.pyo
${PYSITELIB}/pyx/version.py
${PYSITELIB}/pyx/version.pyc
${PYSITELIB}/pyx/version.pyo
-share/examples/PyX/pyxrc
-share/pyx/10pt.lfs
-share/pyx/10ptex.lfs
-share/pyx/11pt.lfs
-share/pyx/11ptex.lfs
-share/pyx/12pt.lfs
-share/pyx/12ptex.lfs
-share/pyx/foils17pt.lfs
-share/pyx/foils20pt.lfs
-share/pyx/foils25pt.lfs
-share/pyx/foils30pt.lfs
-share/pyx/pyx.def
+${PYSITELIB}/pyx/writer.py
+${PYSITELIB}/pyx/writer.pyc
+${PYSITELIB}/pyx/writer.pyo
diff --git a/textproc/py-X/distinfo b/textproc/py-X/distinfo
index 7183297f326..86d11a7fad7 100644
--- a/textproc/py-X/distinfo
+++ b/textproc/py-X/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.2 2007/05/19 01:14:07 adrianp Exp $
+$NetBSD: distinfo,v 1.3 2014/01/20 12:37:04 wiz Exp $
-SHA1 (PyX-0.9.tar.gz) = 79daf941f0ad36126471567879aaf6f94d21ccc4
-RMD160 (PyX-0.9.tar.gz) = 095148e1cf5af028724ba3abf52794741e72d084
-Size (PyX-0.9.tar.gz) = 351451 bytes
-SHA1 (patch-aa) = 789d1a8209334f4258c4e404cdf0b0daf1d4f18f
+SHA1 (PyX-0.13.tar.gz) = 1c5d100250358897ca8c6f2237a35f1d69b1ae6d
+RMD160 (PyX-0.13.tar.gz) = 0cbd1da09ae9670bb8b42a59a103d0c8a53175c3
+Size (PyX-0.13.tar.gz) = 1237082 bytes
diff --git a/textproc/py-X/patches/patch-aa b/textproc/py-X/patches/patch-aa
deleted file mode 100644
index b4c99a59f44..00000000000
--- a/textproc/py-X/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2007/05/19 01:14:07 adrianp Exp $
-
---- setup.py.orig 2006-03-09 16:49:55.000000000 +0000
-+++ setup.py
-@@ -75,7 +75,7 @@ adddatafiles("sharedir", "share/pyx", ["
-
- # Note that on windows we can't install to absolute paths. Hence
- # we put the global pyxrc into the share directory as well.
--adddatafiles("pyxrcdir", os.name != "nt" and "/etc" or "share/pyx", ["pyxrc"])
-+adddatafiles("pyxrcdir", os.name != "nt" and "@PKG_SYSCONFDIR@" or "share/pyx", ["pyxrc.default"])
-
- ################################################################################
- # extend install commands to overwrite siteconfig.py during build and install