2006-02-23 15:26:10 +00:00
|
|
|
diff -Nru Python-2.4.2.orig/Lib/cgi.py Python-2.4.2/Lib/cgi.py
|
|
|
|
|
--- Python-2.4.2.orig/Lib/cgi.py 2005-09-28 18:54:08.000000000 +0200
|
|
|
|
|
+++ Python-2.4.2/Lib/cgi.py 2005-09-28 18:54:29.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.2.orig/Modules/Setup.dist Python-2.4.2/Modules/Setup.dist
|
|
|
|
|
--- Python-2.4.2.orig/Modules/Setup.dist 2005-09-28 18:54:10.000000000 +0200
|
|
|
|
|
+++ Python-2.4.2/Modules/Setup.dist 2005-09-28 18:54:29.000000000 +0200
|
|
|
|
|
@@ -147,7 +147,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
|
|
|
|
|
@@ -157,7 +157,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):
|
|
|
|
|
@@ -349,9 +349,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.
|
|
|
|
|
@@ -376,13 +376,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.
|
|
|
|
|
@@ -397,11 +397,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
|
2006-02-24 08:54:10 +00:00
|
|
|
+DBLIBVER=4.4
|
2006-02-23 15:26:10 +00:00
|
|
|
+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.2.orig/configure Python-2.4.2/configure
|
|
|
|
|
--- Python-2.4.2.orig/configure 2005-09-28 18:54:09.000000000 +0200
|
|
|
|
|
+++ Python-2.4.2/configure 2005-09-28 18:54:29.000000000 +0200
|
|
|
|
|
@@ -3743,7 +3743,7 @@
|
|
|
|
|
# debug builds.
|
|
|
|
|
OPT="-g -Wall -Wstrict-prototypes"
|
|
|
|
|
else
|
|
|
|
|
- OPT="-g -O3 -Wall -Wstrict-prototypes"
|
|
|
|
|
+ OPT="$CFLAGS -Wall -Wstrict-prototypes"
|
|
|
|
|
fi
|
|
|
|
|
;;
|
|
|
|
|
*)
|
