Restrict to find openssl header files in SSLBASE/include.

Fixes unwanted detection of builtin openssl over prefered pkgsrc one.

3 files changed, 36 insertions, 11 deletions

diff --git a/lang/python33/Makefile b/lang/python33/Makefile
index 2690381b459..6287a59190b 100644
--- a/lang/python33/Makefile
+++ b/lang/python33/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2014/03/27 08:50:00 obache Exp $
+# $NetBSD: Makefile,v 1.23 2014/05/09 02:29:09 obache Exp $
 
 .include "dist.mk"
 
@@ -121,6 +121,12 @@ 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 OpenSSL base directory to find header file.
+SUBST_STAGE.sslbase=	pre-configure
+SUBST_FILES.sslbase=	setup.py
+SUBST_VARS.sslbase=	SSLBASE
+
 CHECK_INTERPRETER_SKIP=	lib/python${PY_VER_SUFFIX}/venv/scripts/posix/pydoc
 
 .if ${OPSYS} == "HPUX"
diff --git a/lang/python33/distinfo b/lang/python33/distinfo
index 042cbc264cf..29ffc316457 100644
--- a/lang/python33/distinfo
+++ b/lang/python33/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2014/03/27 08:50:00 obache Exp $
+$NetBSD: distinfo,v 1.12 2014/05/09 02:29:09 obache Exp $
 
 SHA1 (Python-3.3.5.tar.xz) = 6683b26dd2cfd23af852abfcf1aedf25bbd44839
 RMD160 (Python-3.3.5.tar.xz) = 77398ecd76824983ad92c859f633e26675bacb4b
@@ -8,7 +8,7 @@ SHA1 (patch-aa) = 99ebcbbfc53b855a32b424dec27012e1e969c3d0
 SHA1 (patch-ab) = 1c0a25bf7ec6ee76e84c799619ec7cd8910f16e1
 SHA1 (patch-ah) = bb43aaab260935a5a0d5e7ce1ccc30f4832cab1d
 SHA1 (patch-al) = e5438d1bbc20cc85521b3570710846cf4a070ae1
-SHA1 (patch-am) = bbda8b07af6faf63138c4cabb3c7e93766efd12c
+SHA1 (patch-am) = 47023dd03a6419c9c2792fcd2ffdf734c2500647
 SHA1 (patch-an) = 933acde107b735931d26ace4eef251000b9f07ba
 SHA1 (patch-ao) = dc524b08634c23c25227bd03e221dab0ff2a03f3
 SHA1 (patch-au) = c892f1004eb32e9608f93c08ec6f94e16bdca182
diff --git a/lang/python33/patches/patch-am b/lang/python33/patches/patch-am
index 70f33141d7f..25264ca648e 100644
--- a/lang/python33/patches/patch-am
+++ b/lang/python33/patches/patch-am
@@ -1,6 +1,6 @@
-$NetBSD: patch-am,v 1.5 2014/03/27 08:50:01 obache Exp $
+$NetBSD: patch-am,v 1.6 2014/05/09 02:29:10 obache Exp $
 
---- setup.py.orig	2013-05-15 16:33:00.000000000 +0000
+--- setup.py.orig	2014-03-09 08:40:35.000000000 +0000
 +++ setup.py
 @@ -31,7 +31,8 @@ host_platform = get_platform()
  COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
@@ -37,7 +37,17 @@ $NetBSD: patch-am,v 1.5 2014/03/27 08:50:01 obache Exp $
          self.add_multiarch_paths()
  
          # Add paths specified in the environment variables LDFLAGS and
-@@ -753,9 +754,7 @@ class PyBuildExt(build_ext):
+@@ -741,8 +742,7 @@ 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,
+                              search_for_ssl_incs_in
+@@ -753,9 +753,7 @@ class PyBuildExt(build_ext):
              if krb5_h:
                  ssl_incs += krb5_h
          ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
@@ -48,7 +58,16 @@ $NetBSD: patch-am,v 1.5 2014/03/27 08:50:01 obache Exp $
  
          if (ssl_incs is not None and
              ssl_libs is not None):
-@@ -1138,6 +1137,30 @@ class PyBuildExt(build_ext):
+@@ -774,7 +772,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):
+@@ -1138,6 +1136,30 @@ class PyBuildExt(build_ext):
          dbm_order = ['gdbm']
          # The standard Unix dbm module:
          if host_platform not in ['cygwin']:
@@ -79,7 +98,7 @@ $NetBSD: patch-am,v 1.5 2014/03/27 08:50:01 obache Exp $
              config_args = [arg.strip("'")
                             for arg in sysconfig.get_config_var("CONFIG_ARGS").split()]
              dbm_args = [arg for arg in config_args
-@@ -1149,7 +1172,7 @@ class PyBuildExt(build_ext):
+@@ -1149,7 +1171,7 @@ class PyBuildExt(build_ext):
              dbmext = None
              for cand in dbm_order:
                  if cand == "ndbm":
@@ -88,7 +107,7 @@ $NetBSD: patch-am,v 1.5 2014/03/27 08:50:01 obache Exp $
                          # Some systems have -lndbm, others have -lgdbm_compat,
                          # others don't have either
                          if self.compiler.find_library_file(lib_dirs,
-@@ -1475,6 +1498,14 @@ class PyBuildExt(build_ext):
+@@ -1477,6 +1499,14 @@ class PyBuildExt(build_ext):
              macros = dict()
              libraries = []
  
@@ -103,7 +122,7 @@ $NetBSD: patch-am,v 1.5 2014/03/27 08:50:01 obache Exp $
          else:                                   # Linux and other unices
              macros = dict()
              libraries = ['rt']
-@@ -1906,10 +1937,7 @@ class PyBuildExt(build_ext):
+@@ -1950,10 +1980,7 @@ class PyBuildExt(build_ext):
              depends = ['_decimal/docstrings.h']
          else:
              srcdir = sysconfig.get_config_var('srcdir')
@@ -115,7 +134,7 @@ $NetBSD: patch-am,v 1.5 2014/03/27 08:50:01 obache Exp $
              libraries = []
              sources = [
                '_decimal/_decimal.c',
-@@ -2155,7 +2183,7 @@ def main():
+@@ -2199,7 +2226,7 @@ def main():
            # If you change the scripts installed here, you also need to
            # check the PyBuildScripts command above, and change the links
            # created by the bininstall target in Makefile.pre.in