diff options
| author | sbd <sbd@pkgsrc.org> | 2012-01-09 07:07:10 +0000 |
|---|---|---|
| committer | sbd <sbd@pkgsrc.org> | 2012-01-09 07:07:10 +0000 |
| commit | a2c9cec93645deb06f37a82b95855285f88bb4b0 (patch) | |
| tree | 43898fd2ccde456db08869c86d750a6ace03b55e /www | |
| parent | 4a7903acd5cd8c8e11a19929af8716c9517a0167 (diff) | |
| download | pkgsrc-a2c9cec93645deb06f37a82b95855285f88bb4b0.tar.gz | |
Revert the below commit:
Module Name: pkgsrc
Committed By: sbd
Date: Sun Jan 8 04:06:35 UTC 2012
Modified Files:
pkgsrc/www/py-uwsgi: Makefile distinfo
Added Files:
pkgsrc/www/py-uwsgi/patches: patch-uwsgiconfig.py
Log Message:
Add missing devel/libuuid buildlink.
Bump PKGREVISION
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/www/py-uwsgi/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/py-uwsgi/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/www/py-uwsgi/patches/patch-uwsgiconfig.py
Diffstat (limited to 'www')
| -rw-r--r-- | www/py-uwsgi/Makefile | 7 | ||||
| -rw-r--r-- | www/py-uwsgi/distinfo | 3 | ||||
| -rw-r--r-- | www/py-uwsgi/patches/patch-uwsgiconfig.py | 20 |
3 files changed, 2 insertions, 28 deletions
diff --git a/www/py-uwsgi/Makefile b/www/py-uwsgi/Makefile index 2cf3e8a4ec0..c43544aed99 100644 --- a/www/py-uwsgi/Makefile +++ b/www/py-uwsgi/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.11 2012/01/08 04:06:34 sbd Exp $ +# $NetBSD: Makefile,v 1.12 2012/01/09 07:07:10 sbd Exp $ DISTNAME= uwsgi-0.9.8.6 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} -PKGREVISION= 1 CATEGORIES= www python MASTER_SITES= http://projects.unbit.it/downloads/ @@ -20,15 +19,11 @@ PYTHON_VERSIONS_ACCEPTED= 27 26 25 USE_LANGUAGES= c PYDISTUTILSPKG= yes -MAKE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR:Q} -INSTALL_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR:Q} - PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} post-install: mv ${DESTDIR}${PREFIX}/bin/uwsgi ${DESTDIR}${PREFIX}/bin/uwsgi-${PYVERSSUFFIX} .include "../../lang/python/extension.mk" -.include "../../devel/libuuid/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/py-uwsgi/distinfo b/www/py-uwsgi/distinfo index 15278db6c0f..cfeb24edc32 100644 --- a/www/py-uwsgi/distinfo +++ b/www/py-uwsgi/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.8 2012/01/08 04:06:34 sbd Exp $ +$NetBSD: distinfo,v 1.9 2012/01/09 07:07:10 sbd Exp $ SHA1 (uwsgi-0.9.8.6.tar.gz) = bb835c3c14310640b24ebdbcf0aa91e8ce8bd5a6 RMD160 (uwsgi-0.9.8.6.tar.gz) = 78b92fe3a9b272ca5a2704b0db7d1956b9149a0b Size (uwsgi-0.9.8.6.tar.gz) = 359620 bytes -SHA1 (patch-uwsgiconfig.py) = 0414838af88a5b5322355e44d2f69bee57609298 diff --git a/www/py-uwsgi/patches/patch-uwsgiconfig.py b/www/py-uwsgi/patches/patch-uwsgiconfig.py deleted file mode 100644 index ffc6a81d67c..00000000000 --- a/www/py-uwsgi/patches/patch-uwsgiconfig.py +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-uwsgiconfig.py,v 1.1 2012/01/08 04:06:35 sbd Exp $ - -Find include/uuid/uuid.h and lib/libuuid.so under the BUILDLINK_DIR. - ---- uwsgiconfig.py.orig 2011-09-11 05:54:27.000000000 +0000 -+++ uwsgiconfig.py -@@ -443,10 +443,11 @@ class uConf(object): - has_json = False - has_uuid = False - -- if os.path.exists('/usr/include/uuid/uuid.h') or os.path.exists('/usr/local/include/uuid/uuid.h'): -+ BUILDLINK_DIR = os.environ.get('BUILDLINK_DIR', '/nonexistant') -+ if os.path.exists('%s/include/uuid/uuid.h' % BUILDLINK_DIR): - has_uuid = True - self.cflags.append("-DUWSGI_UUID") -- if os.path.exists('/usr/lib/libuuid.so') or os.path.exists('/usr/local/lib/libuuid.so') or os.path.exists('/usr/lib64/libuuid.so') or os.path.exists('/usr/local/lib64/libuuid.so'): -+ if os.path.exists('%s/lib/libuuid.so' % BUILDLINK_DIR): - self.libs.append('-luuid') - - if self.get('append_version'): |