From nobody@FreeBSD.org  Fri Oct 26 16:22:53 2007
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B0D6516A420
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 26 Oct 2007 16:22:53 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id AF03F13C4B7
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 26 Oct 2007 16:22:52 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.1/8.14.1) with ESMTP id l9QGMJrH002446
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 26 Oct 2007 16:22:19 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.1/8.14.1/Submit) id l9QGMJ4L002445;
	Fri, 26 Oct 2007 16:22:19 GMT
	(envelope-from nobody)
Message-Id: <200710261622.l9QGMJ4L002445@www.freebsd.org>
Date: Fri, 26 Oct 2007 16:22:19 GMT
From: Dima Panov <fluffy@ael.ru>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Fix python25 with 8.0-CURRENT
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         117537
>Category:       ports
>Synopsis:       Fix lang/python25 with 8.0-CURRENT
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-python
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Oct 26 16:30:00 UTC 2007
>Closed-Date:    Sun Jan 20 23:24:31 UTC 2008
>Last-Modified:  Sun Jan 20 23:24:31 UTC 2008
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->python 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sat Oct 27 01:46:41 UTC 2007 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=117537 
Responsible-Changed-From-To: python->freebsd-python 
Responsible-Changed-By: gnats 
Responsible-Changed-When: Mon Oct 29 14:11:15 UTC 2007 
Responsible-Changed-Why:  


http://www.freebsd.org/cgi/query-pr.cgi?pr=117537 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Sun Jan 20 23:24:29 UTC 2008 
State-Changed-Why:  
Already fixed. Thanks for your report. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=117537 
>Unformatted:
