diff options
| author | reed <reed@pkgsrc.org> | 2011-06-17 00:59:25 +0000 |
|---|---|---|
| committer | reed <reed@pkgsrc.org> | 2011-06-17 00:59:25 +0000 |
| commit | 0ccb64a237757ef69b5fa149333c9ec2765e046a (patch) | |
| tree | ef046cfe1df7b467cedfb0b9793a4fd2f5371539 | |
| parent | 12ce98ad14f809ef7555cd45cad1b30a5853707e (diff) | |
| download | pkgsrc-0ccb64a237757ef69b5fa149333c9ec2765e046a.tar.gz | |
Add missing custom PLIST entries for _sha256.so and _sha512.so
for some systems that have older openssl. (The Makefile
part was already there but was unused.)
Also replace interpreter for all scripts.
This caused the build attempt to rebuild opcode_targets.h. But
that uses "python" which does not exist yet.
| -rw-r--r-- | lang/python31/Makefile | 6 | ||||
| -rw-r--r-- | lang/python31/PLIST.common | 4 | ||||
| -rw-r--r-- | lang/python31/distinfo | 4 | ||||
| -rw-r--r-- | lang/python31/patches/patch-au | 17 |
4 files changed, 20 insertions, 11 deletions
diff --git a/lang/python31/Makefile b/lang/python31/Makefile index 0692b6d8869..3ebb0f070ed 100644 --- a/lang/python31/Makefile +++ b/lang/python31/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2011/06/17 00:10:18 reed Exp $ +# $NetBSD: Makefile,v 1.2 2011/06/17 00:59:25 reed Exp $ .include "dist.mk" @@ -151,9 +151,7 @@ INSTALL_TARGET= altinstall REPLACE_INTERPRETER+= py31 REPLACE.py31.old= .*python[^ ]* REPLACE.py31.new= ${PREFIX}/bin/python${PY_VER_SUFFIX} -REPLACE_FILES.py31= Lib/cgi.py # explicitly demanded to be patched -REPLACE_FILES.py31+= Lib/test/test_bz2.py -REPLACE_FILES.py31+= Lib/test/test_largefile.py Lib/test/test_optparse.py +REPLACE_FILES.py31= Lib/*.py Lib/*/*.py Lib/*/*/*.py SUBST_CLASSES+= findlib SUBST_MESSAGE.findlib= Fixing find_library_file on Darwin. diff --git a/lang/python31/PLIST.common b/lang/python31/PLIST.common index b359ca805fe..9c13dd4c250 100644 --- a/lang/python31/PLIST.common +++ b/lang/python31/PLIST.common @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.common,v 1.1.1.1 2011/06/17 00:10:19 reed Exp $ +@comment $NetBSD: PLIST.common,v 1.2 2011/06/17 00:59:25 reed Exp $ bin/2to3-${PY_VER_SUFFIX} bin/idle3 bin/pydoc${PY_VER_SUFFIX} @@ -1687,6 +1687,8 @@ 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/_pickle.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/python31/distinfo b/lang/python31/distinfo index aa71c9b5a54..8af2e68dcfd 100644 --- a/lang/python31/distinfo +++ b/lang/python31/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2011/06/17 00:10:19 reed Exp $ +$NetBSD: distinfo,v 1.2 2011/06/17 00:59:25 reed Exp $ SHA1 (Python-3.1.4.tar.bz2) = 043d0240247f289205deeb0e620d799005202b3c RMD160 (Python-3.1.4.tar.bz2) = d537706808b00989a636418b6b6a06357b6bb94b @@ -10,6 +10,6 @@ SHA1 (patch-al) = 48e348c64cf54756cf5b10254661ac089bec3e0a SHA1 (patch-am) = 7943623eba8aaa0c10ef8c55407045fb2eba5305 SHA1 (patch-an) = 933acde107b735931d26ace4eef251000b9f07ba SHA1 (patch-ao) = dca396744edc5c0f86c8912bf54347a630cd865b -SHA1 (patch-au) = 6dcce152ad3dda68c3d9e4b9440ddbab481a1298 +SHA1 (patch-au) = a2cefb240d91121315d02104416324c971af6a20 SHA1 (patch-av) = dcbcd47a50b56d1fd8b5e5594b94a155c52d5e39 SHA1 (patch-aw) = 598e4710c426110012048946786a6d72f050e0fc diff --git a/lang/python31/patches/patch-au b/lang/python31/patches/patch-au index 38cfdd283fb..23978d68fa3 100644 --- a/lang/python31/patches/patch-au +++ b/lang/python31/patches/patch-au @@ -1,8 +1,17 @@ -$NetBSD: patch-au,v 1.1.1.1 2011/06/17 00:10:19 reed Exp $ +$NetBSD: patch-au,v 1.2 2011/06/17 00:59:25 reed Exp $ ---- Makefile.pre.in.orig 2011-06-11 15:48:51.000000000 +0000 -+++ Makefile.pre.in -@@ -807,7 +807,8 @@ altbininstall: $(BUILDPYTHON) +--- Makefile.pre.in.orig 2011-06-11 11:48:51.000000000 -0400 ++++ Makefile.pre.in 2011-06-16 20:47:35.000000000 -0400 +@@ -602,7 +602,7 @@ + $(OPCODETARGETS_H): $(OPCODETARGETGEN_FILES) + $(OPCODETARGETGEN) $(OPCODETARGETS_H) + +-Python/ceval.o: $(OPCODETARGETS_H) ++#Python/ceval.o: $(OPCODETARGETS_H) + + Python/formatter_unicode.o: $(srcdir)/Python/formatter_unicode.c \ + $(BYTESTR_DEPS) \ +@@ -807,7 +807,8 @@ (cd $(DESTDIR)$(LIBDIR); $(LN) -sf $(INSTSONAME) $(LDLIBRARY)) \ fi \ fi; \ |