pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/lang/python25 Fix PLIST for systems that have builtin ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/db5ca1365d85
branches:  trunk
changeset: 541744:db5ca1365d85
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Fri Apr 25 11:51:13 2008 +0000

description:
Fix PLIST for systems that have builtin OpenSSL < 0.9.8, such as NetBSD-3.
While here, fix typo in previous.

diffstat:

 lang/python25/Makefile     |  15 +++++++++++++--
 lang/python25/PLIST.common |   4 +++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diffs (50 lines):

diff -r cb11f8f27e6c -r db5ca1365d85 lang/python25/Makefile
--- a/lang/python25/Makefile    Fri Apr 25 11:46:07 2008 +0000
+++ b/lang/python25/Makefile    Fri Apr 25 11:51:13 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/04/25 11:34:11 tnn Exp $
+# $NetBSD: Makefile,v 1.4 2008/04/25 11:51:13 tnn Exp $
 
 DISTNAME=      Python-2.5.2
 PKGNAME=       python25-2.5.2
@@ -78,10 +78,21 @@
 PLIST.dl=      yes
 .endif
 
+# builds additional modules if OpenSSL < 0.9.8
+PLIST_VARS+=   openssl097
+CHECK_BUILTIN.openssl:=        no
+.include "../../security/openssl/builtin.mk"
+CHECK_BUILTIN.openssl:=        yes
+.if !empty(USE_BUILTIN.openssl:M[yY][eE][sS])
+. if !empty(BUILTIN_PKG.openssl:Mopenssl-0.9.[67]*)
+PLIST.openssl097=      yes
+. endif
+.endif
+
 # setup.py causes some modules to be built if the platform is *not* 64bit.
 PLIST_VARS+=   extra-so
 .if !empty(IS_64BIT_PLATFORM:M[nN][oO])
-LIST.extra-so= yes
+PLIST.extra-so=        yes
 .endif
 
 # ossaudiodev is only available on x86 for the following platforms
diff -r cb11f8f27e6c -r db5ca1365d85 lang/python25/PLIST.common
--- a/lang/python25/PLIST.common        Fri Apr 25 11:46:07 2008 +0000
+++ b/lang/python25/PLIST.common        Fri Apr 25 11:51:13 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.2 2008/04/25 11:34:11 tnn Exp $
+@comment $NetBSD: PLIST.common,v 1.3 2008/04/25 11:51:13 tnn Exp $
 bin/pydoc${PY_VER_SUFFIX}
 bin/python${PY_VER_SUFFIX}
 bin/python${PY_VER_SUFFIX}-config
@@ -1535,6 +1535,8 @@
 lib/python${PY_VER_SUFFIX}/lib-dynload/_lsprof.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/_multibytecodec.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/_random.so
+${PLIST.openssl097}lib/python${PY_VER_SUFFIX}/lib-dynload/_sha256.so
+${PLIST.openssl097}lib/python${PY_VER_SUFFIX}/lib-dynload/_sha512.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/_socket.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/_ssl.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/_struct.so



Home | Main Index | Thread Index | Old Index