[28753] trunk/dports/lang

[source_changes at macosforge.org]

Revision: 28753
          http://trac.macosforge.org/projects/macports/changeset/28753
Author:   afb at macports.org
Date:     2007-09-08 03:37:52 -0700 (Sat, 08 Sep 2007)

Log Message:
-----------
stealth upgrade to python2X, to fix #12221 while avoiding python_select breakage

Modified Paths:
--------------
    trunk/dports/lang/python24/Portfile
    trunk/dports/lang/python25/Portfile

Added Paths:
-----------
    trunk/dports/lang/python24/files/patch-Lib-cgi.py
    trunk/dports/lang/python25/files/patch-Lib-cgi.py

Modified: trunk/dports/lang/python24/Portfile
===================================================================
--- trunk/dports/lang/python24/Portfile	2007-09-08 10:36:18 UTC (rev 28752)
+++ trunk/dports/lang/python24/Portfile	2007-09-08 10:37:52 UTC (rev 28753)
@@ -21,6 +21,7 @@
 checksums       md5 0ba90c79175c017101100ebf5978e906
 patchfiles      patch-configure \
                 patch-Makefile.pre.in \
+                patch-Lib-cgi.py \
                 patch-Lib-site.py \
                 patch-setup.py \
                 patch-Include-pyport.h \
@@ -43,6 +44,7 @@
 
 post-patch {
     cd ${worksrcpath}
+    reinplace "s|__PREFIX__|${prefix}|g" Lib/cgi.py
     reinplace "s|__PREFIX__|${prefix}|g" Lib/site.py
     reinplace "s|__PREFIX__|${prefix}|g" Mac/OSX/Makefile.in
     reinplace "s|__PREFIX__|${prefix}|g" setup.py

Added: trunk/dports/lang/python24/files/patch-Lib-cgi.py
===================================================================
--- trunk/dports/lang/python24/files/patch-Lib-cgi.py	                        (rev 0)
+++ trunk/dports/lang/python24/files/patch-Lib-cgi.py	2007-09-08 10:37:52 UTC (rev 28753)
@@ -0,0 +1,18 @@
+--- Lib/cgi.py.orig	2006-08-11 09:14:38.000000000 +0200
++++ Lib/cgi.py	2007-08-21 15:36:54.000000000 +0200
+@@ -1,13 +1,6 @@
+-#! /usr/local/bin/python
++#! __PREFIX__/bin/python2.4
+ 
+-# NOTE: the above "/usr/local/bin/python" is NOT a mistake.  It is
+-# intentionally NOT "/usr/bin/env python".  On many systems
+-# (e.g. Solaris), /usr/local/bin is not in $PATH as passed to CGI
+-# scripts, and /usr/local/bin is the default directory where Python is
+-# installed, so /usr/bin/env would be unable to find python.  Granted,
+-# binary installations by Linux vendors often install Python in
+-# /usr/bin.  So let those vendors patch cgi.py to match their choice
+-# of installation.
++# NOTE: /usr/local/bin/python patched for MacPorts installation
+ 
+ """Support module for CGI (Common Gateway Interface) scripts.
+ 

Modified: trunk/dports/lang/python25/Portfile
===================================================================
--- trunk/dports/lang/python25/Portfile	2007-09-08 10:36:18 UTC (rev 28752)
+++ trunk/dports/lang/python25/Portfile	2007-09-08 10:37:52 UTC (rev 28753)
@@ -24,7 +24,7 @@
 checksums		sha1 993a66bd2dabb0c4f33ca98372576315ef113df6 \
 				rmd160 af0e8ed93bbc07015c338ae19bbee8811da21c1c
 
-patchfiles		patch-setup.py patch-Makefile.pre.in
+patchfiles		patch-setup.py patch-Makefile.pre.in patch-Lib-cgi.py
 
 configure.args	--enable-shared \
 			--mandir=${prefix}/share/man \
@@ -35,6 +35,11 @@
 			--disable-tk \
 			--disable-framework
 
+post-patch {
+    cd ${worksrcpath}
+    reinplace "s|__PREFIX__|${prefix}|g" Lib/cgi.py
+}
+
 test.run	   yes
 test.target	   test
 

Added: trunk/dports/lang/python25/files/patch-Lib-cgi.py
===================================================================
--- trunk/dports/lang/python25/files/patch-Lib-cgi.py	                        (rev 0)
+++ trunk/dports/lang/python25/files/patch-Lib-cgi.py	2007-09-08 10:37:52 UTC (rev 28753)
@@ -0,0 +1,18 @@
+--- Lib/cgi.py.orig	2006-08-10 19:41:07.000000000 +0200
++++ Lib/cgi.py	2007-08-21 15:36:54.000000000 +0200
+@@ -1,13 +1,6 @@
+-#! /usr/local/bin/python
++#! __PREFIX__/bin/python2.5
+ 
+-# NOTE: the above "/usr/local/bin/python" is NOT a mistake.  It is
+-# intentionally NOT "/usr/bin/env python".  On many systems
+-# (e.g. Solaris), /usr/local/bin is not in $PATH as passed to CGI
+-# scripts, and /usr/local/bin is the default directory where Python is
+-# installed, so /usr/bin/env would be unable to find python.  Granted,
+-# binary installations by Linux vendors often install Python in
+-# /usr/bin.  So let those vendors patch cgi.py to match their choice
+-# of installation.
++# NOTE: /usr/local/bin/python patched for MacPorts installation
+ 
+ """Support module for CGI (Common Gateway Interface) scripts.
+ 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070908/a1d231aa/attachment.html