summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorgdt <gdt>2010-07-24 12:49:25 +0000
committergdt <gdt>2010-07-24 12:49:25 +0000
commitb843c8d7f9f3312cdef4a81950a3d590298db3d5 (patch)
treec6370143cb6bd3567c39bd14fb517f6f554860a3 /security
parent0a10d45446f28d17583c83fe7023e9f02a3d4d2e (diff)
downloadpkgsrc-b843c8d7f9f3312cdef4a81950a3d590298db3d5.tar.gz
Use distutils.mk, and conditionalize egg file presence.
Fixes build with Python 2.4.
Diffstat (limited to 'security')
-rw-r--r--security/py-OpenSSL/Makefile13
-rw-r--r--security/py-OpenSSL/PLIST4
2 files changed, 5 insertions, 12 deletions
diff --git a/security/py-OpenSSL/Makefile b/security/py-OpenSSL/Makefile
index 7d8396dc66e..e488ccad032 100644
--- a/security/py-OpenSSL/Makefile
+++ b/security/py-OpenSSL/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2010/07/23 23:04:27 gdt Exp $
+# $NetBSD: Makefile,v 1.23 2010/07/24 12:49:25 gdt Exp $
#
DISTNAME= pyOpenSSL-0.10
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= security python
MASTER_SITES= http://pypi.python.org/packages/source/p/pyOpenSSL/
@@ -13,13 +13,6 @@ COMMENT= Python interface to the OpenSSL library
PKG_DESTDIR_SUPPORT= user-destdir
-PYDISTUTILSPKG= yes
-
-# See PY_NO_EGG comments in ../../lang/python/extension.mk.
-PY_NO_EGG= no
-EGG_NAME?= ${DISTNAME}
-PLIST_SUBST+= EGG_FILE=${EGG_NAME}-py${PYVERSSUFFIX}.egg-info
-
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/distutils.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/security/py-OpenSSL/PLIST b/security/py-OpenSSL/PLIST
index 41edd463a36..52728a76820 100644
--- a/security/py-OpenSSL/PLIST
+++ b/security/py-OpenSSL/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2010/07/23 23:04:27 gdt Exp $
+@comment $NetBSD: PLIST,v 1.8 2010/07/24 12:49:25 gdt Exp $
${PYSITELIB}/OpenSSL/SSL.so
${PYSITELIB}/OpenSSL/__init__.py
${PYSITELIB}/OpenSSL/__init__.pyc
@@ -26,4 +26,4 @@ ${PYSITELIB}/OpenSSL/tsafe.pyo
${PYSITELIB}/OpenSSL/version.py
${PYSITELIB}/OpenSSL/version.pyc
${PYSITELIB}/OpenSSL/version.pyo
-${PYSITELIB}/${EGG_FILE}
+${PLIST.eggfile}${PYSITELIB}/${EGG_FILE}