diff options
| author | wiz <wiz@pkgsrc.org> | 2012-12-11 00:16:56 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2012-12-11 00:16:56 +0000 |
| commit | f5bd8a8a6262e72880812b3d0cb976585936d874 (patch) | |
| tree | 2d9b8ad4b3bce78b4c110bc321393f38293b5e89 /lang | |
| parent | 4bb67d25a7f21c70449337dca49152c20f48e665 (diff) | |
| download | pkgsrc-f5bd8a8a6262e72880812b3d0cb976585936d874.tar.gz | |
sha256 and sha512 modules are now built for newer openssl as well;
remove unnecessary conditional that broke build on NetBSD-6.99.15/amd64.
While here, replace another interpreter and skip one more file since
it gets replaced much later.
Bump PKGREVISION.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/python33/Makefile | 17 | ||||
| -rw-r--r-- | lang/python33/PLIST | 6 |
2 files changed, 8 insertions, 15 deletions
diff --git a/lang/python33/Makefile b/lang/python33/Makefile index 11e48b4e3b6..27ec3294217 100644 --- a/lang/python33/Makefile +++ b/lang/python33/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.1 2012/12/10 03:15:48 tsarna Exp $ +# $NetBSD: Makefile,v 1.2 2012/12/11 00:16:56 wiz Exp $ .include "dist.mk" PKGNAME= python33-${PY_DISTVERSION} +PKGREVISION= 1 CATEGORIES= lang python MAINTAINER= pkgsrc-users@NetBSD.org @@ -47,16 +48,6 @@ PY_PLATNAME= ${LOWER_OPSYS}${OS_VERSION:C/\..*//} .endif PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME:Q} -# 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 - # ossaudiodev is only available on x86 for the following platforms PLIST_VARS+= oss .if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && \ @@ -106,7 +97,9 @@ INSTALL_TARGET= altinstall REPLACE_INTERPRETER+= py33 REPLACE.py33.old= .*python[^ ]* REPLACE.py33.new= ${PREFIX}/bin/python${PY_VER_SUFFIX} -REPLACE_FILES.py33= Lib/*.py Lib/*/*.py Lib/*/*/*.py +REPLACE_FILES.py33= Lib/*.py Lib/*/*.py Lib/*/*/*.py Lib/*/*/*/*.py + +CHECK_INTERPRETER_SKIP= lib/python${PY_VER_SUFFIX}/venv/scripts/posix/pydoc .if ${OPSYS} == "HPUX" post-install: diff --git a/lang/python33/PLIST b/lang/python33/PLIST index 04ef800f8fe..428884b8f87 100644 --- a/lang/python33/PLIST +++ b/lang/python33/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2012/12/10 03:15:48 tsarna Exp $ +@comment $NetBSD: PLIST,v 1.2 2012/12/11 00:16:56 wiz Exp $ bin/2to3-${PY_VER_SUFFIX} bin/pydoc${PY_VER_SUFFIX} bin/python${PY_VER_SUFFIX} @@ -1754,8 +1754,8 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/_pickle.so lib/python${PY_VER_SUFFIX}/lib-dynload/_posixsubprocess.so lib/python${PY_VER_SUFFIX}/lib-dynload/_random.so lib/python${PY_VER_SUFFIX}/lib-dynload/_sha1.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/_sha256.so +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 |