Date: Fri, 26 Oct 2007 16:22:19 GMT From: Dima Panov <fluffy@ael.ru> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/117537: Fix python25 with 8.0-CURRENT Message-ID: <200710261622.l9QGMJ4L002445@www.freebsd.org> Resent-Message-ID: <200710261630.l9QGU3PN035289@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 117537 >Category: ports >Synopsis: Fix python25 with 8.0-CURRENT >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Oct 26 16:30:00 UTC 2007 >Closed-Date: >Last-Modified: >Originator: Dima Panov >Release: 8.0-CURRENT >Organization: Ael.RU >Environment: >Description: Python 2.5.1 lack of support FreeBSD8. >How-To-Repeat: cd ${PORTSDIR}/lang/python25 && make all package >Fix: Index: lang/python25/Makefile =================================================================== RCS file: /home/ncvs/ports/lang/python25/Makefile,v retrieving revision 1.145 diff -u -r1.145 Makefile --- lang/python25/Makefile 3 Oct 2007 23:22:04 -0000 1.145 +++ lang/python25/Makefile 26 Oct 2007 13:38:22 -0000 @@ -116,12 +116,14 @@ CONFIGURE_ARGS+= --with-fpectl .endif -.if ${OSVERSION} >= 700000 -PLATFORMS=plat-freebsd4 plat-freebsd5 plat-freebsd6 +.if ${OSVERSION} >= 800000 +PLATFORMS=plat-freebsd4 plat-freebsd5 plat-freebsd6 plat-freebsd7 +.elif ${OSVERSION} >= 700000 +PLATFORMS=plat-freebsd4 plat-freebsd5 plat-freebsd6 plat-freebsd8 .elif ${OSVERSION} >= 600000 -PLATFORMS=plat-freebsd4 plat-freebsd5 plat-freebsd7 +PLATFORMS=plat-freebsd4 plat-freebsd5 plat-freebsd7 plat-freebsd8 .else -PLATFORMS=plat-freebsd4 plat-freebsd6 plat-freebsd7 +PLATFORMS=plat-freebsd4 plat-freebsd6 plat-freebsd7 plat-freebsd8 .endif pre-patch: @@ -156,6 +158,9 @@ ${ECHO} "fpectl fpectlmodule.c" >> ${WRKSRC}/Modules/Setup.dist .endif + @${CP} -R ${PATCH_WRKSRC}/Lib/plat-freebsd7 \ + ${PATCH_WRKSRC}/Lib/plat-freebsd8 + post-configure: ${TAR} -C ${WRKSRC} -cf - . | ${TAR} -C ${SHARED_WRKSRC} -xf - ${LN} -sf ${PYTHON_WRKSRC}/Lib ${WRKSRC}/Lib Index: lang/python25/pkg-plist =================================================================== RCS file: /home/ncvs/ports/lang/python25/pkg-plist,v retrieving revision 1.69 diff -u -r1.69 pkg-plist --- lang/python25/pkg-plist 30 Jul 2007 09:41:36 -0000 1.69 +++ lang/python25/pkg-plist 15 Oct 2007 04:11:31 -0000 @@ -750,6 +750,8 @@ %%PYTHON_LIBDIR%%/plat-freebsd6/regen %%PYTHON_LIBDIR%%/plat-freebsd7/IN.py %%PYTHON_LIBDIR%%/plat-freebsd7/regen +%%PYTHON_LIBDIR%%/plat-freebsd8/IN.py +%%PYTHON_LIBDIR%%/plat-freebsd8/regen %%PYTHON_LIBDIR%%/platform.py %%PYTHON_LIBDIR%%/popen2.py %%PYTHON_LIBDIR%%/poplib.py Index: lang/python25/files/patch-setup.py =================================================================== RCS file: /home/ncvs/ports/lang/python25/files/patch-setup.py,v retrieving revision 1.16 diff -u -r1.16 patch-setup.py --- lang/python25/files/patch-setup.py 27 Feb 2007 19:00:23 -0000 1.16 +++ lang/python25/files/patch-setup.py 15 Oct 2007 04:22:12 -0000 @@ -61,6 +61,15 @@ libraries = [panel_library] + curses_libs) ) +@@ -1041,7 +1045,7 @@ + exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) ) + + if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6', +- 'freebsd7'): ++ 'freebsd7', 'freebsd8'): + exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) ) + + if platform == 'sunos5': @@ -1515,8 +1519,7 @@ ext_modules=[Extension('_struct', ['_struct.c'])], Patch attached with submission follows: Index: lang/python25/Makefile =================================================================== RCS file: /home/ncvs/ports/lang/python25/Makefile,v retrieving revision 1.145 diff -u -r1.145 Makefile --- lang/python25/Makefile 3 Oct 2007 23:22:04 -0000 1.145 +++ lang/python25/Makefile 26 Oct 2007 13:38:22 -0000 @@ -116,12 +116,14 @@ CONFIGURE_ARGS+= --with-fpectl .endif -.if ${OSVERSION} >= 700000 -PLATFORMS=plat-freebsd4 plat-freebsd5 plat-freebsd6 +.if ${OSVERSION} >= 800000 +PLATFORMS=plat-freebsd4 plat-freebsd5 plat-freebsd6 plat-freebsd7 +.elif ${OSVERSION} >= 700000 +PLATFORMS=plat-freebsd4 plat-freebsd5 plat-freebsd6 plat-freebsd8 .elif ${OSVERSION} >= 600000 -PLATFORMS=plat-freebsd4 plat-freebsd5 plat-freebsd7 +PLATFORMS=plat-freebsd4 plat-freebsd5 plat-freebsd7 plat-freebsd8 .else -PLATFORMS=plat-freebsd4 plat-freebsd6 plat-freebsd7 +PLATFORMS=plat-freebsd4 plat-freebsd6 plat-freebsd7 plat-freebsd8 .endif pre-patch: @@ -156,6 +158,9 @@ ${ECHO} "fpectl fpectlmodule.c" >> ${WRKSRC}/Modules/Setup.dist .endif + @${CP} -R ${PATCH_WRKSRC}/Lib/plat-freebsd7 \ + ${PATCH_WRKSRC}/Lib/plat-freebsd8 + post-configure: ${TAR} -C ${WRKSRC} -cf - . | ${TAR} -C ${SHARED_WRKSRC} -xf - ${LN} -sf ${PYTHON_WRKSRC}/Lib ${WRKSRC}/Lib Index: lang/python25/pkg-plist =================================================================== RCS file: /home/ncvs/ports/lang/python25/pkg-plist,v retrieving revision 1.69 diff -u -r1.69 pkg-plist --- lang/python25/pkg-plist 30 Jul 2007 09:41:36 -0000 1.69 +++ lang/python25/pkg-plist 15 Oct 2007 04:11:31 -0000 @@ -750,6 +750,8 @@ %%PYTHON_LIBDIR%%/plat-freebsd6/regen %%PYTHON_LIBDIR%%/plat-freebsd7/IN.py %%PYTHON_LIBDIR%%/plat-freebsd7/regen +%%PYTHON_LIBDIR%%/plat-freebsd8/IN.py +%%PYTHON_LIBDIR%%/plat-freebsd8/regen %%PYTHON_LIBDIR%%/platform.py %%PYTHON_LIBDIR%%/popen2.py %%PYTHON_LIBDIR%%/poplib.py Index: lang/python25/files/patch-setup.py =================================================================== RCS file: /home/ncvs/ports/lang/python25/files/patch-setup.py,v retrieving revision 1.16 diff -u -r1.16 patch-setup.py --- lang/python25/files/patch-setup.py 27 Feb 2007 19:00:23 -0000 1.16 +++ lang/python25/files/patch-setup.py 15 Oct 2007 04:22:12 -0000 @@ -61,6 +61,15 @@ libraries = [panel_library] + curses_libs) ) +@@ -1041,7 +1045,7 @@ + exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) ) + + if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6', +- 'freebsd7'): ++ 'freebsd7', 'freebsd8'): + exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) ) + + if platform == 'sunos5': @@ -1515,8 +1519,7 @@ ext_modules=[Extension('_struct', ['_struct.c'])], >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200710261622.l9QGMJ4L002445>