Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 1137D7A167 for ; Thu, 26 Jan 2017 23:10:37 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id A8C6F855A5; Thu, 26 Jan 2017 23:10:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 3A7E985592 for ; Thu, 26 Jan 2017 23:10:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id st9SCMzK9yXv for ; Thu, 26 Jan 2017 23:10:35 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 6361084CE5 for ; Thu, 26 Jan 2017 23:10:35 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 57F80FBA6; Thu, 26 Jan 2017 23:10:35 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1485472235266990" MIME-Version: 1.0 Date: Thu, 26 Jan 2017 23:10:35 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/lang/python27 To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20170126231035.57F80FBA6@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1485472235266990 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Thu Jan 26 23:10:35 UTC 2017 Modified Files: pkgsrc/lang/python27: Makefile PLIST.common distinfo pkgsrc/lang/python27/patches: patch-am Log Message: Do not install bsddb185 module by default. Bump PKGREVISION. Based on patch from Jesus Cea on tech-pkg. If you need this module, let me know and we can package it separately. To generate a diff of this commit: cvs rdiff -u -r1.68 -r1.69 pkgsrc/lang/python27/Makefile cvs rdiff -u -r1.16 -r1.17 pkgsrc/lang/python27/PLIST.common cvs rdiff -u -r1.63 -r1.64 pkgsrc/lang/python27/distinfo cvs rdiff -u -r1.21 -r1.22 pkgsrc/lang/python27/patches/patch-am Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1485472235266990 Content-Disposition: inline Content-Length: 9618 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/python27/Makefile diff -u pkgsrc/lang/python27/Makefile:1.68 pkgsrc/lang/python27/Makefile:1.69 --- pkgsrc/lang/python27/Makefile:1.68 Fri Dec 30 10:53:21 2016 +++ pkgsrc/lang/python27/Makefile Thu Jan 26 23:10:35 2017 @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.68 2016/12/30 10:53:21 adam Exp $ +# $NetBSD: Makefile,v 1.69 2017/01/26 23:10:35 wiz Exp $ .include "dist.mk" PKGNAME= python27-${PY_DISTVERSION} +PKGREVISION= 1 CATEGORIES= lang python MAINTAINER= pkgsrc-users@NetBSD.org @@ -124,20 +125,9 @@ PLIST.no-nis= yes . endif .endif -.include "../../mk/bdb.buildlink3.mk" -MAKE_ENV+= PY_BDB_TYPE=${BDB_TYPE} -.if empty(BDB_LIBS) -BUILDLINK_TRANSFORM+= rm:-ldb -.endif -CFLAGS+= -DHAVE_DB_185_H - # configure complains about buggy getaddrinfo() CONFIGURE_ARGS.OSF1+= --disable-ipv6 -.if defined(BUILDLINK_TRANSFORM) -MAKE_ENV+= PY_BDB_TRANSFORM=${BUILDLINK_TRANSFORM:Q} -.endif - PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX:Q} TEST_TARGET= test Index: pkgsrc/lang/python27/PLIST.common diff -u pkgsrc/lang/python27/PLIST.common:1.16 pkgsrc/lang/python27/PLIST.common:1.17 --- pkgsrc/lang/python27/PLIST.common:1.16 Fri Dec 30 10:53:21 2016 +++ pkgsrc/lang/python27/PLIST.common Thu Jan 26 23:10:35 2017 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.common,v 1.16 2016/12/30 10:53:21 adam Exp $ +@comment $NetBSD: PLIST.common,v 1.17 2017/01/26 23:10:35 wiz Exp $ bin/2to3-${PY_VER_SUFFIX} bin/pydoc${PY_VER_SUFFIX} bin/python${PY_VER_SUFFIX} @@ -1922,7 +1922,6 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/_ lib/python${PY_VER_SUFFIX}/lib-dynload/array.so lib/python${PY_VER_SUFFIX}/lib-dynload/audioop.so lib/python${PY_VER_SUFFIX}/lib-dynload/binascii.so -lib/python${PY_VER_SUFFIX}/lib-dynload/bsddb185.so lib/python${PY_VER_SUFFIX}/lib-dynload/bz2.so lib/python${PY_VER_SUFFIX}/lib-dynload/cPickle.so lib/python${PY_VER_SUFFIX}/lib-dynload/cStringIO.so Index: pkgsrc/lang/python27/distinfo diff -u pkgsrc/lang/python27/distinfo:1.63 pkgsrc/lang/python27/distinfo:1.64 --- pkgsrc/lang/python27/distinfo:1.63 Sun Jan 8 19:49:15 2017 +++ pkgsrc/lang/python27/distinfo Thu Jan 26 23:10:35 2017 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.63 2017/01/08 19:49:15 wiz Exp $ +$NetBSD: distinfo,v 1.64 2017/01/26 23:10:35 wiz Exp $ SHA1 (Python-2.7.13.tar.xz) = 18a8f30a0356c751b8d0ea6f76e764cab13ee046 RMD160 (Python-2.7.13.tar.xz) = be09518cdc335314de1c5ebe181690082ce780d7 @@ -20,7 +20,7 @@ SHA1 (patch-ad) = 96ae702995d434e2d7ec0a SHA1 (patch-ae) = d836d77854a2b3d79fa34a06a8e2493bf0a503e6 SHA1 (patch-ah) = dbb36db1182748fae26320dbe0bc5f9006886b1c SHA1 (patch-al) = 541936b79f281db06761f4fa6a65a04e852b02b4 -SHA1 (patch-am) = cf82bd1996aea8a8536bd37a74563bb85817c968 +SHA1 (patch-am) = 25c29f3799cb02db962d5c42d71ec59b4748466f SHA1 (patch-an) = 9aad78714c4fe1a21cf66a6627d97d164ecea196 SHA1 (patch-ao) = 5bcfad96f8e490351160f1a7c1f4ece7706a33fa SHA1 (patch-au) = 0ecdb937cbd58e3dbfa6fb94d1af5838619c77fd Index: pkgsrc/lang/python27/patches/patch-am diff -u pkgsrc/lang/python27/patches/patch-am:1.21 pkgsrc/lang/python27/patches/patch-am:1.22 --- pkgsrc/lang/python27/patches/patch-am:1.21 Tue Jul 26 16:44:28 2016 +++ pkgsrc/lang/python27/patches/patch-am Thu Jan 26 23:10:35 2017 @@ -1,7 +1,8 @@ -$NetBSD: patch-am,v 1.21 2016/07/26 16:44:28 kamil Exp $ +$NetBSD: patch-am,v 1.22 2017/01/26 23:10:35 wiz Exp $ Disabled modules for normal build: bsddb +bsddb185 curses curses_panel elementtree @@ -19,22 +20,20 @@ headers and libraries from the system. Build the _ssl module with pkgsrc choiced OpenSSL. -Build the 1.85 compat module all the time against the BDB version of choice. - cygwin 2.7.3-no-libm.patch --- setup.py.orig 2016-06-25 21:49:32.000000000 +0000 +++ setup.py -@@ -33,7 +33,7 @@ host_platform = get_platform() +@@ -33,7 +33,7 @@ COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS")) # 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", "_sqlite3", "_tkinter", "gdbm", "pyexpat", "readline", "linuxaudiodev", "ossaudiodev", "spwd", "sunaudiodev"] ++disabled_module_list = ["_bsddb", "bsddb185", "_curses", "_curses_panel", "_elementtree", "_sqlite3", "_tkinter", "gdbm", "pyexpat", "readline", "linuxaudiodev", "ossaudiodev", "spwd", "sunaudiodev"] def add_dir_to_list(dirlist, dir): """Add the directory 'dir' to the list 'dirlist' (at the front) if -@@ -454,10 +454,15 @@ class PyBuildExt(build_ext): +@@ -454,10 +454,15 @@ os.unlink(tmpfile) def detect_modules(self): @@ -54,7 +53,7 @@ cygwin 2.7.3-no-libm.patch if cross_compiling: self.add_gcc_paths() self.add_multiarch_paths() -@@ -569,7 +574,7 @@ class PyBuildExt(build_ext): +@@ -569,7 +574,7 @@ # Check for MacOS X, which doesn't need libm.a at all math_libs = ['m'] @@ -63,7 +62,7 @@ cygwin 2.7.3-no-libm.patch math_libs = [] # XXX Omitted modules: gl, pure, dl, SGI-specific modules -@@ -809,11 +814,10 @@ class PyBuildExt(build_ext): +@@ -809,11 +814,10 @@ libraries=math_libs) ) # Detect SSL support for the socket module (via _ssl) search_for_ssl_incs_in = [ @@ -78,7 +77,7 @@ cygwin 2.7.3-no-libm.patch ) if ssl_incs is not None: krb5_h = find_file('krb5.h', inc_dirs, -@@ -821,9 +825,7 @@ class PyBuildExt(build_ext): +@@ -821,9 +825,7 @@ if krb5_h: ssl_incs += krb5_h ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, @@ -89,7 +88,7 @@ cygwin 2.7.3-no-libm.patch if (ssl_incs is not None and ssl_libs is not None): -@@ -842,7 +844,7 @@ class PyBuildExt(build_ext): +@@ -842,7 +844,7 @@ # look for the openssl version header on the compiler search path. opensslv_h = find_file('openssl/opensslv.h', [], @@ -98,7 +97,7 @@ cygwin 2.7.3-no-libm.patch if opensslv_h: name = os.path.join(opensslv_h[0], 'openssl/opensslv.h') if host_platform == 'darwin' and is_macosx_sdk_path(name): -@@ -942,175 +944,6 @@ class PyBuildExt(build_ext): +@@ -942,175 +944,6 @@ else: raise ValueError("unknown major BerkeleyDB version", major) @@ -274,10 +273,21 @@ cygwin 2.7.3-no-libm.patch # The sqlite interface sqlite_setup_debug = False # verbose debug prints from this script? -@@ -1227,35 +1060,39 @@ class PyBuildExt(build_ext): - # we do not build this one. Otherwise this build will pick up - # the more recent berkeleydb's db.h file first in the include path - # when attempting to compile and it will fail. +@@ -1216,46 +1049,32 @@ + else: + missing.append('_sqlite3') + +- # Look for Berkeley db 1.85. Note that it is built as a different +- # module name so it can be included even when later versions are +- # available. A very restrictive search is performed to avoid +- # accidentally building this module with a later version of the +- # underlying db library. May BSD-ish Unixes incorporate db 1.85 +- # symbols into libc and place the include file in /usr/include. +- # +- # If the better bsddb library can be built (db_incs is defined) +- # we do not build this one. Otherwise this build will pick up +- # the more recent berkeleydb's db.h file first in the include path +- # when attempting to compile and it will fail. - f = "/usr/include/db.h" - - if host_platform == 'darwin': @@ -301,14 +311,9 @@ cygwin 2.7.3-no-libm.patch - exts.append(Extension('bsddb185', ['bsddbmodule.c'])) - else: - missing.append('bsddb185') -+ libraries = os.getenv("PY_BDB_TYPE", "") -+ if libraries: -+ exts.append(Extension('bsddb185', ['bsddbmodule.c'], -+ libraries=['db'])) - else: +- else: - missing.append('bsddb185') -+ exts.append(Extension('bsddb185', ['bsddbmodule.c'])) - +- dbm_order = ['gdbm'] # The standard Unix dbm module: if host_platform not in ['cygwin']: @@ -338,7 +343,7 @@ cygwin 2.7.3-no-libm.patch config_args = [arg.strip("'") for arg in sysconfig.get_config_var("CONFIG_ARGS").split()] dbm_args = [arg for arg in config_args -@@ -1267,7 +1104,7 @@ class PyBuildExt(build_ext): +@@ -1267,7 +1086,7 @@ dbmext = None for cand in dbm_order: if cand == "ndbm": @@ -347,7 +352,7 @@ cygwin 2.7.3-no-libm.patch # Some systems have -lndbm, others have -lgdbm_compat, # others don't have either if self.compiler.find_library_file(lib_dirs, -@@ -1311,18 +1148,14 @@ class PyBuildExt(build_ext): +@@ -1311,18 +1130,14 @@ libraries = gdbm_libs) break elif cand == "bdb": @@ -374,7 +379,7 @@ cygwin 2.7.3-no-libm.patch if dbmext is not None: exts.append(dbmext) else: -@@ -2250,9 +2083,9 @@ def main(): +@@ -2250,9 +2065,9 @@ ext_modules=[Extension('_struct', ['_struct.c'])], # Scripts to install --_----------=_1485472235266990--