 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.61 2014/03/27 05:15:00 obache Exp $
+# $NetBSD: Makefile,v 1.62 2014/03/27 05:36:10 obache Exp $
 .include "dist.mk"
 PKGREVISION=	3
 PKGNAME=	python26-${PY_DISTVERSION}
 CATEGORIES=	lang python
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.python.org/
 COMMENT=	Interpreted, interactive, object-oriented programming language
 LICENSE=	python-software-foundation
 @@ -145,32 +145,26 @@ TEST_TARGET=	test
 INSTALL_TARGET=	altinstall
 REPLACE_INTERPRETER+=	py26
 REPLACE.py26.old=	.*python[^ ]*
 REPLACE.py26.new=	${PREFIX}/bin/python${PY_VER_SUFFIX}
 REPLACE_FILES.py26=	Lib/*.py Lib/*/*.py Lib/*/*/*.py
 SUBST_CLASSES+=		findlib
 SUBST_MESSAGE.findlib=	Fixing find_library_file on Darwin.
 SUBST_STAGE.findlib=	pre-configure
 SUBST_FILES.findlib=	Lib/distutils/unixccompiler.py
 SUBST_SED.findlib=	-e 's,/usr/local,${PREFIX},'
 SUBST_CLASSES+=		sslbase
 SUBST_MESSAGE.sslbase=	Fixing find-file for openssl with SSLBASE.
 SUBST_STAGE.sslbase=	pre-configure
 SUBST_FILES.sslbase=	setup.py
 SUBST_VARS.sslbase=	SSLBASE
 post-extract:
 	${LN} -s ${WRKSRC}/Lib/smtpd.py ${WRKSRC}/Tools/scripts/smtpd${PY_VER_SUFFIX}.py
 	${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc${PY_VER_SUFFIX}
 	${MV} ${WRKSRC}/Tools/scripts/2to3 ${WRKSRC}/Tools/scripts/2to3-${PY_VER_SUFFIX}
 .if ${OPSYS} == "HPUX"
 post-install:
 	${LN} -fs ${DESTDIR}${PREFIX}/lib/libpython2.6.sl \
 		${DESTDIR}${PREFIX}/lib/libpython2.6.sl.1.0
 .endif
 BUILDLINK_DEPMETHOD.readline=		build

 @@ -1,30 +1,30 @@
-$NetBSD: distinfo,v 1.55 2014/03/27 05:15:00 obache Exp $
+$NetBSD: distinfo,v 1.56 2014/03/27 05:36:10 obache Exp $
 SHA1 (Python-2.6.9.tar.xz) = 2fc159946dfcceffbe4a8638de32d0cd8059c2f8
 RMD160 (Python-2.6.9.tar.xz) = 42edf7c9f2f64b77ab173de30ea453257c2c06b3
 Size (Python-2.6.9.tar.xz) = 9333664 bytes
 SHA1 (patch-Lib_distutils_unixccompiler.py) = 1ce01fbe2d36cf0c7ce347c878cfe2d290ec8490
 SHA1 (patch-Mac_Modules_fm___Fmmodule.c) = b9314bccb51b4fe672b81559068f7a79d2965f94
 SHA1 (patch-Mac_Modules_qd___Qdmodule.c) = 45c748b15b9436d45ba137460389638aa7108c8d
 SHA1 (patch-Mac_Modules_qdoffs___Qdoffsmodule.c) = 9994f0c1a908f18f1f3df3f05b184f082c018365
 SHA1 (patch-Modules_pyexpat.c) = 093f5abb50667e776c66564f4ec87addfdc05ff3
 SHA1 (patch-SA43463) = a0285ce9eb1d994bb05cd54812f3fc9cb678fe7f
 SHA1 (patch-aa) = 0528fc5da76d5f1d19586ea3dda1acd09a4b0113
 SHA1 (patch-ab) = b47aa9d18a7c1a99ac8cc8b29c64867443f303e5
 SHA1 (patch-ac) = 57c88d47f82630e67bcd27ab61bf4362035da2f2
 SHA1 (patch-ad) = a997e39d16a8f0023125362b180d19ee97ab519b
 SHA1 (patch-ae) = a6d578b5f12eb42fbbcc11791576d2686a4807d9
 SHA1 (patch-ah) = 501d220b41e578402f3400fe88e582aa2408a147
 SHA1 (patch-al) = 45dd16af8e7a45aa323138f712c034aa79a91019
-SHA1 (patch-am) = 602726fb7f694c1cfe39691aef01fee1687befb1
+SHA1 (patch-am) = 4064aa3cbe34389ce344d7372eb71c7305f38e07
 SHA1 (patch-an) = 17b4e17b3b562c29a050e9bb20447084ce82b8ab
 SHA1 (patch-ao) = 8c6a156b0f0c2a6d319658477fff348e6a0c3603
 SHA1 (patch-ap) = 5ad6f248027be369bd27f69210ff3c7b97a297a2
 SHA1 (patch-au) = 230d74342997021e957105786e93600f5d03cf7b
 SHA1 (patch-av) = d6bf0419015656a8d2f13d3132873e453c8a6b6e
 SHA1 (patch-az) = 473419352f6e1ff3c6e6268e81457e6f8a1fccb8
 SHA1 (patch-ba) = 97dcf72d7380a2d257220669845c52a698165fcf
 SHA1 (patch-bb) = 6cdd94dd1e69630159194c7c153b6c4e46c81456
 SHA1 (patch-bc) = 2a57949e0085ac3e8fe8ecd64ffb2b205f3862ac
 SHA1 (patch-pyconfig.h.in) = ad0f7d60886849e58a03fb28bb6c5ba0600c4698
 SHA1 (patch-xa) = 25f02b03f1c5534e1d839a5489d5a046071f32c0

 @@ -1,51 +1,49 @@
-$NetBSD: patch-am,v 1.21 2014/03/27 05:15:00 obache Exp $
+$NetBSD: patch-am,v 1.22 2014/03/27 05:36:10 obache Exp $
 Disabled modules for normal build:
 bsddb
 curses
 curses_panel
 elementtree
 sqlite3
 tkinter
 gdbm
 pyexpat
 readline
 {linux,oss,sun}audiodev
 spwd
 Those have separate packages where needed.
 Only check the BUILDLINK_DIR for libraries etc, do not pick up random
 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.
 Add in Debian multiarch support (retrofitted from Python 2.7.2) to
 support building the "nis" and "crypt" modules.
---- setup.py.orig	2013-10-29 15:04:39.000000000 +0000
+--- setup.py	2010-07-18 00:31:09.000000000 +1200
-+++ setup.py
++++ setup.py	2011-09-23 01:51:17.757519638 +1200
-@@ -18,7 +18,7 @@ from distutils.command.install_lib impor
+@@ -18,7 +18,7 @@
  from distutils.spawn import find_executable
  # 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"]
  def add_dir_to_list(dirlist, dir):
      """Add the directory 'dir' to the list 'dirlist' (at the front) if
-@@ -354,10 +354,40 @@ class PyBuildExt(build_ext):
+@@ -354,10 +354,40 @@
                  return platform
          return sys.platform
 +    def add_multiarch_paths(self):
 +        # Debian/Ubuntu multiarch support.
 +        # https://wiki.ubuntu.com/MultiarchSpec
 +        if not find_executable('dpkg-architecture'):
 +            return
 +        tmpfile = os.path.join(self.build_temp, 'multiarch')
 +        if not os.path.exists(self.build_temp):
 +            os.makedirs(self.build_temp)
 +        ret = os.system(
 +            'dpkg-architecture -qDEB_HOST_MULTIARCH > %s 2> /dev/null' %
 @@ -69,60 +67,38 @@ support building the "nis" and "crypt" m
 +        if os.environ.has_key('BUILDLINK_DIR'):
 +            dir = os.environ['BUILDLINK_DIR']
 +            libdir = dir + '/lib'
 +            incdir = dir + '/include'
 +            if libdir not in self.compiler.library_dirs:
 +                self.compiler.library_dirs.insert(0, libdir)
 +            if incdir not in self.compiler.include_dirs:
 +                self.compiler.include_dirs.insert(0, incdir)
++
 +        self.add_multiarch_paths()
          # Add paths specified in the environment variables LDFLAGS and
          # CPPFLAGS for header and library files.
-@@ -691,10 +721,9 @@ class PyBuildExt(build_ext):
+@@ -703,9 +733,7 @@
                                 depends = ['socketmodule.h']) )
          # Detect SSL support for the socket module (via _ssl)
          search_for_ssl_incs_in = [
 -                              '/usr/local/ssl/include',
 -                              '/usr/contrib/ssl/include/'
 +                              '@SSLBASE@/include'
 -        ssl_incs = find_file('openssl/ssl.h', inc_dirs,
 +        ssl_incs = find_file('openssl/ssl.h', [],
                               search_for_ssl_incs_in
          if ssl_incs is not None:
@@ -703,9 +732,7 @@ class PyBuildExt(build_ext):
              if krb5_h:
                  ssl_incs += krb5_h
          ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
 -                                     ['/usr/local/ssl/lib',
 -                                      '/usr/contrib/ssl/lib/'
 -                                     ] )
 +                                     [] )
          if (ssl_incs is not None and
              ssl_libs is not None):
-@@ -724,7 +751,7 @@ class PyBuildExt(build_ext):
+@@ -815,172 +843,6 @@
          # look for the openssl version header on the compiler search path.
          opensslv_h = find_file('openssl/opensslv.h', [],
 -                inc_dirs + search_for_ssl_incs_in)
 +                search_for_ssl_incs_in)
          if opensslv_h:
              name = os.path.join(opensslv_h[0], 'openssl/opensslv.h')
              if sys.platform == 'darwin' and is_macosx_sdk_path(name):
@@ -815,172 +842,6 @@ class PyBuildExt(build_ext):
              else:
                  raise ValueError("unknown major BerkeleyDB version", major)
 -        # construct a list of paths to look for the header file in on
 -        # top of the normal inc_dirs.
 -        db_inc_paths = [
 -            '/usr/include/db4',
 -            '/usr/local/include/db4',
 -            '/opt/sfw/include/db4',
 -            '/usr/include/db3',
 -            '/usr/local/include/db3',
 -            '/opt/sfw/include/db3',
 -            # Fink defaults (http://fink.sourceforge.net/)
 @@ -275,27 +251,27 @@ support building the "nis" and "crypt" m
 -                                  runtime_library_dirs=dblib_dir,
 -                                  include_dirs=db_incs,
 -                                  libraries=dblibs))
 -        else:
 -            if db_setup_debug: print "db: no appropriate library found"
 -            db_incs = None
 -            dblibs = []
 -            dblib_dir = None
 -            missing.append('_bsddb')
+-
          # The sqlite interface
          sqlite_setup_debug = False   # verbose debug prints from this script?
-@@ -1094,35 +955,40 @@ class PyBuildExt(build_ext):
+@@ -1094,35 +956,40 @@
          # 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 sys.platform == 'darwin':
 -            if is_macosx_sdk_path(f):
 -                sysroot = macosx_sdk_root()
 -                f = os.path.join(sysroot, f[1:])
+-
 -        if os.path.exists(f) and not db_incs:
 -            data = open(f).read()
 -            m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data)
 @@ -341,68 +317,68 @@ support building the "nis" and "crypt" m
 +                        line = input.readline()
 +                        if not line: break
 +                        if re.search('This file is part of GDBM', line):
 +                            ret = None
 +                            break
 +                    input.close()
 +                    break
 +                return ret
++
 +            if find_ndbm_h(inc_dirs) is not None:
                  # Some systems have -lndbm, others don't
                  if self.compiler.find_library_file(lib_dirs, 'ndbm'):
                      ndbm_libs = ['ndbm']
-@@ -1131,7 +997,7 @@ class PyBuildExt(build_ext):
+@@ -1131,7 +998,7 @@
                  exts.append( Extension('dbm', ['dbmmodule.c'],
                                         define_macros=[('HAVE_NDBM_H',None)],
                                         libraries = ndbm_libs ) )
 -            elif self.compiler.find_library_file(lib_dirs, 'gdbm'):
 +            elif 1==0 and self.compiler.find_library_file(lib_dirs, 'gdbm'):
                  gdbm_libs = ['gdbm']
                  if self.compiler.find_library_file(lib_dirs, 'gdbm_compat'):
                      gdbm_libs.append('gdbm_compat')
-@@ -1147,14 +1013,12 @@ class PyBuildExt(build_ext):
+@@ -1147,14 +1014,12 @@
                          libraries = gdbm_libs ) )
                  else:
                      missing.append('dbm')
 -            elif db_incs is not None:
++
 +            if not module_enabled(exts, 'dbm'):
                  exts.append( Extension('dbm', ['dbmmodule.c'],
 -                                       library_dirs=dblib_dir,
 -                                       runtime_library_dirs=dblib_dir,
 -                                       include_dirs=db_incs,
                                         define_macros=[('HAVE_BERKDB_H',None),
                                                        ('DB_DBM_HSEARCH',None)],
 -                                       libraries=dblibs))
 +                                       libraries=["db"]))
              else:
                  missing.append('dbm')
-@@ -1408,6 +1272,14 @@ class PyBuildExt(build_ext):
+@@ -1408,6 +1273,14 @@
+                 )
              libraries = []
 +	elif platform.startswith('dragonfly'):
 +	    macros = dict(
 +		HAVE_SEM_OPEN=0,
 +		HAVE_SEM_TIMEDWAIT=0,
 +		HAVE_FD_TRANSFER=1,
 +		)
 +	    libraries = []
++
          else:                                   # Linux and other unices
              macros = dict(
                  HAVE_SEM_OPEN=1,
-@@ -2026,9 +1898,9 @@ def main():
+@@ -2026,9 +1899,9 @@
            ext_modules=[Extension('_struct', ['_struct.c'])],
            # Scripts to install
 -          scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle',
 -                     'Tools/scripts/2to3',
 -                     'Lib/smtpd.py']
 +          scripts = ['Tools/scripts/pydoc2.6',
 +                     'Tools/scripts/2to3-2.6',
 +                     'Tools/scripts/smtpd2.6.py']
+         )
  # --install-platlib