- Fix build on FreeBSD 10

Approved by:	miwi (implicit)

7 files changed, 15 insertions, 8 deletions

diff --git a/lang/python26/Makefile b/lang/python26/Makefile
index 38be184fff72..915a94478d75 100644
--- a/lang/python26/Makefile
+++ b/lang/python26/Makefile
@@ -23,6 +23,7 @@ CONFIGURE_SCRIPT=	../configure # must be relative
 CONFIGURE_ENV=	OPT="${CFLAGS}" SVNVERSION="echo freebsd"
 MAKE_ENV=	VPATH="${PYTHON_WRKSRC}"
 USE_LDCONFIG=	yes
+WITH_FBSD10_FIX=	yes
 MAKE_JOBS_SAFE=	yes
 INSTALL_TARGET=	altinstall
 MAN1=		${PYTHON_VERSION}.1
@@ -39,7 +40,8 @@ PLIST_SUB=	PYVER=${PYTHON_VERSION:S/python//} \
 EXAMPLESDIR=	${PREFIX}/share/examples/${PYTHON_VERSION}
 DATADIR=	${PREFIX}/share/${PYTHON_VERSION}
 
-PLATFORMS=	plat-freebsd6 plat-freebsd7 plat-freebsd8 plat-freebsd9
+PLATFORMS=	plat-freebsd6 plat-freebsd7 plat-freebsd8 plat-freebsd9 \
+		plat-freebsd10
 
 BIN_SCRIPTS=	2to3 idle pydoc smtpd.py
 BIN_FILES=	python python-shared python-config python-shared-config \
@@ -144,6 +146,8 @@ CONFIGURE_ARGS+=	--with-fpectl
 pre-patch:
 	${CP} -r ${PATCH_WRKSRC}/Lib/plat-freebsd8 \
 		${PATCH_WRKSRC}/Lib/plat-freebsd9
+	${CP} -r ${PATCH_WRKSRC}/Lib/plat-freebsd8 \
+		${PATCH_WRKSRC}/Lib/plat-freebsd10
 	${MKDIR} ${WRKSRC} ${SHARED_WRKSRC}/Modules
 	${LN} ${PATCH_WRKSRC}/Lib/smtpd.py ${PATCH_WRKSRC}/Tools/scripts/
 .for script in ${BIN_SCRIPTS}
diff --git a/lang/python26/files/extra-patch-setup.py b/lang/python26/files/extra-patch-setup.py
index 77dc467db500..1122acac8054 100644
--- a/lang/python26/files/extra-patch-setup.py
+++ b/lang/python26/files/extra-patch-setup.py
@@ -4,7 +4,7 @@
                  )
              libraries = []
  
--        elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9'):
+-        elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9', 'freebsd10'):
 +        elif platform in ('freebsd4', 'freebsd5', 'freebsd6'):
              # FreeBSD's P1003.1b semaphore support is very experimental
              # and has many known problems. (as of June 2008)
@@ -16,7 +16,7 @@
 +                )
 +            libraries = []
 +
-+        elif platform in ('freebsd7', 'freebsd8', 'freebsd9'):
++        elif platform in ('freebsd7', 'freebsd8', 'freebsd9', 'freebsd10'):
 +            macros = dict(                  # FreeBSD 7+
 +                HAVE_SEM_OPEN=1,
 +                HAVE_SEM_TIMEDWAIT=1,
diff --git a/lang/python26/files/patch-Lib-test-test_fcntl.py b/lang/python26/files/patch-Lib-test-test_fcntl.py
index ebd2ec81265f..f8773e0aaf1c 100644
--- a/lang/python26/files/patch-Lib-test-test_fcntl.py
+++ b/lang/python26/files/patch-Lib-test-test_fcntl.py
@@ -5,7 +5,7 @@
                          'Darwin1.2', 'darwin',
                          'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5',
 -                        'freebsd6', 'freebsd7', 'freebsd8',
-+                        'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9',
++                        'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9', 'freebsd10'
                          'bsdos2', 'bsdos3', 'bsdos4',
                          'openbsd', 'openbsd2', 'openbsd3', 'openbsd4'):
          if struct.calcsize('l') == 8:
diff --git a/lang/python26/files/patch-Lib-test-test_socket.py b/lang/python26/files/patch-Lib-test-test_socket.py
index 8c1ada8b2da6..7ccd3fe31bea 100644
--- a/lang/python26/files/patch-Lib-test-test_socket.py
+++ b/lang/python26/files/patch-Lib-test-test_socket.py
@@ -5,7 +5,7 @@
          # protocol, at least for modern Linuxes.
          if sys.platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
 -                            'freebsd7', 'freebsd8', 'darwin'):
-+                            'freebsd7', 'freebsd8', 'freebsd9', 'darwin'):
++                            'freebsd7', 'freebsd8', 'freebsd9', 'freebsd10', 'darwin'):
              # avoid the 'echo' service on this platform, as there is an
              # assumption breaking non-standard port/protocol entry
              services = ('daytime', 'qotd', 'domain')
diff --git a/lang/python26/files/patch-Lib_test_test_threading.py b/lang/python26/files/patch-Lib_test_test_threading.py
index c7dec6dd9b87..82d1658b3e26 100644
--- a/lang/python26/files/patch-Lib_test_test_threading.py
+++ b/lang/python26/files/patch-Lib_test_test_threading.py
@@ -5,7 +5,7 @@
          # Skip platforms with known problems forking from a worker thread.
          # See http://bugs.python.org/issue3863.
 -        if sys.platform in ('freebsd4', 'freebsd5', 'freebsd6', 'os2emx'):
-+        if sys.platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9', 'os2emx'):
++        if sys.platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9', 'freebsd10', 'os2emx'):
              print >>sys.stderr, ('Skipping test_3_join_in_forked_from_thread'
                                   ' due to known OS bugs on'), sys.platform
              return
diff --git a/lang/python26/files/patch-setup.py b/lang/python26/files/patch-setup.py
index 829817af3af7..271cda1f30be 100644
--- a/lang/python26/files/patch-setup.py
+++ b/lang/python26/files/patch-setup.py
@@ -73,7 +73,7 @@
              libraries = []
  
 -        elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8'):
-+        elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9'):
++        elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9', 'freebsd10'):
              # FreeBSD's P1003.1b semaphore support is very experimental
              # and has many known problems. (as of June 2008)
              macros = dict(                  # FreeBSD
@@ -82,7 +82,7 @@
  
          if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
 -                        'freebsd7', 'freebsd8'):
-+                        'freebsd7', 'freebsd8', 'freebsd9'):
++                        'freebsd7', 'freebsd8', 'freebsd9', 'freebsd10'):
              exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
          else:
              missing.append('ossaudiodev')
diff --git a/lang/python26/pkg-plist b/lang/python26/pkg-plist
index 7f3720bf6a10..1010fb68d6c1 100644
--- a/lang/python26/pkg-plist
+++ b/lang/python26/pkg-plist
@@ -919,6 +919,8 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/plat-freebsd8/regen
 %%PYTHON_LIBDIR%%/plat-freebsd9/IN.py
 %%PYTHON_LIBDIR%%/plat-freebsd9/regen
+%%PYTHON_LIBDIR%%/plat-freebsd10/IN.py
+%%PYTHON_LIBDIR%%/plat-freebsd10/regen
 %%PYTHON_LIBDIR%%/platform.py
 %%PYTHON_LIBDIR%%/plistlib.py
 %%PYTHON_LIBDIR%%/popen2.py
@@ -2220,6 +2222,7 @@ lib/libpython2.6.a
 @dirrm %%PYTHON_LIBDIR%%/sqlite3/test
 @dirrm %%PYTHON_LIBDIR%%/sqlite3
 @dirrm %%PYTHON_LIBDIR%%/site-packages
+@dirrm %%PYTHON_LIBDIR%%/plat-freebsd10
 @dirrm %%PYTHON_LIBDIR%%/plat-freebsd9
 @dirrm %%PYTHON_LIBDIR%%/plat-freebsd8
 @dirrm %%PYTHON_LIBDIR%%/plat-freebsd7