diff options
| author | jperkin <jperkin> | 2017-01-26 09:45:23 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2017-01-26 09:45:23 +0000 |
| commit | d6e54726b37fed652f9f7620244189f98a596ed7 (patch) | |
| tree | 351572df409dc9cc0b34830f23dfdc244f7b1433 /lang/python34 | |
| parent | c168a84842f367908227978e331066e2988f721d (diff) | |
| download | pkgsrc-d6e54726b37fed652f9f7620244189f98a596ed7.tar.gz | |
Remove obsolete bsddb bits carried over from python2. Patch from jcea in
joyent/pkgsrc#457.
Diffstat (limited to 'lang/python34')
| -rw-r--r-- | lang/python34/Makefile | 13 | ||||
| -rw-r--r-- | lang/python34/distinfo | 4 | ||||
| -rw-r--r-- | lang/python34/patches/patch-am | 4 |
3 files changed, 6 insertions, 15 deletions
diff --git a/lang/python34/Makefile b/lang/python34/Makefile index 3aeed64be78..c08f0e9ce32 100644 --- a/lang/python34/Makefile +++ b/lang/python34/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2017/01/19 01:25:09 wen Exp $ +# $NetBSD: Makefile,v 1.19 2017/01/26 09:45:23 jperkin Exp $ .include "dist.mk" @@ -77,7 +77,7 @@ PLIST.oss= yes CFLAGS+= -I${OSX_SDK_PATH:Q}/usr/include .endif -PLIST_VARS+= bsddb dll nis no-nis +PLIST_VARS+= dll nis no-nis .if ${OPSYS} == "IRIX" . if ${ABI} == "64" PLIST.no-nis= yes @@ -85,11 +85,6 @@ PLIST.no-nis= yes PLIST.nis= yes . endif .else -. include "../../mk/bdb.buildlink3.mk" -MAKE_ENV+= PY_BDB_TYPE=${BDB_TYPE} -MAKE_ENV+= PY_BDB_INCDIRS=${BUILDLINK_INCDIRS.${BDB_TYPE}:S,^,${BDBBASE}/,:Q} -MAKE_ENV+= PY_BDB_LIBDIRS=${BDBBASE}/lib -PLIST.bsddb= yes PLIST.dll= yes . if ${OPSYS} != "NetBSD" || exists(/usr/bin/ypcat) PLIST.nis= yes @@ -98,10 +93,6 @@ PLIST.no-nis= yes . endif .endif -.if defined(BUILDLINK_TRANSFORM) -MAKE_ENV+= PY_BDB_TRANSFORM=${BUILDLINK_TRANSFORM:Q} -.endif - PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX:Q} PRINT_PLIST_AWK+= { gsub(/${PY_PLATNAME}/, "$${PY_PLATNAME}") } diff --git a/lang/python34/distinfo b/lang/python34/distinfo index 3dc9c25acb4..19bc303c20b 100644 --- a/lang/python34/distinfo +++ b/lang/python34/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.24 2017/01/19 01:25:09 wen Exp $ +$NetBSD: distinfo,v 1.25 2017/01/26 09:45:23 jperkin Exp $ SHA1 (Python-3.4.6.tar.xz) = ef7dbec63d45760701534990511d686e3acbbe4f RMD160 (Python-3.4.6.tar.xz) = a669de69e6728141a6c960877c486c1f094b560d @@ -8,7 +8,7 @@ SHA1 (patch-Lib_distutils_unixccompiler.py) = 7d6df07921ad3357757d4681a964256b56 SHA1 (patch-aa) = 14359f8d0527eff08073c0aea60dfe8961d9255d SHA1 (patch-ah) = 0acdfcbf3ebcb96b18a1cf28f18b286aa507a62f SHA1 (patch-al) = 7239d10b67c739c3ee33dd2fc95bb770360d152f -SHA1 (patch-am) = 1752a06fec7626af57e85b6cbd9b6cc38b99272f +SHA1 (patch-am) = 5822927f1c315b4fce5078626efe5418c764665e SHA1 (patch-an) = c9b571eb54fdf0b1e93524a6de6780e8c4119221 SHA1 (patch-au) = b593d64b34531fdd5a936d109854d80e969f1847 SHA1 (patch-av) = 9b44f339f65f029b7f17dbc654739a7ae3c12780 diff --git a/lang/python34/patches/patch-am b/lang/python34/patches/patch-am index 3f048550c5b..1050d101c6d 100644 --- a/lang/python34/patches/patch-am +++ b/lang/python34/patches/patch-am @@ -1,4 +1,4 @@ -$NetBSD: patch-am,v 1.6 2014/06/01 10:11:29 wiz Exp $ +$NetBSD: patch-am,v 1.7 2017/01/26 09:45:23 jperkin Exp $ --- setup.py.orig 2014-03-17 02:31:31.000000000 +0000 +++ setup.py @@ -7,7 +7,7 @@ $NetBSD: patch-am,v 1.6 2014/06/01 10:11:29 wiz Exp $ # This global variable is used to hold the list of modules to be disabled. -disabled_module_list = [] -+disabled_module_list = ["_bsddb", "_curses", "_curses_panel", "_elementtree", ++disabled_module_list = ["_curses", "_curses_panel", "_elementtree", +"_sqlite3", "_tkinter", "_gdbm", "pyexpat", "readline", "spwd", "xxlimited"] def add_dir_to_list(dirlist, dir): |