[34379] trunk/dports/lang/python25
mww at macports.org
mww at macports.org
Fri Feb 22 15:26:06 PST 2008
Revision: 34379
http://trac.macosforge.org/projects/macports/changeset/34379
Author: mww at macports.org
Date: 2008-02-22 15:26:05 -0800 (Fri, 22 Feb 2008)
Log Message:
-----------
version 2.5.2
Modified Paths:
--------------
trunk/dports/lang/python25/Portfile
Added Paths:
-----------
trunk/dports/lang/python25/files/patch-Lib-cgi.py.diff
trunk/dports/lang/python25/files/patch-Makefile.pre.in.diff
trunk/dports/lang/python25/files/patch-Misc-setuid-prog.c.diff
trunk/dports/lang/python25/files/patch-Modules-posixmodule.c.diff
trunk/dports/lang/python25/files/patch-configure.diff
trunk/dports/lang/python25/files/patch-setup.py.diff
Removed Paths:
-------------
trunk/dports/lang/python25/files/patch-Lib-cgi.py
trunk/dports/lang/python25/files/patch-Makefile.pre.in
trunk/dports/lang/python25/files/patch-Misc-setuid-prog.c
trunk/dports/lang/python25/files/patch-Modules-posixmodule.c
trunk/dports/lang/python25/files/patch-configure
trunk/dports/lang/python25/files/patch-setup.py
Modified: trunk/dports/lang/python25/Portfile
===================================================================
--- trunk/dports/lang/python25/Portfile 2008-02-22 21:53:53 UTC (rev 34378)
+++ trunk/dports/lang/python25/Portfile 2008-02-22 23:26:05 UTC (rev 34379)
@@ -3,8 +3,7 @@
PortSystem 1.0
name python25
-version 2.5.1
-revision 4
+version 2.5.2
categories lang
platforms darwin
maintainers mww
@@ -22,18 +21,18 @@
distname Python-${version}
use_bzip2 yes
-checksums md5 70084ffa561660f07de466c2c8c4842d \
- sha1 993a66bd2dabb0c4f33ca98372576315ef113df6 \
- rmd160 af0e8ed93bbc07015c338ae19bbee8811da21c1c
+checksums md5 afb5451049eda91fbde10bd5a4b7fadc \
+ sha1 4755d212f50af704c20224a6966e23acc5aea60f \
+ rmd160 b23b02739833e6730799c5866e2b77aae884b63f
depends_lib port:gettext
-patchfiles patch-configure \
- patch-Makefile.pre.in \
- patch-Misc-setuid-prog.c \
- patch-Modules-posixmodule.c \
- patch-setup.py \
- patch-Lib-cgi.py
+patchfiles patch-configure.diff \
+ patch-Makefile.pre.in.diff \
+ patch-Misc-setuid-prog.c.diff \
+ patch-Modules-posixmodule.c.diff \
+ patch-setup.py.diff \
+ patch-Lib-cgi.py.diff
configure.args --enable-shared \
--mandir=${prefix}/share/man \
@@ -77,6 +76,7 @@
platform darwin 9 {
configure.cppflags-append -D__DARWIN_UNIX03
+ configure.args-append --with-cxx=/usr/bin/g++-4.0
}
variant universal {
Deleted: trunk/dports/lang/python25/files/patch-Lib-cgi.py
===================================================================
--- trunk/dports/lang/python25/files/patch-Lib-cgi.py 2008-02-22 21:53:53 UTC (rev 34378)
+++ trunk/dports/lang/python25/files/patch-Lib-cgi.py 2008-02-22 23:26:05 UTC (rev 34379)
@@ -1,18 +0,0 @@
---- 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.
-
Copied: trunk/dports/lang/python25/files/patch-Lib-cgi.py.diff (from rev 34377, trunk/dports/lang/python25/files/patch-Lib-cgi.py)
===================================================================
--- trunk/dports/lang/python25/files/patch-Lib-cgi.py.diff (rev 0)
+++ trunk/dports/lang/python25/files/patch-Lib-cgi.py.diff 2008-02-22 23:26:05 UTC (rev 34379)
@@ -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.
+
Deleted: trunk/dports/lang/python25/files/patch-Makefile.pre.in
===================================================================
--- trunk/dports/lang/python25/files/patch-Makefile.pre.in 2008-02-22 21:53:53 UTC (rev 34378)
+++ trunk/dports/lang/python25/files/patch-Makefile.pre.in 2008-02-22 23:26:05 UTC (rev 34379)
@@ -1,26 +0,0 @@
---- Makefile.pre.in.orig 2007-09-29 02:15:52.000000000 +0200
-+++ Makefile.pre.in 2007-09-29 02:18:57.000000000 +0200
-@@ -373,6 +373,13 @@
- libpython$(VERSION).sl: $(LIBRARY_OBJS)
- $(LDSHARED) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM)
-
-+libpython$(VERSION).dylib: $(LIBRARY)
-+ /usr/bin/libtool -o $@ -dynamic $(OTHER_LIBTOOL_OPT) \
-+ -all_load $(LIBRARY) -single_module \
-+ -install_name $(LIBDIR)/$@ \
-+ -compatibility_version $(VERSION) \
-+ -current_version $(VERSION) -lSystem -lSystemStubs $(LDFLAGS)
-+
- # This rule is here for OPENSTEP/Rhapsody/MacOSX. It builds a temporary
- # minimal framework (not including the Lib directory and such) in the current
- # directory.
-@@ -675,6 +682,9 @@
- fi \
- fi; \
- else true; \
-+ fi; \
-+ if test -f libpython$(VERSION).dylib; then \
-+ $(INSTALL_SHARED) libpython$(VERSION).dylib $(DESTDIR)$(LIBDIR); \
- fi
-
- # Install the manual page
Copied: trunk/dports/lang/python25/files/patch-Makefile.pre.in.diff (from rev 34377, trunk/dports/lang/python25/files/patch-Makefile.pre.in)
===================================================================
--- trunk/dports/lang/python25/files/patch-Makefile.pre.in.diff (rev 0)
+++ trunk/dports/lang/python25/files/patch-Makefile.pre.in.diff 2008-02-22 23:26:05 UTC (rev 34379)
@@ -0,0 +1,26 @@
+--- Makefile.pre.in.orig 2007-09-29 02:15:52.000000000 +0200
++++ Makefile.pre.in 2007-09-29 02:18:57.000000000 +0200
+@@ -373,6 +373,13 @@
+ libpython$(VERSION).sl: $(LIBRARY_OBJS)
+ $(LDSHARED) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM)
+
++libpython$(VERSION).dylib: $(LIBRARY)
++ /usr/bin/libtool -o $@ -dynamic $(OTHER_LIBTOOL_OPT) \
++ -all_load $(LIBRARY) -single_module \
++ -install_name $(LIBDIR)/$@ \
++ -compatibility_version $(VERSION) \
++ -current_version $(VERSION) -lSystem -lSystemStubs $(LDFLAGS)
++
+ # This rule is here for OPENSTEP/Rhapsody/MacOSX. It builds a temporary
+ # minimal framework (not including the Lib directory and such) in the current
+ # directory.
+@@ -675,6 +682,9 @@
+ fi \
+ fi; \
+ else true; \
++ fi; \
++ if test -f libpython$(VERSION).dylib; then \
++ $(INSTALL_SHARED) libpython$(VERSION).dylib $(DESTDIR)$(LIBDIR); \
+ fi
+
+ # Install the manual page
Deleted: trunk/dports/lang/python25/files/patch-Misc-setuid-prog.c
===================================================================
--- trunk/dports/lang/python25/files/patch-Misc-setuid-prog.c 2008-02-22 21:53:53 UTC (rev 34378)
+++ trunk/dports/lang/python25/files/patch-Misc-setuid-prog.c 2008-02-22 23:26:05 UTC (rev 34379)
@@ -1,16 +0,0 @@
---- Misc/setuid-prog.c.orig Sat Dec 11 14:29:22 2004
-+++ Misc/setuid-prog.c Sat Dec 11 14:30:13 2004
-@@ -70,6 +70,12 @@
- #define environ _environ
- #endif
-
-+#if defined(__APPLE__)
-+#include <sys/time.h>
-+#include <crt_externs.h>
-+#define environ (*_NSGetEnviron())
-+#endif
-+
- /* don't change def_IFS */
- char def_IFS[] = "IFS= \t\n";
- /* you may want to change def_PATH, but you should really change it in */
-
Copied: trunk/dports/lang/python25/files/patch-Misc-setuid-prog.c.diff (from rev 34377, trunk/dports/lang/python25/files/patch-Misc-setuid-prog.c)
===================================================================
--- trunk/dports/lang/python25/files/patch-Misc-setuid-prog.c.diff (rev 0)
+++ trunk/dports/lang/python25/files/patch-Misc-setuid-prog.c.diff 2008-02-22 23:26:05 UTC (rev 34379)
@@ -0,0 +1,16 @@
+--- Misc/setuid-prog.c.orig Sat Dec 11 14:29:22 2004
++++ Misc/setuid-prog.c Sat Dec 11 14:30:13 2004
+@@ -70,6 +70,12 @@
+ #define environ _environ
+ #endif
+
++#if defined(__APPLE__)
++#include <sys/time.h>
++#include <crt_externs.h>
++#define environ (*_NSGetEnviron())
++#endif
++
+ /* don't change def_IFS */
+ char def_IFS[] = "IFS= \t\n";
+ /* you may want to change def_PATH, but you should really change it in */
+
Deleted: trunk/dports/lang/python25/files/patch-Modules-posixmodule.c
===================================================================
--- trunk/dports/lang/python25/files/patch-Modules-posixmodule.c 2008-02-22 21:53:53 UTC (rev 34378)
+++ trunk/dports/lang/python25/files/patch-Modules-posixmodule.c 2008-02-22 23:26:05 UTC (rev 34379)
@@ -1,21 +0,0 @@
---- Modules/posixmodule.c.orig Sat Dec 11 14:27:52 2004
-+++ Modules/posixmodule.c Sat Dec 11 14:28:17 2004
-@@ -339,7 +339,7 @@
- #endif
-
- /* Return a dictionary corresponding to the POSIX environment table */
--#ifdef WITH_NEXT_FRAMEWORK
-+#ifdef __APPLE__
- /* On Darwin/MacOSX a shared library or framework has no access to
- ** environ directly, we must obtain it with _NSGetEnviron().
- */
-@@ -357,7 +357,7 @@
- d = PyDict_New();
- if (d == NULL)
- return NULL;
--#ifdef WITH_NEXT_FRAMEWORK
-+#ifdef __APPLE__
- if (environ == NULL)
- environ = *_NSGetEnviron();
- #endif
-
Copied: trunk/dports/lang/python25/files/patch-Modules-posixmodule.c.diff (from rev 34377, trunk/dports/lang/python25/files/patch-Modules-posixmodule.c)
===================================================================
--- trunk/dports/lang/python25/files/patch-Modules-posixmodule.c.diff (rev 0)
+++ trunk/dports/lang/python25/files/patch-Modules-posixmodule.c.diff 2008-02-22 23:26:05 UTC (rev 34379)
@@ -0,0 +1,21 @@
+--- Modules/posixmodule.c.orig Sat Dec 11 14:27:52 2004
++++ Modules/posixmodule.c Sat Dec 11 14:28:17 2004
+@@ -339,7 +339,7 @@
+ #endif
+
+ /* Return a dictionary corresponding to the POSIX environment table */
+-#ifdef WITH_NEXT_FRAMEWORK
++#ifdef __APPLE__
+ /* On Darwin/MacOSX a shared library or framework has no access to
+ ** environ directly, we must obtain it with _NSGetEnviron().
+ */
+@@ -357,7 +357,7 @@
+ d = PyDict_New();
+ if (d == NULL)
+ return NULL;
+-#ifdef WITH_NEXT_FRAMEWORK
++#ifdef __APPLE__
+ if (environ == NULL)
+ environ = *_NSGetEnviron();
+ #endif
+
Deleted: trunk/dports/lang/python25/files/patch-configure
===================================================================
--- trunk/dports/lang/python25/files/patch-configure 2008-02-22 21:53:53 UTC (rev 34378)
+++ trunk/dports/lang/python25/files/patch-configure 2008-02-22 23:26:05 UTC (rev 34379)
@@ -1,28 +0,0 @@
---- configure.in.orig 2007-09-28 21:07:32.000000000 +0200
-+++ configure.in 2007-09-28 21:08:12.000000000 +0200
-@@ -669,6 +669,11 @@
- BLDLIBRARY='-L. -lpython$(VERSION)'
- RUNSHARED=DLL_PATH=`pwd`:${DLL_PATH:-/atheos/sys/libs:/atheos/autolnk/lib}
- ;;
-+ Darwin*)
-+ LDLIBRARY='libpython$(VERSION).dylib'
-+ BLDLIBRARY='-L. -lpython$(VERSION)'
-+ RUNSHARED=DYLD_LIBRARY_PATH="`pwd`:${DYLD_LIBRARY_PATH}"
-+ ;;
- esac
- else # shared is disabled
- case $ac_sys_system in
---- configure.orig 2007-09-28 21:07:26.000000000 +0200
-+++ configure 2007-09-28 21:07:33.000000000 +0200
-@@ -3445,6 +3445,11 @@
- BLDLIBRARY='-L. -lpython$(VERSION)'
- RUNSHARED=DLL_PATH=`pwd`:${DLL_PATH:-/atheos/sys/libs:/atheos/autolnk/lib}
- ;;
-+ Darwin*)
-+ LDLIBRARY='libpython$(VERSION).dylib'
-+ BLDLIBRARY='-L. -lpython$(VERSION)'
-+ RUNSHARED=DYLD_LIBRARY_PATH="`pwd`:${DYLD_LIBRARY_PATH}"
-+ ;;
- esac
- else # shared is disabled
- case $ac_sys_system in
Copied: trunk/dports/lang/python25/files/patch-configure.diff (from rev 34377, trunk/dports/lang/python25/files/patch-configure)
===================================================================
--- trunk/dports/lang/python25/files/patch-configure.diff (rev 0)
+++ trunk/dports/lang/python25/files/patch-configure.diff 2008-02-22 23:26:05 UTC (rev 34379)
@@ -0,0 +1,28 @@
+--- configure.in.orig 2007-09-28 21:07:32.000000000 +0200
++++ configure.in 2007-09-28 21:08:12.000000000 +0200
+@@ -669,6 +669,11 @@
+ BLDLIBRARY='-L. -lpython$(VERSION)'
+ RUNSHARED=DLL_PATH=`pwd`:${DLL_PATH:-/atheos/sys/libs:/atheos/autolnk/lib}
+ ;;
++ Darwin*)
++ LDLIBRARY='libpython$(VERSION).dylib'
++ BLDLIBRARY='-L. -lpython$(VERSION)'
++ RUNSHARED=DYLD_LIBRARY_PATH="`pwd`:${DYLD_LIBRARY_PATH}"
++ ;;
+ esac
+ else # shared is disabled
+ case $ac_sys_system in
+--- configure.orig 2007-09-28 21:07:26.000000000 +0200
++++ configure 2007-09-28 21:07:33.000000000 +0200
+@@ -3445,6 +3445,11 @@
+ BLDLIBRARY='-L. -lpython$(VERSION)'
+ RUNSHARED=DLL_PATH=`pwd`:${DLL_PATH:-/atheos/sys/libs:/atheos/autolnk/lib}
+ ;;
++ Darwin*)
++ LDLIBRARY='libpython$(VERSION).dylib'
++ BLDLIBRARY='-L. -lpython$(VERSION)'
++ RUNSHARED=DYLD_LIBRARY_PATH="`pwd`:${DYLD_LIBRARY_PATH}"
++ ;;
+ esac
+ else # shared is disabled
+ case $ac_sys_system in
Deleted: trunk/dports/lang/python25/files/patch-setup.py
===================================================================
--- trunk/dports/lang/python25/files/patch-setup.py 2008-02-22 21:53:53 UTC (rev 34378)
+++ trunk/dports/lang/python25/files/patch-setup.py 2008-02-22 23:26:05 UTC (rev 34379)
@@ -1,11 +0,0 @@
---- setup.py 2006-08-10 01:42:18.000000000 +0200
-+++ setup.py 2007-02-17 16:57:24.000000000 +0100
-@@ -15,7 +15,7 @@
- from distutils.command.install_lib import install_lib
-
- # This global variable is used to hold the list of modules to be disabled.
--disabled_module_list = []
-+disabled_module_list = ["zlib","_hashlib","_ssl","_bsddb","_sqlite3","_tkinter","bz2","gdbm","readline","_curses","_curses_panel"]
-
- def add_dir_to_list(dirlist, dir):
- """Add the directory 'dir' to the list 'dirlist' (at the front) if
Copied: trunk/dports/lang/python25/files/patch-setup.py.diff (from rev 34377, trunk/dports/lang/python25/files/patch-setup.py)
===================================================================
--- trunk/dports/lang/python25/files/patch-setup.py.diff (rev 0)
+++ trunk/dports/lang/python25/files/patch-setup.py.diff 2008-02-22 23:26:05 UTC (rev 34379)
@@ -0,0 +1,11 @@
+--- setup.py 2006-08-10 01:42:18.000000000 +0200
++++ setup.py 2007-02-17 16:57:24.000000000 +0100
+@@ -15,7 +15,7 @@
+ from distutils.command.install_lib import install_lib
+
+ # This global variable is used to hold the list of modules to be disabled.
+-disabled_module_list = []
++disabled_module_list = ["zlib","_hashlib","_ssl","_bsddb","_sqlite3","_tkinter","bz2","gdbm","readline","_curses","_curses_panel"]
+
+ def add_dir_to_list(dirlist, dir):
+ """Add the directory 'dir' to the list 'dirlist' (at the front) if
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080222/20070700/attachment-0001.html
More information about the macports-changes
mailing list