pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/converters/py-simplejson Use egg.mk instead of manuall...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b49827af75f7
branches:  trunk
changeset: 547057:b49827af75f7
user:      mjl <mjl%pkgsrc.org@localhost>
date:      Thu Sep 11 16:32:06 2008 +0000

description:
Use egg.mk instead of manually infer egg name and add destdir support.
Thanks to Eric Gillespie epg@ for the patch.

diffstat:

 converters/py-simplejson/Makefile |   9 +++++----
 converters/py-simplejson/PLIST    |  16 ++++++++--------
 2 files changed, 13 insertions(+), 12 deletions(-)

diffs (59 lines):

diff -r 16abfe1ec61d -r b49827af75f7 converters/py-simplejson/Makefile
--- a/converters/py-simplejson/Makefile Thu Sep 11 16:31:18 2008 +0000
+++ b/converters/py-simplejson/Makefile Thu Sep 11 16:32:06 2008 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2008/09/10 14:01:35 mjl Exp $
+# $NetBSD: Makefile,v 1.4 2008/09/11 16:32:06 mjl Exp $
 #
 
 PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
 DISTNAME=      simplejson-1.9.2
+EGG_NAME=  ${DISTNAME}
 CATEGORIES=    converters
 MASTER_SITES=  http://pypi.python.org/packages/source/s/simplejson/
 
@@ -10,12 +11,12 @@
 HOMEPAGE=      http://undefined.org/python/#simplejson
 COMMENT=       Simplejson is a simple, fast, extensible JSON encoder/decoder
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 USE_LANGUAGES=  c
 
 PYDISTUTILSPKG=         yes
 PYBINMODULE=    yes
-PYSETUPINSTALLARGS= --single-version-externally-managed --record plist.txt
-PLIST_SUBST+=   PYVERSSUFFIX=${PYVERSSUFFIX:Q}
 
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 16abfe1ec61d -r b49827af75f7 converters/py-simplejson/PLIST
--- a/converters/py-simplejson/PLIST    Thu Sep 11 16:31:18 2008 +0000
+++ b/converters/py-simplejson/PLIST    Thu Sep 11 16:32:06 2008 +0000
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/09/10 13:53:29 mjl Exp $
-${PYSITELIB}/simplejson-1.9.2-py${PYVERSSUFFIX}.egg-info/PKG-INFO
-${PYSITELIB}/simplejson-1.9.2-py${PYVERSSUFFIX}.egg-info/SOURCES.txt
-${PYSITELIB}/simplejson-1.9.2-py${PYVERSSUFFIX}.egg-info/dependency_links.txt
-${PYSITELIB}/simplejson-1.9.2-py${PYVERSSUFFIX}.egg-info/native_libs.txt
-${PYSITELIB}/simplejson-1.9.2-py${PYVERSSUFFIX}.egg-info/top_level.txt
-${PYSITELIB}/simplejson-1.9.2-py${PYVERSSUFFIX}.egg-info/zip-safe
+@comment $NetBSD: PLIST,v 1.2 2008/09/11 16:32:06 mjl Exp $
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/native_libs.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/${EGG_INFODIR}/zip-safe
 ${PYSITELIB}/simplejson/__init__.py
 ${PYSITELIB}/simplejson/__init__.pyc
 ${PYSITELIB}/simplejson/__init__.pyo
@@ -66,6 +66,6 @@
 ${PYSITELIB}/simplejson/tool.py
 ${PYSITELIB}/simplejson/tool.pyc
 ${PYSITELIB}/simplejson/tool.pyo
-@dirrm ${PYSITELIB}/simplejson-1.9.2-py${PYVERSSUFFIX}.egg-info
 @dirrm ${PYSITELIB}/simplejson/tests
+@dirrm ${PYSITELIB}/${EGG_INFODIR}
 @dirrm ${PYSITELIB}/simplejson



Home | Main Index | Thread Index | Old Index