ports/95779: [PATCH] lang/python: Some portlint fixes

[Alexander Botero-Lowry]

>Number:         95779
>Category:       ports
>Synopsis:       [PATCH] lang/python: Some portlint fixes
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Apr 15 03:20:14 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Alexander Botero-Lowry
>Release:        FreeBSD 6.0-STABLE i386
>Organization:
>Environment:
System: FreeBSD Laptop.mine.box 6.0-STABLE FreeBSD 6.0-STABLE #1: Tue Feb  7 19:06:16 PST
>Description:
- Rename patch files
- Fix tab/space issues
- remove USE_REINPLACE

Added file(s):
- files/patch-Modules_socketmodule.c
- files/patch-Python_ceval.c

Removed file(s):
- files/patch-Modules::socketmodule.c
- files/patch-Python::ceval.c

Port maintainer (perky at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- python-2.4.3.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/lang/python/Makefile /usr/local/tinderbox/portstrees/FreeBSD/ports/lang/python/Makefile
--- /usr/ports/lang/python/Makefile	Sat Apr  1 00:42:40 2006
+++ /usr/local/tinderbox/portstrees/FreeBSD/ports/lang/python/Makefile	Fri Apr 14 20:15:32 2006
@@ -29,7 +29,6 @@
 USE_PYTHON=	yes
 PYTHON_VERSION=	python2.4
 PYTHON_NO_DEPENDS=	yes
-USE_REINPLACE=	yes
 
 SHARED_WRKSRC=	${WRKSRC}/build.shared
 PLIST=		${WRKDIR}/pkg-plist
@@ -94,13 +93,13 @@
 .endif
 
 .if !defined(WITHOUT_IPV6) && ${OSVERSION} >= 400014
-CONFIGURE_ARGS+= --enable-ipv6
+CONFIGURE_ARGS+=	--enable-ipv6
 .else
-CONFIGURE_ARGS+= --disable-ipv6
+CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
 .if defined(WITH_FPECTL)
-CONFIGURE_ARGS+= --with-fpectl
+CONFIGURE_ARGS+=	--with-fpectl
 .endif
 
 .if ${OSVERSION} >= 700000
diff -ruN --exclude=CVS /usr/ports/lang/python/files/patch-Modules::socketmodule.c /usr/local/tinderbox/portstrees/FreeBSD/ports/lang/python/files/patch-Modules::socketmodule.c
--- /usr/ports/lang/python/files/patch-Modules::socketmodule.c	Sun Oct  2 07:31:39 2005
+++ /usr/local/tinderbox/portstrees/FreeBSD/ports/lang/python/files/patch-Modules::socketmodule.c	Wed Dec 31 16:00:00 1969
@@ -1,13 +0,0 @@
---- Modules/socketmodule.c.orig	Sun Oct  2 21:49:22 2005
-+++ Modules/socketmodule.c	Sun Oct  2 21:50:01 2005
-@@ -142,7 +142,9 @@
- 
- /* On systems on which getaddrinfo() is believed to not be thread-safe,
-    (this includes the getaddrinfo emulation) protect access with a lock. */
--#if defined(WITH_THREAD) && (defined(__APPLE__) || defined(__FreeBSD__) || \
-+#include <sys/param.h>
-+#if defined(WITH_THREAD) && (defined(__APPLE__) || \
-+    (defined(__FreeBSD__) && __FreeBSD_version+0 < 503000) || \
-     defined(__OpenBSD__) || defined(__NetBSD__) || !defined(HAVE_GETADDRINFO))
- #define USE_GETADDRINFO_LOCK
- #endif
diff -ruN --exclude=CVS /usr/ports/lang/python/files/patch-Modules_socketmodule.c /usr/local/tinderbox/portstrees/FreeBSD/ports/lang/python/files/patch-Modules_socketmodule.c
--- /usr/ports/lang/python/files/patch-Modules_socketmodule.c	Wed Dec 31 16:00:00 1969
+++ /usr/local/tinderbox/portstrees/FreeBSD/ports/lang/python/files/patch-Modules_socketmodule.c	Sun Oct  2 07:31:39 2005
@@ -0,0 +1,13 @@
+--- Modules/socketmodule.c.orig	Sun Oct  2 21:49:22 2005
++++ Modules/socketmodule.c	Sun Oct  2 21:50:01 2005
+@@ -142,7 +142,9 @@
+ 
+ /* On systems on which getaddrinfo() is believed to not be thread-safe,
+    (this includes the getaddrinfo emulation) protect access with a lock. */
+-#if defined(WITH_THREAD) && (defined(__APPLE__) || defined(__FreeBSD__) || \
++#include <sys/param.h>
++#if defined(WITH_THREAD) && (defined(__APPLE__) || \
++    (defined(__FreeBSD__) && __FreeBSD_version+0 < 503000) || \
+     defined(__OpenBSD__) || defined(__NetBSD__) || !defined(HAVE_GETADDRINFO))
+ #define USE_GETADDRINFO_LOCK
+ #endif
diff -ruN --exclude=CVS /usr/ports/lang/python/files/patch-Python::ceval.c /usr/local/tinderbox/portstrees/FreeBSD/ports/lang/python/files/patch-Python::ceval.c
--- /usr/ports/lang/python/files/patch-Python::ceval.c	Wed Dec  1 07:04:05 2004
+++ /usr/local/tinderbox/portstrees/FreeBSD/ports/lang/python/files/patch-Python::ceval.c	Wed Dec 31 16:00:00 1969
@@ -1,16 +0,0 @@
---- Python/ceval.c.orig	Wed Nov 24 03:06:08 2004
-+++ Python/ceval.c	Wed Dec  1 22:29:37 2004
-@@ -414,8 +414,11 @@
- 
- /* The interpreter's recursion limit */
- 
--static int recursion_limit = 1000;
--int _Py_CheckRecursionLimit = 1000;
-+#ifndef PYTHON_DEFAULT_RECURSION_LIMIT
-+#define PYTHON_DEFAULT_RECURSION_LIMIT 1000
-+#endif
-+static int recursion_limit = PYTHON_DEFAULT_RECURSION_LIMIT;
-+int _Py_CheckRecursionLimit = PYTHON_DEFAULT_RECURSION_LIMIT;
- 
- int
- Py_GetRecursionLimit(void)
diff -ruN --exclude=CVS /usr/ports/lang/python/files/patch-Python_ceval.c /usr/local/tinderbox/portstrees/FreeBSD/ports/lang/python/files/patch-Python_ceval.c
--- /usr/ports/lang/python/files/patch-Python_ceval.c	Wed Dec 31 16:00:00 1969
+++ /usr/local/tinderbox/portstrees/FreeBSD/ports/lang/python/files/patch-Python_ceval.c	Wed Dec  1 07:04:05 2004
@@ -0,0 +1,16 @@
+--- Python/ceval.c.orig	Wed Nov 24 03:06:08 2004
++++ Python/ceval.c	Wed Dec  1 22:29:37 2004
+@@ -414,8 +414,11 @@
+ 
+ /* The interpreter's recursion limit */
+ 
+-static int recursion_limit = 1000;
+-int _Py_CheckRecursionLimit = 1000;
++#ifndef PYTHON_DEFAULT_RECURSION_LIMIT
++#define PYTHON_DEFAULT_RECURSION_LIMIT 1000
++#endif
++static int recursion_limit = PYTHON_DEFAULT_RECURSION_LIMIT;
++int _Py_CheckRecursionLimit = PYTHON_DEFAULT_RECURSION_LIMIT;
+ 
+ int
+ Py_GetRecursionLimit(void)
--- python-2.4.3.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: