diff options
author | jperkin <jperkin@pkgsrc.org> | 2017-01-26 09:45:23 +0000 |
---|---|---|
committer | jperkin <jperkin@pkgsrc.org> | 2017-01-26 09:45:23 +0000 |
commit | 60ffddfcd2fd85aba94670a5618fb79742e8e07e (patch) | |
tree | 3ae5d2715757f010691edfd1965aee5ed940a978 /lang/python35 | |
parent | b3f8c2bbd74547ce7e7863534a4b1341831ba39a (diff) | |
download | pkgsrc-60ffddfcd2fd85aba94670a5618fb79742e8e07e.tar.gz |
Remove obsolete bsddb bits carried over from python2. Patch from jcea in
joyent/pkgsrc#457.
Diffstat (limited to 'lang/python35')
-rw-r--r-- | lang/python35/Makefile | 13 | ||||
-rw-r--r-- | lang/python35/distinfo | 4 | ||||
-rw-r--r-- | lang/python35/patches/patch-setup.py | 4 |
3 files changed, 6 insertions, 15 deletions
diff --git a/lang/python35/Makefile b/lang/python35/Makefile index 6d081b0928c..51bf0cd2aee 100644 --- a/lang/python35/Makefile +++ b/lang/python35/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2017/01/19 13:55:53 wen Exp $ +# $NetBSD: Makefile,v 1.8 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/python35/distinfo b/lang/python35/distinfo index fc12dea7126..8c943f0d958 100644 --- a/lang/python35/distinfo +++ b/lang/python35/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2017/01/19 13:55:53 wen Exp $ +$NetBSD: distinfo,v 1.10 2017/01/26 09:45:23 jperkin Exp $ SHA1 (Python-3.5.3.tar.xz) = 127121fdca11e735b3686e300d66f73aba663e93 RMD160 (Python-3.5.3.tar.xz) = 663ad06b0c4b36e7760f5202e73bc53697f225d2 @@ -13,4 +13,4 @@ SHA1 (patch-Modules_makesetup) = c9b571eb54fdf0b1e93524a6de6780e8c4119221 SHA1 (patch-Modules_nismodule.c) = bd290417c265846e238660180e60e76c0f5f696a SHA1 (patch-Python_thread__pthread.h) = fb81eaa604b4ed7c1b64c3f4731d58a8aee257be SHA1 (patch-configure) = 069f7bb10d98e3616f52859a2cf90c7f5732425e -SHA1 (patch-setup.py) = 42385e851af583ab5a460f6ca7b73e98697e268e +SHA1 (patch-setup.py) = 7d8afe5e799c8373fe41fbb65e283e0c6f3967d2 diff --git a/lang/python35/patches/patch-setup.py b/lang/python35/patches/patch-setup.py index 8993b50b9e3..64e3ebf5383 100644 --- a/lang/python35/patches/patch-setup.py +++ b/lang/python35/patches/patch-setup.py @@ -1,4 +1,4 @@ -$NetBSD: patch-setup.py,v 1.3 2017/01/19 13:55:53 wen Exp $ +$NetBSD: patch-setup.py,v 1.4 2017/01/26 09:45:23 jperkin Exp $ --- setup.py.orig 2017-01-17 07:57:54.000000000 +0000 +++ setup.py @@ -16,7 +16,7 @@ $NetBSD: patch-setup.py,v 1.3 2017/01/19 13:55:53 wen 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): |