revert last change, should not be committed dureing freeze.

3 files changed, 15 insertions, 45 deletions

diff --git a/lang/python26/Makefile b/lang/python26/Makefile
index ecf04a29a57..d23e196766e 100644
--- a/lang/python26/Makefile
+++ b/lang/python26/Makefile
@@ -1,4 +1,4 @@
-# $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"
 
@@ -155,12 +155,6 @@ 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}
diff --git a/lang/python26/distinfo b/lang/python26/distinfo
index cb4f6e0600c..d7d8af9e903 100644
--- a/lang/python26/distinfo
+++ b/lang/python26/distinfo
@@ -1,4 +1,4 @@
-$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
@@ -16,7 +16,7 @@ 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
diff --git a/lang/python26/patches/patch-am b/lang/python26/patches/patch-am
index ba8f7771e6a..150ade5e684 100644
--- a/lang/python26/patches/patch-am
+++ b/lang/python26/patches/patch-am
@@ -1,4 +1,4 @@
-$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
@@ -17,16 +17,14 @@ 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
-@@ -18,7 +18,7 @@ from distutils.command.install_lib impor
+--- setup.py	2010-07-18 00:31:09.000000000 +1200
++++ setup.py	2011-09-23 01:51:17.757519638 +1200
+@@ -18,7 +18,7 @@
  from distutils.spawn import find_executable
  
  # This global variable is used to hold the list of modules to be disabled.
@@ -35,7 +33,7 @@ support building the "nis" and "crypt" modules.
  
  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
  
@@ -79,20 +77,7 @@ support building the "nis" and "crypt" modules.
  
          # Add paths specified in the environment variables LDFLAGS and
          # CPPFLAGS for header and library files.
-@@ -691,10 +721,9 @@ class PyBuildExt(build_ext):
-                                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):
+@@ -703,9 +733,7 @@
              if krb5_h:
                  ssl_incs += krb5_h
          ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
@@ -103,16 +88,7 @@ support building the "nis" and "crypt" modules.
  
          if (ssl_incs is not None and
              ssl_libs is not None):
-@@ -724,7 +751,7 @@ class PyBuildExt(build_ext):
- 
-         # 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):
+@@ -815,172 +843,6 @@
              else:
                  raise ValueError("unknown major BerkeleyDB version", major)
  
@@ -285,7 +261,7 @@ support building the "nis" and "crypt" modules.
          # 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.
@@ -351,7 +327,7 @@ support building the "nis" and "crypt" modules.
                  # 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 ) )
@@ -360,7 +336,7 @@ support building the "nis" and "crypt" modules.
                  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')
@@ -378,7 +354,7 @@ support building the "nis" and "crypt" modules.
              else:
                  missing.append('dbm')
  
-@@ -1408,6 +1272,14 @@ class PyBuildExt(build_ext):
+@@ -1408,6 +1273,14 @@
                  )
              libraries = []
  
@@ -393,7 +369,7 @@ support building the "nis" and "crypt" modules.
          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