Author: jue Date: 2006-10-20 07:17:59 +0200 (Fri, 20 Oct 2006) New Revision: 2372 Added: crux-2.2/ports/opt/python/python-2.4.4.patch Removed: crux-2.2/ports/opt/python/python-2.4.3.patch Modified: crux-2.2/ports/opt/python/.footprint crux-2.2/ports/opt/python/.md5sum crux-2.2/ports/opt/python/Pkgfile Log: python: update to 2.4.4 Modified: crux-2.2/ports/opt/python/.footprint =================================================================== --- crux-2.2/ports/opt/python/.footprint 2006-10-20 00:19:39 UTC (rev 2371) +++ crux-2.2/ports/opt/python/.footprint 2006-10-20 05:17:59 UTC (rev 2372) @@ -8,6 +8,7 @@ drwxr-xr-x root/root usr/include/ lrwxrwxrwx root/root usr/include/python -> python2.4 drwxr-xr-x root/root usr/include/python2.4/ +-rw-r--r-- root/root usr/include/python2.4/Python-ast.h (EMPTY) -rw-r--r-- root/root usr/include/python2.4/Python.h -rw-r--r-- root/root usr/include/python2.4/abstract.h -rw-r--r-- root/root usr/include/python2.4/bitset.h @@ -1723,6 +1724,7 @@ -rw-r--r-- root/root usr/lib/python2.4/test/seq_tests.py -rw-r--r-- root/root usr/lib/python2.4/test/seq_tests.pyc -rw-r--r-- root/root usr/lib/python2.4/test/seq_tests.pyo +-rw-r--r-- root/root usr/lib/python2.4/test/sgml_input.html -rw-r--r-- root/root usr/lib/python2.4/test/sortperf.py -rw-r--r-- root/root usr/lib/python2.4/test/sortperf.pyc -rw-r--r-- root/root usr/lib/python2.4/test/sortperf.pyo @@ -2632,6 +2634,9 @@ -rw-r--r-- root/root usr/lib/python2.4/test/tf_inherit_check.py -rw-r--r-- root/root usr/lib/python2.4/test/tf_inherit_check.pyc -rw-r--r-- root/root usr/lib/python2.4/test/tf_inherit_check.pyo +-rw-r--r-- root/root usr/lib/python2.4/test/threaded_import_hangers.py +-rw-r--r-- root/root usr/lib/python2.4/test/threaded_import_hangers.pyc +-rw-r--r-- root/root usr/lib/python2.4/test/threaded_import_hangers.pyo -rw-r--r-- root/root usr/lib/python2.4/test/tokenize_tests.txt -rw-r--r-- root/root usr/lib/python2.4/test/xmltests.py -rw-r--r-- root/root usr/lib/python2.4/test/xmltests.pyc Modified: crux-2.2/ports/opt/python/.md5sum =================================================================== --- crux-2.2/ports/opt/python/.md5sum 2006-10-20 00:19:39 UTC (rev 2371) +++ crux-2.2/ports/opt/python/.md5sum 2006-10-20 05:17:59 UTC (rev 2372) @@ -1,2 +1,2 @@ -141c683447d5e76be1d2bd4829574f02 Python-2.4.3.tar.bz2 -a54587fd362438b02bc6ab8bdf0e7757 python-2.4.3.patch +0ba90c79175c017101100ebf5978e906 Python-2.4.4.tar.bz2 +8106a7ca44a265743c66c83b7ad477fe python-2.4.4.patch Modified: crux-2.2/ports/opt/python/Pkgfile =================================================================== --- crux-2.2/ports/opt/python/Pkgfile 2006-10-20 00:19:39 UTC (rev 2371) +++ crux-2.2/ports/opt/python/Pkgfile 2006-10-20 05:17:59 UTC (rev 2372) @@ -4,8 +4,8 @@ # Depends on: db, gdbm, ncurses, openssl, readline, zlib name=python -version=2.4.3 -release=2 +version=2.4.4 +release=1 source=(http://www.python.org/ftp/$name/$version/Python-$version.tar.bz2 \ $name-$version.patch) Deleted: crux-2.2/ports/opt/python/python-2.4.3.patch =================================================================== --- crux-2.2/ports/opt/python/python-2.4.3.patch 2006-10-20 00:19:39 UTC (rev 2371) +++ crux-2.2/ports/opt/python/python-2.4.3.patch 2006-10-20 05:17:59 UTC (rev 2372) @@ -1,87 +0,0 @@ -diff -Nru Python-2.4.3.orig/Lib/cgi.py Python-2.4.3/Lib/cgi.py ---- Python-2.4.3.orig/Lib/cgi.py 2006-03-30 09:23:03.000000000 +0200 -+++ Python-2.4.3/Lib/cgi.py 2006-03-30 09:23:19.000000000 +0200 -@@ -1,4 +1,4 @@ --#! /usr/local/bin/python -+#! /usr/bin/python - - # NOTE: the above "/usr/local/bin/python" is NOT a mistake. It is - # intentionally NOT "/usr/bin/env python". On many systems -diff -Nru Python-2.4.3.orig/Modules/Setup.dist Python-2.4.3/Modules/Setup.dist ---- Python-2.4.3.orig/Modules/Setup.dist 2006-03-30 09:23:03.000000000 +0200 -+++ Python-2.4.3/Modules/Setup.dist 2006-03-30 09:23:19.000000000 +0200 -@@ -149,7 +149,7 @@ - # modules are to be built as shared libraries (see above for more - # detail; also note that *static* reverses this effect): - --#*shared* -+*shared* - - # GNU readline. Unlike previous Python incarnations, GNU readline is - # now incorporated in an optional module, configured in the Setup file -@@ -159,7 +159,7 @@ - # it, depending on your system -- see the GNU readline instructions. - # It's okay for this to be a shared library, too. - --#readline readline.c -lreadline -ltermcap -+readline readline.c -lreadline -lncurses - - - # Modules that should always be present (non UNIX dependent): -@@ -350,9 +350,9 @@ - # - # First, look at Setup.config; configure may have set this for you. - --#_curses _cursesmodule.c -lcurses -ltermcap -+_curses _cursesmodule.c -lncurses - # Wrapper for the panel library that's part of ncurses and SYSV curses. --#_curses_panel _curses_panel.c -lpanel -lncurses -+_curses_panel _curses_panel.c -lpanel -lncurses - - - # Generic (SunOS / SVR4) dynamic loading module. -@@ -377,13 +377,13 @@ - # - # First, look at Setup.config; configure may have set this for you. - --#dbm dbmmodule.c # dbm(3) may require -lndbm or similar -+dbm dbmmodule.c -DHAVE_NDBM_H -lgdbm_compat -lgdbm # dbm(3) may require -lndbm or similar - - # Anthony Baxter's gdbm module. GNU dbm(3) will require -lgdbm: - # - # First, look at Setup.config; configure may have set this for you. - --#gdbm gdbmmodule.c -I/usr/local/include -L/usr/local/lib -lgdbm -+gdbm gdbmmodule.c -lgdbm - - - # Sleepycat Berkeley DB interface. -@@ -398,11 +398,11 @@ - # - # Edit the variables DB and DBLIBVERto point to the db top directory - # and the subdirectory of PORT where you built it. --#DB=/usr/local/BerkeleyDB.4.0 --#DBLIBVER=4.0 --#DBINC=$(DB)/include --#DBLIB=$(DB)/lib --#_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER) -+DB=/usr -+DBLIBVER=4.4 -+DBINC=$(DB)/include -+DBLIB=$(DB)/lib -+_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER) - - # Historical Berkeley DB 1.85 - # -diff -Nru Python-2.4.3.orig/configure Python-2.4.3/configure ---- Python-2.4.3.orig/configure 2006-03-30 09:23:03.000000000 +0200 -+++ Python-2.4.3/configure 2006-03-30 09:23:19.000000000 +0200 -@@ -3752,7 +3752,7 @@ - # debug builds. - OPT="-g -Wall -Wstrict-prototypes" - else -- OPT="-g -O3 -Wall -Wstrict-prototypes" -+ OPT="$CFLAGS -Wall -Wstrict-prototypes" - fi - ;; - *) Added: crux-2.2/ports/opt/python/python-2.4.4.patch =================================================================== --- crux-2.2/ports/opt/python/python-2.4.4.patch (rev 0) +++ crux-2.2/ports/opt/python/python-2.4.4.patch 2006-10-20 05:17:59 UTC (rev 2372) @@ -0,0 +1,87 @@ +diff -Nru Python-2.4.4.orig/Lib/cgi.py Python-2.4.4/Lib/cgi.py +--- Python-2.4.4.orig/Lib/cgi.py 2006-10-19 19:31:02.000000000 +0200 ++++ Python-2.4.4/Lib/cgi.py 2006-10-19 19:31:15.000000000 +0200 +@@ -1,4 +1,4 @@ +-#! /usr/local/bin/python ++#! /usr/bin/python + + # NOTE: the above "/usr/local/bin/python" is NOT a mistake. It is + # intentionally NOT "/usr/bin/env python". On many systems +diff -Nru Python-2.4.4.orig/Modules/Setup.dist Python-2.4.4/Modules/Setup.dist +--- Python-2.4.4.orig/Modules/Setup.dist 2006-10-19 19:31:02.000000000 +0200 ++++ Python-2.4.4/Modules/Setup.dist 2006-10-19 19:31:15.000000000 +0200 +@@ -149,7 +149,7 @@ + # modules are to be built as shared libraries (see above for more + # detail; also note that *static* reverses this effect): + +-#*shared* ++*shared* + + # GNU readline. Unlike previous Python incarnations, GNU readline is + # now incorporated in an optional module, configured in the Setup file +@@ -159,7 +159,7 @@ + # it, depending on your system -- see the GNU readline instructions. + # It's okay for this to be a shared library, too. + +-#readline readline.c -lreadline -ltermcap ++readline readline.c -lreadline -lncurses + + + # Modules that should always be present (non UNIX dependent): +@@ -350,9 +350,9 @@ + # + # First, look at Setup.config; configure may have set this for you. + +-#_curses _cursesmodule.c -lcurses -ltermcap ++_curses _cursesmodule.c -lncurses + # Wrapper for the panel library that's part of ncurses and SYSV curses. +-#_curses_panel _curses_panel.c -lpanel -lncurses ++_curses_panel _curses_panel.c -lpanel -lncurses + + + # Generic (SunOS / SVR4) dynamic loading module. +@@ -377,13 +377,13 @@ + # + # First, look at Setup.config; configure may have set this for you. + +-#dbm dbmmodule.c # dbm(3) may require -lndbm or similar ++dbm dbmmodule.c -DHAVE_NDBM_H -lgdbm_compat -lgdbm # dbm(3) may require -lndbm or similar + + # Anthony Baxter's gdbm module. GNU dbm(3) will require -lgdbm: + # + # First, look at Setup.config; configure may have set this for you. + +-#gdbm gdbmmodule.c -I/usr/local/include -L/usr/local/lib -lgdbm ++gdbm gdbmmodule.c -lgdbm + + + # Sleepycat Berkeley DB interface. +@@ -398,11 +398,11 @@ + # + # Edit the variables DB and DBLIBVERto point to the db top directory + # and the subdirectory of PORT where you built it. +-#DB=/usr/local/BerkeleyDB.4.0 +-#DBLIBVER=4.0 +-#DBINC=$(DB)/include +-#DBLIB=$(DB)/lib +-#_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER) ++DB=/usr ++DBLIBVER=4.4 ++DBINC=$(DB)/include ++DBLIB=$(DB)/lib ++_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER) + + # Historical Berkeley DB 1.85 + # +diff -Nru Python-2.4.4.orig/configure Python-2.4.4/configure +--- Python-2.4.4.orig/configure 2006-10-19 19:31:02.000000000 +0200 ++++ Python-2.4.4/configure 2006-10-19 19:31:15.000000000 +0200 +@@ -3822,7 +3822,7 @@ + # debug builds. + OPT="-g -Wall -Wstrict-prototypes" + else +- OPT="-g -O3 -Wall -Wstrict-prototypes" ++ OPT="$CFLAGS -Wall -Wstrict-prototypes" + fi + ;; + *)