- Fix build on FreeBSD 10

Approved by:	miwi (implicit)

5 files changed, 18 insertions, 7 deletions

diff --git a/lang/python32/Makefile b/lang/python32/Makefile
index 8d2ebe779c75..a845d3a6861c 100644
--- a/lang/python32/Makefile
+++ b/lang/python32/Makefile
@@ -24,6 +24,7 @@ CONFIGURE_ENV=	OPT="${CFLAGS}" SVNVERSION="echo freebsd"
 MAKE_ENV=	VPATH="${PYTHON_WRKSRC}"
 MAKE_JOBS_SAFE=	yes
 USE_LDCONFIG=	yes
+WITH_FBSD10_FIX=	yes
 INSTALL_TARGET=	altinstall
 MAN1=		${PYTHON_VERSION}.1
 
@@ -41,7 +42,8 @@ EXAMPLESDIR=	${PREFIX}/share/examples/${PYTHON_VERSION}
 DATADIR=	${PREFIX}/share/${PYTHON_VERSION}
 
 PLATFORMS=	plat-freebsd4 plat-freebsd5 plat-freebsd6 \
-		plat-freebsd7 plat-freebsd8 plat-freebsd9
+		plat-freebsd7 plat-freebsd8 plat-freebsd9 \
+		plat-freebsd10
 
 BIN_SCRIPTS=	2to3 idle3 pydoc3
 BIN_FILES=	python python-shared python-config python-shared-config \
@@ -113,6 +115,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
 .for script in ${BIN_SCRIPTS}
 	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
diff --git a/lang/python32/files/patch-Lib-test-test_fcntl.py b/lang/python32/files/patch-Lib-test-test_fcntl.py
index 62104a2da20e..bc3987953d67 100644
--- a/lang/python32/files/patch-Lib-test-test_fcntl.py
+++ b/lang/python32/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/python32/files/patch-Lib-test_regrtest.py b/lang/python32/files/patch-Lib-test_regrtest.py
index d10cb99056e6..f3337036cefc 100644
--- a/lang/python32/files/patch-Lib-test_regrtest.py
+++ b/lang/python32/files/patch-Lib-test_regrtest.py
@@ -1,10 +1,11 @@
---- Lib/test/regrtest.py.orgi	2009-11-26 13:29:08.000000000 +0100
-+++ Lib/test/regrtest.py	2009-11-26 13:29:37.000000000 +0100
-@@ -1146,6 +1146,7 @@
+--- Lib/test/regrtest.py.orig	2011-09-03 18:16:43.000000000 +0200
++++ Lib/test/regrtest.py	2011-10-28 11:26:04.000000000 +0200
+@@ -1522,6 +1522,8 @@
  _expectations['freebsd6'] = _expectations['freebsd4']
  _expectations['freebsd7'] = _expectations['freebsd4']
  _expectations['freebsd8'] = _expectations['freebsd4']
 +_expectations['freebsd9'] = _expectations['freebsd4']
++_expectations['freebsd10'] = _expectations['freebsd4']
  
  class _ExpectedSkips:
      def __init__(self):
diff --git a/lang/python32/files/patch-setup.py b/lang/python32/files/patch-setup.py
index 78ebd9ab74b7..e79da3d11fb6 100644
--- a/lang/python32/files/patch-setup.py
+++ b/lang/python32/files/patch-setup.py
@@ -55,7 +55,7 @@
              libraries = []
  
 -        elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8'):
-+        elif platform in ('freebsd7', 'freebsd8', 'freebsd9'):
++        elif platform in ('freebsd7', 'freebsd8', 'freebsd9', 'freebsd10'):
              # FreeBSD's P1003.1b semaphore support is very experimental
              # and has many known problems. (as of June 2008)
              macros = dict()
@@ -65,7 +65,7 @@
          # Platform-specific libraries
 -        if (platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
 -                        'freebsd7', 'freebsd8')
-+        if (platform in ('freebsd7', 'freebsd8', 'freebsd9')
++        if (platform in ('freebsd7', 'freebsd8', 'freebsd9', 'freebsd10')
              or platform.startswith("gnukfreebsd")):
              exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
          else:
diff --git a/lang/python32/pkg-plist b/lang/python32/pkg-plist
index 7dc2737630c3..abc07b2d9f86 100644
--- a/lang/python32/pkg-plist
+++ b/lang/python32/pkg-plist
@@ -2285,6 +2285,10 @@ libdata/pkgconfig/python-3.2.pc
 %%PYTHON_LIBDIR%%/plat-freebsd9/__pycache__/IN.cpython-32.pyc
 %%PYTHON_LIBDIR%%/plat-freebsd9/__pycache__/IN.cpython-32.pyo
 %%PYTHON_LIBDIR%%/plat-freebsd9/regen
+%%PYTHON_LIBDIR%%/plat-freebsd10/IN.py
+%%PYTHON_LIBDIR%%/plat-freebsd10/__pycache__/IN.cpython-32.pyc
+%%PYTHON_LIBDIR%%/plat-freebsd10/__pycache__/IN.cpython-32.pyo
+%%PYTHON_LIBDIR%%/plat-freebsd10/regen
 %%PYTHON_LIBDIR%%/platform.py
 %%PYTHON_LIBDIR%%/plistlib.py
 %%PYTHON_LIBDIR%%/poplib.py
@@ -4320,6 +4324,8 @@ libdata/pkgconfig/python-3.2.pc
 @dirrm %%PYTHON_LIBDIR%%/plat-freebsd8
 @dirrm %%PYTHON_LIBDIR%%/plat-freebsd9/__pycache__
 @dirrm %%PYTHON_LIBDIR%%/plat-freebsd9
+@dirrm %%PYTHON_LIBDIR%%/plat-freebsd10/__pycache__
+@dirrm %%PYTHON_LIBDIR%%/plat-freebsd10
 @dirrm %%PYTHON_LIBDIR%%/pydoc_data/__pycache__
 @dirrm %%PYTHON_LIBDIR%%/pydoc_data
 @dirrm %%PYTHON_LIBDIR%%/site-packages