diff options
author | tron <tron@pkgsrc.org> | 2014-02-12 23:28:16 +0000 |
---|---|---|
committer | tron <tron@pkgsrc.org> | 2014-02-12 23:28:16 +0000 |
commit | faec6e84fd84f3b1295df90b76f9270ecf67ab6d (patch) | |
tree | 36f167dc61ef95fee68ffd6b1b2e135b17d9af20 | |
parent | 0e960a9a78677d389c2f0edc589f211a72ed3082 (diff) | |
download | pkgsrc-faec6e84fd84f3b1295df90b76f9270ecf67ab6d.tar.gz |
Remove now unnecessary package list handling for OpenSSL 0.9.*.
-rw-r--r-- | lang/python26/Makefile | 12 | ||||
-rw-r--r-- | lang/python26/PLIST.common | 4 | ||||
-rw-r--r-- | lang/python27/Makefile | 12 | ||||
-rw-r--r-- | lang/python27/PLIST.common | 4 |
4 files changed, 4 insertions, 28 deletions
diff --git a/lang/python26/Makefile b/lang/python26/Makefile index 9bab1c1f44c..38fbb664755 100644 --- a/lang/python26/Makefile +++ b/lang/python26/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2014/02/12 23:18:05 tron Exp $ +# $NetBSD: Makefile,v 1.59 2014/02/12 23:28:16 tron Exp $ .include "dist.mk" @@ -94,16 +94,6 @@ PLIST_VARS+= dl PLIST.dl= yes .endif -# builds additional modules if OpenSSL < 0.9.8 -PLIST_VARS+= openssl097 -CHECK_BUILTIN.openssl:= yes -.include "../../security/openssl/builtin.mk" -CHECK_BUILTIN.openssl:= no -.if !empty(USE_BUILTIN.openssl:M[yY][eE][sS]) && \ - !empty(BUILTIN_PKG.openssl:Mopenssl-0.9.[67]*) -PLIST.openssl097= yes -.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]) diff --git a/lang/python26/PLIST.common b/lang/python26/PLIST.common index 859e820d0cb..ebf2b7ecb76 100644 --- a/lang/python26/PLIST.common +++ b/lang/python26/PLIST.common @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.common,v 1.15 2013/11/06 07:25:49 adam Exp $ +@comment $NetBSD: PLIST.common,v 1.16 2014/02/12 23:28:16 tron Exp $ bin/2to3-${PY_VER_SUFFIX} bin/pydoc${PY_VER_SUFFIX} bin/python${PY_VER_SUFFIX} @@ -1709,8 +1709,6 @@ 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/_multiprocessing.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 diff --git a/lang/python27/Makefile b/lang/python27/Makefile index 7f8e1f05a39..fe36aef8d7c 100644 --- a/lang/python27/Makefile +++ b/lang/python27/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2014/02/12 23:18:05 tron Exp $ +# $NetBSD: Makefile,v 1.36 2014/02/12 23:28:17 tron Exp $ .include "dist.mk" @@ -94,16 +94,6 @@ PLIST_VARS+= dl PLIST.dl= yes .endif -# builds additional modules if OpenSSL < 0.9.8 -PLIST_VARS+= openssl097 -CHECK_BUILTIN.openssl:= yes -.include "../../security/openssl/builtin.mk" -CHECK_BUILTIN.openssl:= no -.if !empty(USE_BUILTIN.openssl:M[yY][eE][sS]) && \ - !empty(BUILTIN_PKG.openssl:Mopenssl-0.9.[67]*) -PLIST.openssl097= yes -.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]) diff --git a/lang/python27/PLIST.common b/lang/python27/PLIST.common index b8ee656a846..9b5507d577f 100644 --- a/lang/python27/PLIST.common +++ b/lang/python27/PLIST.common @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.common,v 1.7 2013/11/12 18:57:25 adam Exp $ +@comment $NetBSD: PLIST.common,v 1.8 2014/02/12 23:28:17 tron Exp $ bin/2to3-${PY_VER_SUFFIX} bin/pydoc${PY_VER_SUFFIX} bin/python${PY_VER_SUFFIX} @@ -1823,8 +1823,6 @@ 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/_multiprocessing.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 |