[pkgsrc/trunk]: pkgsrc/security/py-OpenSSL Substitute the egg file in PLIST s...

[gdt <gdt%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/eb56c39e4ff7
branches:  trunk
changeset: 577889:eb56c39e4ff7
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Fri Jul 23 23:04:27 2010 +0000

description:
Substitute the egg file in PLIST so that the version isn't hardcoded.
(We are missing infrastructure for egg files in non-egg packages.)
Problem pointed out by wiz@.

diffstat:

 security/py-OpenSSL/Makefile |  8 ++++++--
 security/py-OpenSSL/PLIST    |  4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diffs (42 lines):

diff -r 9de368f1bf27 -r eb56c39e4ff7 security/py-OpenSSL/Makefile
--- a/security/py-OpenSSL/Makefile      Fri Jul 23 22:56:40 2010 +0000
+++ b/security/py-OpenSSL/Makefile      Fri Jul 23 23:04:27 2010 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2010/07/23 21:09:51 gdt Exp $
+# $NetBSD: Makefile,v 1.22 2010/07/23 23:04:27 gdt Exp $
 #
 
 DISTNAME=      pyOpenSSL-0.10
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/py//}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    security python
 MASTER_SITES=  http://pypi.python.org/packages/source/p/pyOpenSSL/
 
@@ -14,7 +14,11 @@
 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 "../../security/openssl/buildlink3.mk"
diff -r 9de368f1bf27 -r eb56c39e4ff7 security/py-OpenSSL/PLIST
--- a/security/py-OpenSSL/PLIST Fri Jul 23 22:56:40 2010 +0000
+++ b/security/py-OpenSSL/PLIST Fri Jul 23 23:04:27 2010 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2010/07/23 21:09:51 gdt Exp $
+@comment $NetBSD: PLIST,v 1.7 2010/07/23 23:04:27 gdt Exp $
 ${PYSITELIB}/OpenSSL/SSL.so
 ${PYSITELIB}/OpenSSL/__init__.py
 ${PYSITELIB}/OpenSSL/__init__.pyc
@@ -26,4 +26,4 @@
 ${PYSITELIB}/OpenSSL/version.py
 ${PYSITELIB}/OpenSSL/version.pyc
 ${PYSITELIB}/OpenSSL/version.pyo
-${PYSITELIB}/pyOpenSSL-0.10-py2.6.egg-info
+${PYSITELIB}/${EGG_FILE}