From 5879a953cb0ac86557ca9fc62713bfeb193ce369 Mon Sep 17 00:00:00 2001 From: Martin Wilke Date: Thu, 26 Nov 2009 12:44:47 +0000 Subject: [PATCH] - Add support for FreeBSD 9 --- lang/python31/Makefile | 5 ++++- lang/python31/files/patch-setup.py | 24 +++++++++++++++++++++--- lang/python31/pkg-plist | 3 +++ lang/python32/Makefile | 5 ++++- lang/python32/files/patch-setup.py | 24 +++++++++++++++++++++--- lang/python32/pkg-plist | 3 +++ 6 files changed, 56 insertions(+), 8 deletions(-) diff --git a/lang/python31/Makefile b/lang/python31/Makefile index 058c9c9e431a..44a2a2efc5b7 100644 --- a/lang/python31/Makefile +++ b/lang/python31/Makefile @@ -6,6 +6,7 @@ PORTNAME= python31 PORTVERSION= 3.1.1 +PORTREVISON= 1 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} @@ -39,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= 2to3 idle3 pydoc3 BIN_FILES= python python-shared python-config python-shared-config \ @@ -111,6 +112,8 @@ CONFIGURE_ARGS+= --with-fpectl .endif pre-patch: + ${CP} -r ${PATCH_WRKSRC}/Lib/plat-freebsd8 \ + ${PATCH_WRKSRC}/Lib/plat-freebsd9 ${MKDIR} ${WRKSRC} ${SHARED_WRKSRC}/Modules .for script in ${BIN_SCRIPTS} ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ diff --git a/lang/python31/files/patch-setup.py b/lang/python31/files/patch-setup.py index 740f3afec082..5f78c13849a4 100644 --- a/lang/python31/files/patch-setup.py +++ b/lang/python31/files/patch-setup.py @@ -1,5 +1,5 @@ ---- setup.py.orig 2009-06-28 20:59:53.170127518 +0800 -+++ setup.py 2009-06-29 01:19:05.592053355 +0800 +--- setup.py.orig 2009-08-12 20:39:44.000000000 +0200 ++++ setup.py 2009-11-26 12:58:45.000000000 +0100 @@ -16,7 +16,7 @@ from distutils.command.install_lib import install_lib @@ -61,7 +61,25 @@ libraries = [panel_library] + curses_libs) ) else: missing.append('_curses_panel') -@@ -1666,8 +1670,7 @@ +@@ -1161,7 +1165,7 @@ + macros = dict() + libraries = [] + +- elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8'): ++ elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9'): + # FreeBSD's P1003.1b semaphore support is very experimental + # and has many known problems. (as of June 2008) + macros = dict() +@@ -1204,7 +1208,7 @@ + + # Platform-specific libraries + if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6', +- 'freebsd7', 'freebsd8'): ++ 'freebsd7', 'freebsd8', 'freebsd9'): + exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) ) + else: + missing.append('ossaudiodev') +@@ -1665,8 +1669,7 @@ # called unless there's at least one extension module defined. ext_modules=[Extension('_struct', ['_struct.c'])], diff --git a/lang/python31/pkg-plist b/lang/python31/pkg-plist index 8a6fbf8097e3..4333cc8585b5 100644 --- a/lang/python31/pkg-plist +++ b/lang/python31/pkg-plist @@ -890,6 +890,8 @@ libdata/pkgconfig/python-3.1.pc %%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%%/plistlib.py %%PYTHON_LIBDIR%%/poplib.py @@ -2157,6 +2159,7 @@ libdata/pkgconfig/python-3.1.pc @dirrm %%PYTHON_LIBDIR%%/sqlite3 @dirrm %%PYTHON_LIBDIR%%/site-packages @dirrm %%PYTHON_LIBDIR%%/pydoc_data +@dirrm %%PYTHON_LIBDIR%%/plat-freebsd9 @dirrm %%PYTHON_LIBDIR%%/plat-freebsd8 @dirrm %%PYTHON_LIBDIR%%/plat-freebsd7 @dirrm %%PYTHON_LIBDIR%%/plat-freebsd6 diff --git a/lang/python32/Makefile b/lang/python32/Makefile index 058c9c9e431a..44a2a2efc5b7 100644 --- a/lang/python32/Makefile +++ b/lang/python32/Makefile @@ -6,6 +6,7 @@ PORTNAME= python31 PORTVERSION= 3.1.1 +PORTREVISON= 1 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} @@ -39,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= 2to3 idle3 pydoc3 BIN_FILES= python python-shared python-config python-shared-config \ @@ -111,6 +112,8 @@ CONFIGURE_ARGS+= --with-fpectl .endif pre-patch: + ${CP} -r ${PATCH_WRKSRC}/Lib/plat-freebsd8 \ + ${PATCH_WRKSRC}/Lib/plat-freebsd9 ${MKDIR} ${WRKSRC} ${SHARED_WRKSRC}/Modules .for script in ${BIN_SCRIPTS} ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ diff --git a/lang/python32/files/patch-setup.py b/lang/python32/files/patch-setup.py index 740f3afec082..5f78c13849a4 100644 --- a/lang/python32/files/patch-setup.py +++ b/lang/python32/files/patch-setup.py @@ -1,5 +1,5 @@ ---- setup.py.orig 2009-06-28 20:59:53.170127518 +0800 -+++ setup.py 2009-06-29 01:19:05.592053355 +0800 +--- setup.py.orig 2009-08-12 20:39:44.000000000 +0200 ++++ setup.py 2009-11-26 12:58:45.000000000 +0100 @@ -16,7 +16,7 @@ from distutils.command.install_lib import install_lib @@ -61,7 +61,25 @@ libraries = [panel_library] + curses_libs) ) else: missing.append('_curses_panel') -@@ -1666,8 +1670,7 @@ +@@ -1161,7 +1165,7 @@ + macros = dict() + libraries = [] + +- elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8'): ++ elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9'): + # FreeBSD's P1003.1b semaphore support is very experimental + # and has many known problems. (as of June 2008) + macros = dict() +@@ -1204,7 +1208,7 @@ + + # Platform-specific libraries + if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6', +- 'freebsd7', 'freebsd8'): ++ 'freebsd7', 'freebsd8', 'freebsd9'): + exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) ) + else: + missing.append('ossaudiodev') +@@ -1665,8 +1669,7 @@ # called unless there's at least one extension module defined. ext_modules=[Extension('_struct', ['_struct.c'])], diff --git a/lang/python32/pkg-plist b/lang/python32/pkg-plist index 8a6fbf8097e3..4333cc8585b5 100644 --- a/lang/python32/pkg-plist +++ b/lang/python32/pkg-plist @@ -890,6 +890,8 @@ libdata/pkgconfig/python-3.1.pc %%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%%/plistlib.py %%PYTHON_LIBDIR%%/poplib.py @@ -2157,6 +2159,7 @@ libdata/pkgconfig/python-3.1.pc @dirrm %%PYTHON_LIBDIR%%/sqlite3 @dirrm %%PYTHON_LIBDIR%%/site-packages @dirrm %%PYTHON_LIBDIR%%/pydoc_data +@dirrm %%PYTHON_LIBDIR%%/plat-freebsd9 @dirrm %%PYTHON_LIBDIR%%/plat-freebsd8 @dirrm %%PYTHON_LIBDIR%%/plat-freebsd7 @dirrm %%PYTHON_LIBDIR%%/plat-freebsd6