FreeBSD 7-current support on lang/phthon

Norikatsu Shigemura nork at FreeBSD.org
Sat Jul 16 14:10:31 GMT 2005


Hi Hye-Shik!

	I have a patch to support 7-current on lang/python.
	I made it ad-hoc-ly, and didn't confirm it.  So
	please update lang/python.

diff -urN python.old/Makefile python/Makefile
--- python.old/Makefile	Sun Jun 19 20:34:56 2005
+++ python/Makefile	Sat Jul 16 22:51:03 2005
@@ -101,7 +101,9 @@
 CONFIGURE_ARGS+= --with-fpectl
 .endif
 
-.if ${OSVERSION} >= 600000
+.if ${OSVERSION} >= 700000
+PLATFORMS=plat-freebsd3 plat-freebsd4 plat-freebsd5
+.elif ${OSVERSION} >= 600000
 PLATFORMS=plat-freebsd3 plat-freebsd4 plat-freebsd5
 .elif ${OSVERSION} >= 500000
 PLATFORMS=plat-freebsd3 plat-freebsd4 plat-freebsd6
@@ -127,7 +129,9 @@
 		's|^\( *prefixes = .*\)\]$$|\1, "${X11BASE}"]|g' \
 		${WRKSRC}/Lib/site.py
 	${MKDIR} ${WRKSRC}/Lib/plat-freebsd6
+	${MKDIR} ${WRKSRC}/Lib/plat-freebsd7
 	${CP} ${WRKSRC}/Lib/plat-freebsd5/regen ${WRKSRC}/Lib/plat-freebsd6/
+	${CP} ${WRKSRC}/Lib/plat-freebsd5/regen ${WRKSRC}/Lib/plat-freebsd7/
 .if defined(WITH_FPECTL) && ${ARCH} == i386
 	${ECHO} "fpectl fpectlmodule.c" >> ${WRKSRC}/Modules/Setup.dist
 .endif
diff -urN python.old/files/patch-FreeBSD7.x python/files/patch-FreeBSD7.x
--- python.old/files/patch-FreeBSD7.x	Thu Jan  1 09:00:00 1970
+++ python/files/patch-FreeBSD7.x	Sat Jul 16 22:48:52 2005
@@ -0,0 +1,54 @@
+--- setup.py.orig	Thu Mar 10 07:27:24 2005
++++ setup.py	Sat Jul 16 22:46:31 2005
+@@ -791,7 +791,7 @@
+             # Linux-specific modules
+             exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) )
+ 
+-        if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6'):
++        if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6', 'freebsd7'):
+             exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
+ 
+         if platform == 'sunos5':
+--- Lib/posixfile.py.orig	Thu Aug 19 00:13:40 2004
++++ Lib/posixfile.py	Sat Jul 16 22:47:19 2005
+@@ -185,7 +185,7 @@
+         if sys.platform in ('netbsd1',
+                             'openbsd2',
+                             'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5',
+-                            'freebsd6', 'bsdos2', 'bsdos3', 'bsdos4'):
++                            'freebsd6', 'freebsd7', 'bsdos2', 'bsdos3', 'bsdos4'):
+             flock = struct.pack('lxxxxlxxxxlhh', \
+                   l_start, l_len, os.getpid(), l_type, l_whence)
+         elif sys.platform in ['aix3', 'aix4']:
+--- Lib/test/regrtest.py.orig	Fri Mar  4 05:51:32 2005
++++ Lib/test/regrtest.py	Sat Jul 16 22:47:30 2005
+@@ -1069,6 +1069,7 @@
+ }
+ _expectations['freebsd5'] = _expectations['freebsd4']
+ _expectations['freebsd6'] = _expectations['freebsd4']
++_expectations['freebsd7'] = _expectations['freebsd4']
+ 
+ class _ExpectedSkips:
+     def __init__(self):
+--- Lib/test/test_fcntl.py.orig	Thu Aug 19 00:13:41 2004
++++ Lib/test/test_fcntl.py	Sat Jul 16 22:47:40 2005
+@@ -21,7 +21,7 @@
+     start_len = "qq"
+ 
+ if sys.platform in ('netbsd1', 'Darwin1.2', 'darwin',
+-                    'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5', 'freebsd6',
++                    'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5', 'freebsd6', 'freebsd7',
+                     'bsdos2', 'bsdos3', 'bsdos4',
+                     'openbsd', 'openbsd2', 'openbsd3'):
+     lockdata = struct.pack('lxxxxlxxxxlhh', 0, 0, 0, fcntl.F_WRLCK, 0)
+--- Lib/test/test_socket.py.orig	Sat Mar 12 15:15:55 2005
++++ Lib/test/test_socket.py	Sat Jul 16 22:47:51 2005
+@@ -311,7 +311,7 @@
+         # Find one service that exists, then check all the related interfaces.
+         # I've ordered this by protocols that have both a tcp and udp
+         # protocol, at least for modern Linuxes.
+-        if sys.platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
++        if sys.platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6', 'freebsd7',
+                             'darwin'):
+             # avoid the 'echo' service on this platform, as there is an
+             # assumption breaking non-standard port/protocol entry
diff -urN python.old/pkg-plist python/pkg-plist
--- python.old/pkg-plist	Thu May 12 10:49:54 2005
+++ python/pkg-plist	Sat Jul 16 22:49:29 2005
@@ -1537,6 +1537,10 @@
 lib/%%PYTHON_VERSION%%/plat-freebsd6/IN.pyc
 lib/%%PYTHON_VERSION%%/plat-freebsd6/IN.pyo
 lib/%%PYTHON_VERSION%%/plat-freebsd6/regen
+lib/%%PYTHON_VERSION%%/plat-freebsd7/IN.py
+lib/%%PYTHON_VERSION%%/plat-freebsd7/IN.pyc
+lib/%%PYTHON_VERSION%%/plat-freebsd7/IN.pyo
+lib/%%PYTHON_VERSION%%/plat-freebsd7/regen
 lib/%%PYTHON_VERSION%%/platform.py
 lib/%%PYTHON_VERSION%%/platform.pyc
 lib/%%PYTHON_VERSION%%/platform.pyo
@@ -3376,6 +3380,7 @@
 @dirrm lib/%%PYTHON_VERSION%%/test/decimaltestdata
 @dirrm lib/%%PYTHON_VERSION%%/test
 @dirrm lib/%%PYTHON_VERSION%%/site-packages
+ at dirrm lib/%%PYTHON_VERSION%%/plat-freebsd7
 @dirrm lib/%%PYTHON_VERSION%%/plat-freebsd6
 @dirrm lib/%%PYTHON_VERSION%%/plat-freebsd5
 @dirrm lib/%%PYTHON_VERSION%%/plat-freebsd4


More information about the freebsd-ports mailing list