revert last commit, should not be committed during freeze.

3 files changed, 10 insertions, 40 deletions

diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index cb42568c91c..c7819c6e3a1 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2014/03/27 05:22:33 obache Exp $
+# $NetBSD: Makefile,v 1.39 2014/03/27 05:36:37 obache Exp $
 
 .include "dist.mk"
 
@@ -162,12 +162,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/python27/distinfo b/lang/python27/distinfo
index bf68ac7823b..4426ae150ed 100644
--- a/lang/python27/distinfo
+++ b/lang/python27/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.33 2014/03/27 05:22:33 obache Exp $
+$NetBSD: distinfo,v 1.34 2014/03/27 05:36:37 obache Exp $
 
 SHA1 (Python-2.7.6.tar.xz) = 8321636af2acbeaa68fc635d7dda7369ed446a80
 RMD160 (Python-2.7.6.tar.xz) = 8efc73a01a466d8fa16c5c1734c89be79c2c538a
@@ -16,7 +16,7 @@ SHA1 (patch-ad) = de730b9f5a5efb56afa8bed05824b5f6579242ec
 SHA1 (patch-ae) = ff6d8c6164fe3c6dc4fb33d88eb8a49d5c5442f6
 SHA1 (patch-ah) = ae3ce0656d890ca34292920bf0185f94ba847139
 SHA1 (patch-al) = dd8bed847f797b97df1a9ad7ffe17645b0f08925
-SHA1 (patch-am) = 801c8fbe14be2138ef45f2d80646d8be6d4ea25a
+SHA1 (patch-am) = e5d78bfd5b9e6339985ed4cb587897042b6b8590
 SHA1 (patch-an) = 6098fbf0fc31422196cc40d3a227934523db11ca
 SHA1 (patch-ao) = 3a1cd2b255340fd23fc1fce8680e692581ffcec1
 SHA1 (patch-au) = 2a2a988ac92553d17eb898870d1adb3c30a59b66
diff --git a/lang/python27/patches/patch-am b/lang/python27/patches/patch-am
index ad646ef5b9e..08209625675 100644
--- a/lang/python27/patches/patch-am
+++ b/lang/python27/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.13 2014/03/27 05:22:33 obache Exp $
+$NetBSD: patch-am,v 1.14 2014/03/27 05:36:37 obache Exp $
 
 Disabled modules for normal build:
 bsddb
@@ -17,8 +17,6 @@ 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.
 
 cygwin 2.7.3-no-libm.patch
@@ -63,20 +61,7 @@ cygwin 2.7.3-no-libm.patch
              math_libs = []
  
          # XXX Omitted modules: gl, pure, dl, SGI-specific modules
-@@ -785,10 +790,9 @@ class PyBuildExt(build_ext):
-                                libraries=math_libs) )
-         # 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:
-@@ -797,9 +801,7 @@ class PyBuildExt(build_ext):
+@@ -797,9 +802,7 @@ class PyBuildExt(build_ext):
              if krb5_h:
                  ssl_incs += krb5_h
          ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
@@ -87,16 +72,7 @@ cygwin 2.7.3-no-libm.patch
  
          if (ssl_incs is not None and
              ssl_libs is not None):
-@@ -818,7 +820,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 host_platform == 'darwin' and is_macosx_sdk_path(name):
-@@ -918,175 +920,6 @@ class PyBuildExt(build_ext):
+@@ -918,175 +921,6 @@ class PyBuildExt(build_ext):
              else:
                  raise ValueError("unknown major BerkeleyDB version", major)
  
@@ -272,7 +248,7 @@ cygwin 2.7.3-no-libm.patch
          # The sqlite interface
          sqlite_setup_debug = False   # verbose debug prints from this script?
  
-@@ -1204,35 +1037,39 @@ class PyBuildExt(build_ext):
+@@ -1204,35 +1038,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.
@@ -336,7 +312,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
-@@ -1244,7 +1081,7 @@ class PyBuildExt(build_ext):
+@@ -1244,7 +1082,7 @@ class PyBuildExt(build_ext):
              dbmext = None
              for cand in dbm_order:
                  if cand == "ndbm":
@@ -345,7 +321,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,
-@@ -1288,18 +1125,14 @@ class PyBuildExt(build_ext):
+@@ -1288,18 +1126,14 @@ class PyBuildExt(build_ext):
                                  libraries = gdbm_libs)
                              break
                  elif cand == "bdb":
@@ -372,7 +348,7 @@ cygwin 2.7.3-no-libm.patch
              if dbmext is not None:
                  exts.append(dbmext)
              else:
-@@ -2222,9 +2055,9 @@ def main():
+@@ -2222,9 +2056,9 @@ def main():
            ext_modules=[Extension('_struct', ['_struct.c'])],
  
            # Scripts to install