Remove obsolete bsddb bits carried over from python2. Patch from jcea in

joyent/pkgsrc#457.

9 files changed, 18 insertions, 45 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):
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):
diff --git a/lang/python36/Makefile b/lang/python36/Makefile
index b91c1862876..6d0da031ada 100644
--- a/lang/python36/Makefile
+++ b/lang/python36/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2017/01/26 09:13:27 adam Exp $
+# $NetBSD: Makefile,v 1.4 2017/01/26 09:45:23 jperkin Exp $
 
 .include "dist.mk"
 
@@ -78,7 +78,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
@@ -86,11 +86,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
@@ -99,10 +94,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/python36/distinfo b/lang/python36/distinfo
index 0ea65e34f8b..23951739491 100644
--- a/lang/python36/distinfo
+++ b/lang/python36/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2017/01/26 09:13:27 adam Exp $
+$NetBSD: distinfo,v 1.7 2017/01/26 09:45:23 jperkin Exp $
 
 SHA1 (Python-3.6.0.tar.xz) = 18ebf7d726782967d967dc00e3aa08b334fbdd5c
 RMD160 (Python-3.6.0.tar.xz) = 984a38d1eec379ac8921479a86259ca0161734af
@@ -15,4 +15,4 @@ SHA1 (patch-Modules_makesetup) = a06786eebffadecedba5e3a50a9785fb47613567
 SHA1 (patch-Modules_nismodule.c) = 1bafe9b06359586d027a77011b103877590d947d
 SHA1 (patch-Python_thread__pthread.h) = fb81eaa604b4ed7c1b64c3f4731d58a8aee257be
 SHA1 (patch-configure) = b3b73638ddd72517f4e80193212a38e0cd991157
-SHA1 (patch-setup.py) = f3fd3c3e5bc2e002dcee8239d153360a7247844b
+SHA1 (patch-setup.py) = 2ac8834ecc4e8bb27e1721e572e06dbfa74fe277
diff --git a/lang/python36/patches/patch-setup.py b/lang/python36/patches/patch-setup.py
index aa8bb93d6f4..146d1c7d26e 100644
--- a/lang/python36/patches/patch-setup.py
+++ b/lang/python36/patches/patch-setup.py
@@ -1,4 +1,4 @@
-$NetBSD: patch-setup.py,v 1.1 2017/01/01 14:34:27 adam Exp $
+$NetBSD: patch-setup.py,v 1.2 2017/01/26 09:45:23 jperkin Exp $
 
 Disable modules, so they can be built as separate packages.
 
@@ -17,7 +17,7 @@ Disable modules, so they can be built as separate packages.
  
  # 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):