- Add support for FreeBSD 9

6 files changed, 16 insertions, 6 deletions

diff --git a/lang/python24/Makefile b/lang/python24/Makefile
index 1da9303fb550..5e106c45a188 100644
--- a/lang/python24/Makefile
+++ b/lang/python24/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	python24
 PORTVERSION=	2.4.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -31,7 +31,7 @@ PYTHON_VERSION=	python2.4
 PYTHON_NO_DEPENDS=	yes
 
 PLATFORMS=	plat-freebsd4 plat-freebsd5 plat-freebsd6 plat-freebsd7 \
-		plat-freebsd8
+		plat-freebsd8 plat-freebsd9
 SHARED_WRKSRC=	${WRKSRC}/build.shared
 PLIST=		${WRKDIR}/pkg-plist
 PLIST_SUB=	PYVER=${PYTHON_VERSION:S/python//}
@@ -161,6 +161,8 @@ post-build:
 	${LN} -f python ${PYTHON_VERSION:S/thon/thon-shared/}
 
 pre-su-install:
+	${CP} -r ${PATCH_WRKSRC}/Lib/plat-freebsd8 \
+		${PATCH_WRKSRC}/Lib/plat-freebsd9
 .for platform in ${PLATFORMS}
 	${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform}
 .for file in IN.py regen
diff --git a/lang/python24/files/patch-freebsd7 b/lang/python24/files/patch-freebsd7
index 0de6c979a00e..a3e7569529f7 100644
--- a/lang/python24/files/patch-freebsd7
+++ b/lang/python24/files/patch-freebsd7
@@ -11,7 +11,7 @@ diff -u -r1.218 setup.py
  
 -        if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6'):
 +        if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
-+                        'freebsd7', 'freebsd8'):
++                        'freebsd7', 'freebsd8', 'freebsd9'):
              exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
  
          if platform == 'sunos5':
diff --git a/lang/python24/pkg-plist b/lang/python24/pkg-plist
index 78ac1067a6e9..8b1222328f1e 100644
--- a/lang/python24/pkg-plist
+++ b/lang/python24/pkg-plist
@@ -671,6 +671,8 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/plat-freebsd7/regen
 %%PYTHON_LIBDIR%%/plat-freebsd8/IN.py
 %%PYTHON_LIBDIR%%/plat-freebsd8/regen
+%%PYTHON_LIBDIR%%/plat-freebsd9/IN.py
+%%PYTHON_LIBDIR%%/plat-freebsd9/regen
 %%PYTHON_LIBDIR%%/platform.py
 %%PYTHON_LIBDIR%%/popen2.py
 %%PYTHON_LIBDIR%%/poplib.py
@@ -1686,6 +1688,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 @dirrm %%PYTHON_LIBDIR%%/test/decimaltestdata
 @dirrm %%PYTHON_LIBDIR%%/test
 @dirrm %%PYTHON_LIBDIR%%/site-packages
+@dirrm %%PYTHON_LIBDIR%%/plat-freebsd9
 @dirrm %%PYTHON_LIBDIR%%/plat-freebsd8
 @dirrm %%PYTHON_LIBDIR%%/plat-freebsd7
 @dirrm %%PYTHON_LIBDIR%%/plat-freebsd6
diff --git a/lang/python25/Makefile b/lang/python25/Makefile
index 418c0e373239..2b742b5828d9 100644
--- a/lang/python25/Makefile
+++ b/lang/python25/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	python25
 PORTVERSION=	2.5.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -40,7 +40,7 @@ EXAMPLESDIR=	${PREFIX}/share/examples/${PYTHON_VERSION}
 DATADIR=	${PREFIX}/share/${PYTHON_VERSION}
 
 PLATFORMS=	plat-freebsd4 plat-freebsd5 plat-freebsd6 \
-		plat-freebsd7 plat-freebsd8
+		plat-freebsd7 plat-freebsd8 plat-freebsd9
 
 BIN_SCRIPTS=	idle pydoc python python-shared smtpd.py python-config \
 		python-shared-config
@@ -170,6 +170,8 @@ pre-build:
 	${LN} -f python ${PYTHON_VERSION:S/thon/thon-shared/}
 
 pre-su-install:
+	${CP} -r ${PATCH_WRKSRC}/Lib/plat-freebsd8 \
+		${PATCH_WRKSRC}/Lib/plat-freebsd9
 .for platform in ${PLATFORMS}
 	${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform}
 .for file in IN.py regen
diff --git a/lang/python25/files/patch-freebsd8 b/lang/python25/files/patch-freebsd8
index 51c5c39f7026..ad4f1eff7c67 100644
--- a/lang/python25/files/patch-freebsd8
+++ b/lang/python25/files/patch-freebsd8
@@ -932,7 +932,7 @@ Index: Lib/plat-freebsd8/IN.py
  
          if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
 -                        'freebsd7'):
-+                        'freebsd7', 'freebsd8'):
++                        'freebsd7', 'freebsd8', 'freebsd9'):
              exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
  
          if platform == 'sunos5':
diff --git a/lang/python25/pkg-plist b/lang/python25/pkg-plist
index 8058d47a9550..f6936e168edc 100644
--- a/lang/python25/pkg-plist
+++ b/lang/python25/pkg-plist
@@ -753,6 +753,8 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/plat-freebsd7/regen
 %%PYTHON_LIBDIR%%/plat-freebsd8/IN.py
 %%PYTHON_LIBDIR%%/plat-freebsd8/regen
+%%PYTHON_LIBDIR%%/plat-freebsd9/IN.py
+%%PYTHON_LIBDIR%%/plat-freebsd9/regen
 %%PYTHON_LIBDIR%%/platform.py
 %%PYTHON_LIBDIR%%/popen2.py
 %%PYTHON_LIBDIR%%/poplib.py
@@ -1986,6 +1988,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 @dirrm %%PYTHON_LIBDIR%%/sqlite3/test
 @dirrm %%PYTHON_LIBDIR%%/sqlite3
 @dirrm %%PYTHON_LIBDIR%%/site-packages
+@dirrm %%PYTHON_LIBDIR%%/plat-freebsd9
 @dirrm %%PYTHON_LIBDIR%%/plat-freebsd8
 @dirrm %%PYTHON_LIBDIR%%/plat-freebsd7
 @dirrm %%PYTHON_LIBDIR%%/plat-freebsd6