Import of pkgsrc-2015Q1

lang/python33/patches/patch-Include_pyport.h

@@ -0,0 +1,18 @@
+$NetBSD: patch-Include_pyport.h,v 1.1 2014/06/11 06:03:10 richard Exp $
+SunOS defines gethostname in <unistd.h>
+http://bugs.python.org/issue19561
+
+--- Include/pyport.h.orig	2013-05-15 16:32:54.000000000 +0000
++++ Include/pyport.h
+@@ -649,11 +649,6 @@ Please be conservative with adding new o
+ in platform-specific #ifdefs.
+ **************************************************************************/
+ 
+-#ifdef SOLARIS
+-/* Unchecked */
+-extern int gethostname(char *, int);
+-#endif
+-
+ #ifdef HAVE__GETPTY
+ #include <sys/types.h>          /* we need to import mode_t */
+ extern char * _getpty(int *, int, mode_t, int);

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.9 2014/05/31 12:46:28 ryoon 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 + inc_dirs)
+         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,22 +107,18 @@ $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,10 @@ class PyBuildExt(build_ext):
              macros = dict()
              libraries = []
  
 +        elif host_platform.startswith('dragonfly'):
-+            macros = dict(
-+                HAVE_SEM_OPEN=0,
-+                HAVE_SEM_TIMEDWAIT=0,
-+                HAVE_FD_TRANSFER=1,
-+                )
++            macros = dict()
 +            libraries = []
 +
          else:                                   # Linux and other unices
              macros = dict()
              libraries = ['rt']
-@@ -1906,10 +1937,7 @@ class PyBuildExt(build_ext):
+@@ -1950,10 +1976,7 @@ class PyBuildExt(build_ext):
              depends = ['_decimal/docstrings.h']
          else:
              srcdir = sysconfig.get_config_var('srcdir')
@@ -115,7 +130,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 +2222,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

lang/python33/patches/patch-an

@@ -1,4 +1,6 @@
-$NetBSD: patch-an,v 1.1 2012/12/10 03:15:49 tsarna Exp $
+$NetBSD: patch-an,v 1.2 2015/01/01 21:39:45 he Exp $
+
+Recognize and pass on -pthread arg.
 
 --- Modules/makesetup.orig	2008-06-11 05:26:20.000000000 +0000
 +++ Modules/makesetup

lang/python33/patches/patch-ao

@@ -1,13 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2012/12/10 03:15:49 tsarna Exp $
-
---- Lib/distutils/util.py.orig	2012-09-29 04:00:28.000000000 -0400
-+++ Lib/distutils/util.py	2012-12-09 18:34:56.000000000 -0500
-@@ -102,6 +102,8 @@
-         osname, release, machine = _osx_support.get_platform_osx(
-                                         distutils.sysconfig.get_config_vars(),
-                                         osname, release, machine)
-+    elif osname[:9] == "dragonfly":
-+        release = str.split(release, "-")[0]
- 
-     return "%s-%s-%s" % (osname, release, machine)
- 

lang/python33/patches/patch-au

@@ -1,6 +1,6 @@
-$NetBSD: patch-au,v 1.2 2013/05/26 17:56:09 wiz Exp $
+$NetBSD: patch-au,v 1.3 2015/03/16 13:53:05 tnn Exp $
 
---- Makefile.pre.in.orig	2013-05-15 16:32:57.000000000 +0000
+--- Makefile.pre.in.orig	2014-10-12 07:03:53.000000000 +0000
 +++ Makefile.pre.in
 @@ -81,7 +81,7 @@ PY_CFLAGS=	$(BASECFLAGS) $(OPT) $(CONFIG
  # be able to build extension modules using the directories specified in the
@@ -11,7 +11,16 @@ $NetBSD: patch-au,v 1.2 2013/05/26 17:56:09 wiz Exp $
  NO_AS_NEEDED=	@NO_AS_NEEDED@
  LDLAST=		@LDLAST@
  SGI_ABI=	@SGI_ABI@
-@@ -744,7 +744,7 @@ Objects/setobject.o: $(srcdir)/Objects/s
+@@ -610,7 +610,7 @@ Modules/_testembed: Modules/_testembed.o
+ Modules/_freeze_importlib: Modules/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN)
+ 	$(LINKCC) $(PY_LDFLAGS) -o $@ Modules/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
+ 
+-Python/importlib.h: $(srcdir)/Lib/importlib/_bootstrap.py Modules/_freeze_importlib.c
++Python/importlib.h: $(srcdir)/Lib/importlib/_bootstrap.py Modules/_freeze_importlib.c $(LIBRARY_OBJS_OMIT_FROZEN)
+ 	$(MAKE) Modules/_freeze_importlib
+ 	./Modules/_freeze_importlib \
+ 		$(srcdir)/Lib/importlib/_bootstrap.py Python/importlib.h
+@@ -749,7 +749,7 @@ Objects/setobject.o: $(srcdir)/Objects/s
  $(OPCODETARGETS_H): $(OPCODETARGETGEN_FILES)
  	$(OPCODETARGETGEN) $(OPCODETARGETS_H)
  
@@ -20,7 +29,7 @@ $NetBSD: patch-au,v 1.2 2013/05/26 17:56:09 wiz Exp $
  
  Python/formatter_unicode.o: $(srcdir)/Python/formatter_unicode.c \
  				$(BYTESTR_DEPS)
-@@ -957,7 +957,8 @@ altbininstall: $(BUILDPYTHON)
+@@ -963,7 +963,8 @@ altbininstall: $(BUILDPYTHON)
  		if test -n "$(PY3LIBRARY)"; then \
  			$(INSTALL_SHARED) $(PY3LIBRARY) $(DESTDIR)$(LIBDIR)/$(PY3LIBRARY); \
  		fi; \

lang/python33/patches/patch-aw

@@ -1,4 +1,6 @@
-$NetBSD: patch-aw,v 1.1 2012/12/10 03:15:49 tsarna Exp $
+$NetBSD: patch-aw,v 1.2 2015/01/01 21:39:45 he Exp $
+
+Support DragonFly.
 
 --- Modules/nismodule.c.orig	2010-08-19 09:03:03.000000000 +0000
 +++ Modules/nismodule.c

lang/python33/patches/patch-configure

@@ -1,8 +1,12 @@
-$NetBSD: patch-al,v 1.2 2013/05/26 17:56:09 wiz Exp $
+$NetBSD: patch-configure,v 1.2 2015/01/22 11:09:18 sevan Exp $
 
---- configure.orig	2013-05-15 16:33:00.000000000 +0000
+Add support for MirBSD and Interix.
+Don't make SO-ABI-dependent shared lib names on Linux.
+Don't trim the library name on FreeBSD.
+
+--- configure.orig	2014-10-12 07:03:54.000000000 +0000
 +++ configure
-@@ -3332,7 +3332,7 @@ case $ac_sys_system/$ac_sys_release in
+@@ -3340,7 +3340,7 @@ case $ac_sys_system/$ac_sys_release in
    # Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
    # In addition, Stefan Krah confirms that issue #1244610 exists through
    # OpenBSD 4.6, but is fixed in 4.7.
@@ -11,15 +15,15 @@ $NetBSD: patch-al,v 1.2 2013/05/26 17:56:09 wiz Exp $
      define_xopen_source=no
      # OpenBSD undoes our definition of __BSD_VISIBLE if _XOPEN_SOURCE is
      # also defined. This can be overridden by defining _BSD_SOURCE
-@@ -5594,15 +5594,10 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>
+@@ -5602,15 +5602,10 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>
  	      PY3LIBRARY=libpython3.so
  	  fi
            ;;
 -    Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*)
-+    Linux*|GNU*|NetBSD*|FreeBSD*|Interix*|DragonFly*|OpenBSD*|MirBSD*)
++    Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*|MirBSD*)
  	  LDLIBRARY='libpython$(LDVERSION).so'
  	  BLDLIBRARY='-L. -lpython$(LDVERSION)'
- 	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
+ 	  RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
 -	  case $ac_sys_system in
 -	      FreeBSD*)
 -		SOVERSION=`echo $SOVERSION|cut -d "." -f 1`
@@ -28,7 +32,7 @@ $NetBSD: patch-al,v 1.2 2013/05/26 17:56:09 wiz Exp $
  	  INSTSONAME="$LDLIBRARY".$SOVERSION
  	  if test "$with_pydebug" != yes
            then
-@@ -8465,8 +8460,8 @@ then
+@@ -8473,8 +8468,8 @@ then
  			LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
  		else
  			# No framework, use the Python app as bundle-loader
@@ -39,7 +43,7 @@ $NetBSD: patch-al,v 1.2 2013/05/26 17:56:09 wiz Exp $
  			LDCXXSHARED="$LDCXXSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
  		fi ;;
  	Darwin/*)
-@@ -8491,9 +8486,9 @@ then
+@@ -8499,9 +8494,9 @@ then
  				LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
  			else
  				# No framework, use the Python app as bundle-loader
@@ -52,7 +56,7 @@ $NetBSD: patch-al,v 1.2 2013/05/26 17:56:09 wiz Exp $
  			fi
  		fi
  		;;
-@@ -8527,9 +8522,15 @@ then
+@@ -8535,9 +8530,15 @@ then
  				   ;;
  				esac
  		fi;;
@@ -68,7 +72,7 @@ $NetBSD: patch-al,v 1.2 2013/05/26 17:56:09 wiz Exp $
  	OpenUNIX*|UnixWare*)
  		if test "$GCC" = "yes" ; then
  			LDSHARED='$(CC) -shared'
-@@ -8570,7 +8571,8 @@ then
+@@ -8578,7 +8579,8 @@ then
  		 fi;;
  	Linux*|GNU*) CCSHARED="-fPIC";;
  	BSD/OS*/4*) CCSHARED="-fpic";;
@@ -78,7 +82,7 @@ $NetBSD: patch-al,v 1.2 2013/05/26 17:56:09 wiz Exp $
  	OpenUNIX*|UnixWare*)
  		if test "$GCC" = "yes"
  		then CCSHARED="-fPIC"
-@@ -8613,11 +8615,12 @@ then
+@@ -8621,11 +8623,12 @@ then
  	OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";;
  	SCO_SV*) LINKFORSHARED="-Wl,-Bexport";;
  	ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";;
@@ -92,7 +96,7 @@ $NetBSD: patch-al,v 1.2 2013/05/26 17:56:09 wiz Exp $
  	SunOS/5*) case $CC in
  		  *gcc*)
  		    if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null
-@@ -13707,8 +13710,6 @@ $as_echo "$SOABI" >&6; }
+@@ -13766,8 +13769,6 @@ $as_echo "$SOABI" >&6; }
  
  
  case $ac_sys_system in