From 7d6da0289bdd8645978098395e631950c7a829e0 Mon Sep 17 00:00:00 2001 From: tnn Date: Fri, 25 Apr 2008 11:51:13 +0000 Subject: Fix PLIST for systems that have builtin OpenSSL < 0.9.8, such as NetBSD-3. While here, fix typo in previous. --- lang/python25/Makefile | 15 +++++++++++++-- lang/python25/PLIST.common | 4 +++- 2 files changed, 16 insertions(+), 3 deletions(-) (limited to 'lang/python25') diff --git a/lang/python25/Makefile b/lang/python25/Makefile index f3b1a6db2d3..4248b1814c5 100644 --- a/lang/python25/Makefile +++ b/lang/python25/Makefile @@ -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_VARS+= dl 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 --git a/lang/python25/PLIST.common b/lang/python25/PLIST.common index 6cdc988483d..8a24cae6fa5 100644 --- a/lang/python25/PLIST.common +++ b/lang/python25/PLIST.common @@ -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/_locale.so 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 -- cgit v1.2.3