diff options
| author | drochner <drochner> | 2002-01-17 11:22:43 +0000 |
|---|---|---|
| committer | drochner <drochner> | 2002-01-17 11:22:43 +0000 |
| commit | d7180c0f030ee5f8133d8492c50eefea9a4d6397 (patch) | |
| tree | b80ad49f3cf8c973b033db90517771c73c14f753 /textproc | |
| parent | 6660dcefbcf3518427b380a5065189c4d151e535 (diff) | |
| download | pkgsrc-d7180c0f030ee5f8133d8492c50eefea9a4d6397.tar.gz | |
move to canonical pkg name (pyX.Y-pkg-vers),
append version suffix to installed scripts to avoid conflicts,
patch path to python executable into installed scripts
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/pyxml/Makefile | 16 | ||||
| -rw-r--r-- | textproc/pyxml/PLIST | 6 | ||||
| -rw-r--r-- | textproc/pyxml/distinfo | 3 | ||||
| -rw-r--r-- | textproc/pyxml/patches/patch-aa | 12 |
4 files changed, 32 insertions, 5 deletions
diff --git a/textproc/pyxml/Makefile b/textproc/pyxml/Makefile index 6f22900ee60..6df14df14b9 100644 --- a/textproc/pyxml/Makefile +++ b/textproc/pyxml/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.5 2002/01/16 21:06:44 drochner Exp $ +# $NetBSD: Makefile,v 1.6 2002/01/17 11:22:43 drochner Exp $ # DISTNAME= PyXML-0.6.6 +PKGNAME= ${PYPKGPREFIX}-xml-0.6.6 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pyxml/} @@ -10,11 +11,24 @@ HOMEPAGE= http://pyxml.sourceforge.net/ COMMENT= collection of libraries to process XML with Python DEPENDS+= expat-[0-9]*:../../textproc/expat +CONFLICTS+= PyXML-* PYDISTUTILSPKG= yes PYBINMODULE= yes PYSETUPBUILDARGS+= --with-libexpat=${LOCALBASE} PYSETUPBUILDARGS+= --ldflags=-Wl,-R${LOCALBASE}/lib +PYXML_SCRIPTS= scripts/xmlproc_parse \ + scripts/xmlproc_val + +post-extract: +.for s in ${PYXML_SCRIPTS} + ${MV} ${WRKSRC}/$s ${WRKSRC}/$s${PYVERSSUFFIX} +.endfor + +PYTHON_PATCH_SCRIPTS= ${PYXML_SCRIPTS:S/$/${PYVERSSUFFIX}/g} +PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} + .include "../../lang/python/extension.buildlink.mk" +.include "../../lang/python/application.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/pyxml/PLIST b/textproc/pyxml/PLIST index 6a15f802171..e3e2269e4f1 100644 --- a/textproc/pyxml/PLIST +++ b/textproc/pyxml/PLIST @@ -1,6 +1,6 @@ -@comment $NetBSD: PLIST,v 1.2 2002/01/16 21:06:44 drochner Exp $ -bin/xmlproc_parse -bin/xmlproc_val +@comment $NetBSD: PLIST,v 1.3 2002/01/17 11:22:43 drochner Exp $ +bin/xmlproc_parse${PYVERSSUFFIX} +bin/xmlproc_val${PYVERSSUFFIX} ${PYSITELIB}/_xmlplus/__init__.py ${PYSITELIB}/_xmlplus/__init__.pyc ${PYSITELIB}/_xmlplus/_checkversion.py diff --git a/textproc/pyxml/distinfo b/textproc/pyxml/distinfo index 32041ea4744..1892a512c3b 100644 --- a/textproc/pyxml/distinfo +++ b/textproc/pyxml/distinfo @@ -1,4 +1,5 @@ -$NetBSD: distinfo,v 1.4 2001/08/06 16:05:57 drochner Exp $ +$NetBSD: distinfo,v 1.5 2002/01/17 11:22:43 drochner Exp $ SHA1 (PyXML-0.6.6.tar.gz) = 1c5bcf40705fb397f17d2318757098e4697e549f Size (PyXML-0.6.6.tar.gz) = 503610 bytes +SHA1 (patch-aa) = 51af9ee51699a9a17ebaf000aba3aba5cb07fd94 diff --git a/textproc/pyxml/patches/patch-aa b/textproc/pyxml/patches/patch-aa new file mode 100644 index 00000000000..590e07a4736 --- /dev/null +++ b/textproc/pyxml/patches/patch-aa @@ -0,0 +1,12 @@ +$NetBSD: patch-aa,v 1.3 2002/01/17 11:22:44 drochner Exp $ + +--- setup.py.orig Thu Jan 17 11:21:41 2002 ++++ setup.py Thu Jan 17 11:42:15 2002 +@@ -199,5 +199,6 @@ + + ext_modules = ext_modules, + +- scripts = ['scripts/xmlproc_parse', 'scripts/xmlproc_val'] ++ scripts = ['scripts/xmlproc_parse' + sys.version[0:3], ++ 'scripts/xmlproc_val' + sys.version[0:3]] + ) |