Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/languages
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv31035
Modified Files:
python25-10.6.info python25-10.6.patch python25.info
python25.patch python26.info python26.patch
Log Message:
version-updates
Index: python25-10.6.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/languages/python25-10.6.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- python25-10.6.patch 16 Jan 2010 23:18:40 -0000 1.1
+++ python25-10.6.patch 14 Oct 2010 05:13:57 -0000 1.2
@@ -129,6 +129,21 @@
};
static int
+diff -Nurd -x'*~' Python-2.5.5.orig/Modules/mmapmodule.c
Python-2.5.5/Modules/mmapmodule.c
+--- Python-2.5.5.orig/Modules/mmapmodule.c 2008-07-31 18:08:14.000000000
+0100
++++ Python-2.5.5/Modules/mmapmodule.c 2010-05-14 15:24:55.000000000 +0100
+@@ -55,6 +55,11 @@
+ #include <sys/types.h>
+ #endif /* HAVE_SYS_TYPES_H */
+
++/* Force inclusion of fcntl.h, seems to be broken on MacOS 10.6. */
++#ifndef _SYS_FCNTL_H_
++#include <sys/fcntl.h>
++#endif /* _SYS_FCNTL_H_ */
++
+ /* Prefer MAP_ANONYMOUS since MAP_ANON is deprecated according to man page. */
+ #if !defined(MAP_ANONYMOUS) && defined(MAP_ANON)
+ # define MAP_ANONYMOUS MAP_ANON
diff -Nurd -x'*~' Python-2.5.4.orig/configure Python-2.5.4/configure
--- Python-2.5.4.orig/configure 2008-12-13 09:13:52.000000000 -0500
+++ Python-2.5.4/configure 2009-03-17 01:53:23.000000000 -0400
Index: python25.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/languages/python25.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- python25.patch 10 May 2009 05:24:44 -0000 1.2
+++ python25.patch 14 Oct 2010 05:13:57 -0000 1.3
@@ -43,6 +43,21 @@
if (environ == NULL)
environ = *_NSGetEnviron();
#endif
+diff -Nurd -x'*~' Python-2.5.5.orig/Modules/mmapmodule.c
Python-2.5.5/Modules/mmapmodule.c
+--- Python-2.5.5.orig/Modules/mmapmodule.c 2008-07-31 18:08:14.000000000
+0100
++++ Python-2.5.5/Modules/mmapmodule.c 2010-05-14 15:24:55.000000000 +0100
+@@ -55,6 +55,11 @@
+ #include <sys/types.h>
+ #endif /* HAVE_SYS_TYPES_H */
+
++/* Force inclusion of fcntl.h, seems to be broken on MacOS 10.6. */
++#ifndef _SYS_FCNTL_H_
++#include <sys/fcntl.h>
++#endif /* _SYS_FCNTL_H_ */
++
+ /* Prefer MAP_ANONYMOUS since MAP_ANON is deprecated according to man page. */
+ #if !defined(MAP_ANONYMOUS) && defined(MAP_ANON)
+ # define MAP_ANONYMOUS MAP_ANON
diff -Nurd -x'*~' Python-2.5.4.orig/configure Python-2.5.4/configure
--- Python-2.5.4.orig/configure 2008-12-13 09:13:52.000000000 -0500
+++ Python-2.5.4/configure 2009-03-17 01:53:23.000000000 -0400
Index: python26.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/languages/python26.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- python26.patch 9 Feb 2010 20:11:33 -0000 1.2
+++ python26.patch 14 Oct 2010 05:13:57 -0000 1.3
@@ -1,6 +1,67 @@
-diff -Nurd -x'*~' Python-2.6.4.orig/Makefile.pre.in
Python-2.6.4/Makefile.pre.in
---- Python-2.6.4.orig/Makefile.pre.in 2009-09-24 15:22:45.000000000 -0400
-+++ Python-2.6.4/Makefile.pre.in 2009-12-10 23:56:21.000000000 -0500
+diff -Nurd -x'*~' Python-2.6.6.orig/Lib/bsddb/test/test_basics.py
Python-2.6.6/Lib/bsddb/test/test_basics.py
+--- Python-2.6.6.orig/Lib/bsddb/test/test_basics.py 2010-08-02
16:19:21.000000000 -0400
++++ Python-2.6.6/Lib/bsddb/test/test_basics.py 2010-10-10 14:06:05.000000000
-0400
+@@ -1000,11 +1000,12 @@
+ # # See http://bugs.python.org/issue3307
+ # self.assertRaises(db.DBInvalidArgError, db.DB, None, 65535)
+
+- def test02_DBEnv_dealloc(self):
+- # http://bugs.python.org/issue3885
+- import gc
+- self.assertRaises(db.DBInvalidArgError, db.DBEnv, ~db.DB_RPCCLIENT)
+- gc.collect()
++ if db.version() < (4, 8) :
++ def test02_DBEnv_dealloc(self):
++ # http://bugs.python.org/issue3885
++ import gc
++ self.assertRaises(db.DBInvalidArgError, db.DBEnv,
~db.DB_RPCCLIENT)
++ gc.collect()
+
+
+ #----------------------------------------------------------------------
+diff -Nurd -x'*~'
Python-2.6.6.orig/Lib/bsddb/test/test_distributed_transactions.py
Python-2.6.6/Lib/bsddb/test/test_distributed_transactions.py
+--- Python-2.6.6.orig/Lib/bsddb/test/test_distributed_transactions.py
2008-08-31 10:00:51.000000000 -0400
++++ Python-2.6.6/Lib/bsddb/test/test_distributed_transactions.py
2010-10-10 14:06:05.000000000 -0400
+@@ -35,7 +35,7 @@
+ db.DB_INIT_TXN | db.DB_INIT_LOG | db.DB_INIT_MPOOL |
+ db.DB_INIT_LOCK, 0666)
+ self.db = db.DB(self.dbenv)
+- self.db.set_re_len(db.DB_XIDDATASIZE)
++ self.db.set_re_len(db.DB_GID_SIZE)
+ if must_open_db :
+ if db.version() > (4,1) :
+ txn=self.dbenv.txn_begin()
+@@ -76,7 +76,7 @@
+ # let them be garbage collected.
+ for i in xrange(self.num_txns) :
+ txn = self.dbenv.txn_begin()
+- gid = "%%%dd" %db.DB_XIDDATASIZE
++ gid = "%%%dd" %db.DB_GID_SIZE
+ gid = adapt(gid %i)
+ self.db.put(i, gid, txn=txn, flags=db.DB_APPEND)
+ txns.add(gid)
+diff -Nurd -x'*~' Python-2.6.6.orig/Lib/platform.py
Python-2.6.6/Lib/platform.py
+--- Python-2.6.6.orig/Lib/platform.py 2010-08-03 04:09:15.000000000 -0400
++++ Python-2.6.6/Lib/platform.py 2010-10-10 14:22:01.000000000 -0400
+@@ -730,7 +730,14 @@
+ import gestalt
+ import MacOS
+ except ImportError:
+- return None
++ import posix
++ major,minor,patch=string.split(posix.uname()[2],'.')
++ release = '%s.%s.%s' %('10',int(major)-4, minor)
++ if posix.uname()[4]=='Power Macintosh':
++ machine='PowerPC'
++ else:
++ machine='i386'
++ return release,versioninfo,machine
+ # Get the infos
+ sysv,sysa = _mac_ver_lookup(('sysv','sysa'))
+ # Decode the infos
+diff -Nurd -x'*~' Python-2.6.6.orig/Makefile.pre.in
Python-2.6.6/Makefile.pre.in
+--- Python-2.6.6.orig/Makefile.pre.in 2010-08-01 18:05:31.000000000 -0400
++++ Python-2.6.6/Makefile.pre.in 2010-10-10 14:06:05.000000000 -0400
@@ -419,8 +419,7 @@
fi
@@ -40,9 +101,9 @@
fi \
fi; \
else true; \
-diff -Nurd -x'*~' Python-2.6.4.orig/Misc/python-config.in
Python-2.6.4/Misc/python-config.in
---- Python-2.6.4.orig/Misc/python-config.in 2007-03-31 14:56:11.000000000
-0400
-+++ Python-2.6.4/Misc/python-config.in 2009-12-10 23:56:21.000000000 -0500
+diff -Nurd -x'*~' Python-2.6.6.orig/Misc/python-config.in
Python-2.6.6/Misc/python-config.in
+--- Python-2.6.6.orig/Misc/python-config.in 2007-03-31 14:56:11.000000000
-0400
++++ Python-2.6.6/Misc/python-config.in 2010-10-10 14:06:05.000000000 -0400
@@ -45,9 +45,9 @@
elif opt in ('--libs', '--ldflags'):
libs = getvar('LIBS').split() + getvar('SYSLIBS').split()
@@ -56,9 +117,117 @@
libs.insert(0, '-L' + getvar('LIBPL'))
print ' '.join(libs)
-diff -Nurd -x'*~' Python-2.6.4.orig/Modules/posixmodule.c
Python-2.6.4/Modules/posixmodule.c
---- Python-2.6.4.orig/Modules/posixmodule.c 2009-09-16 16:06:36.000000000
-0400
-+++ Python-2.6.4/Modules/posixmodule.c 2009-12-10 23:56:21.000000000 -0500
+diff -Nurd -x'*~' Python-2.6.6.orig/Modules/_bsddb.c
Python-2.6.6/Modules/_bsddb.c
+--- Python-2.6.6.orig/Modules/_bsddb.c 2010-05-09 11:15:40.000000000 -0400
++++ Python-2.6.6/Modules/_bsddb.c 2010-10-10 14:06:05.000000000 -0400
+@@ -215,6 +215,10 @@
+ #define DB_BUFFER_SMALL ENOMEM
+ #endif
+
++#if (DBVER < 48)
++#define DB_GID_SIZE DB_XIDDATASIZE
++#endif
++
+
+ /* --------------------------------------------------------------------- */
+ /* Structure definitions */
+@@ -4501,7 +4505,11 @@
+ DBTxnObject *txn;
+ #define PREPLIST_LEN 16
+ DB_PREPLIST preplist[PREPLIST_LEN];
++#if (DBVER < 48)
+ long retp;
++#else
++ u_int32_t retp;
++#endif
+
+ CHECK_ENV_NOT_CLOSED(self);
+
+@@ -4522,7 +4530,7 @@
+ flags=DB_NEXT; /* Prepare for next loop pass */
+ for (i=0; i<retp; i++) {
+ gid=PyBytes_FromStringAndSize((char *)(preplist[i].gid),
+- DB_XIDDATASIZE);
++ DB_GID_SIZE);
+ if (!gid) {
+ Py_DECREF(list);
+ return NULL;
+@@ -5047,6 +5055,7 @@
+ }
+
+
++#if (DBVER < 48)
+ static PyObject*
+ DBEnv_set_rpc_server(DBEnvObject* self, PyObject* args, PyObject* kwargs)
+ {
+@@ -5068,6 +5077,7 @@
+ RETURN_IF_ERR();
+ RETURN_NONE();
+ }
++#endif
+
+ static PyObject*
+ DBEnv_set_verbose(DBEnvObject* self, PyObject* args)
+@@ -5949,9 +5959,9 @@
+ if (!PyArg_ParseTuple(args, "s#:prepare", &gid, &gid_size))
+ return NULL;
+
+- if (gid_size != DB_XIDDATASIZE) {
++ if (gid_size != DB_GID_SIZE) {
+ PyErr_SetString(PyExc_TypeError,
+- "gid must be DB_XIDDATASIZE bytes long");
++ "gid must be DB_GID_SIZE bytes long");
+ return NULL;
+ }
+
+@@ -6541,8 +6551,10 @@
+ #endif
+ {"set_get_returns_none",(PyCFunction)DBEnv_set_get_returns_none,
METH_VARARGS},
+ {"txn_recover", (PyCFunction)DBEnv_txn_recover, METH_NOARGS},
++#if (DBVER < 48)
+ {"set_rpc_server", (PyCFunction)DBEnv_set_rpc_server,
+ METH_VARARGS||METH_KEYWORDS},
++#endif
+ {"set_verbose", (PyCFunction)DBEnv_set_verbose, METH_VARARGS},
+ #if (DBVER >= 42)
+ {"get_verbose", (PyCFunction)DBEnv_get_verbose, METH_VARARGS},
+@@ -7091,6 +7103,7 @@
+ ADD_INT(d, DB_MAX_PAGES);
+ ADD_INT(d, DB_MAX_RECORDS);
+
++#if (DBVER < 48)
+ #if (DBVER >= 42)
+ ADD_INT(d, DB_RPCCLIENT);
+ #else
+@@ -7098,7 +7111,11 @@
+ /* allow apps to be written using DB_RPCCLIENT on older Berkeley DB */
+ _addIntToDict(d, "DB_RPCCLIENT", DB_CLIENT);
+ #endif
++#endif
++
++#if (DBVER < 48)
+ ADD_INT(d, DB_XA_CREATE);
++#endif
+
+ ADD_INT(d, DB_CREATE);
+ ADD_INT(d, DB_NOMMAP);
+@@ -7115,7 +7132,13 @@
+ ADD_INT(d, DB_INIT_TXN);
+ ADD_INT(d, DB_JOINENV);
+
++#if (DBVER >= 48)
++ ADD_INT(d, DB_GID_SIZE);
++#else
+ ADD_INT(d, DB_XIDDATASIZE);
++ /* Allow new code to work in old BDB releases */
++ _addIntToDict(d, "DB_GID_SIZE", DB_XIDDATASIZE);
++#endif
+
+ ADD_INT(d, DB_RECOVER);
+ ADD_INT(d, DB_RECOVER_FATAL);
+diff -Nurd -x'*~' Python-2.6.6.orig/Modules/posixmodule.c
Python-2.6.6/Modules/posixmodule.c
+--- Python-2.6.6.orig/Modules/posixmodule.c 2010-07-24 06:05:19.000000000
-0400
++++ Python-2.6.6/Modules/posixmodule.c 2010-10-10 14:18:05.000000000 -0400
@@ -361,7 +361,7 @@
#endif
@@ -68,19 +237,19 @@
/* On Darwin/MacOSX a shared library or framework has no access to
** environ directly, we must obtain it with _NSGetEnviron().
*/
-@@ -379,7 +379,7 @@
- d = PyDict_New();
- if (d == NULL)
- return NULL;
+@@ -383,7 +383,7 @@
+ d = PyDict_New();
+ if (d == NULL)
+ return NULL;
-#ifdef WITH_NEXT_FRAMEWORK
-+#ifdef __APPLE__
- if (environ == NULL)
- environ = *_NSGetEnviron();
++#ifdef __APPLE__ /* need to include shared-lib build setup for apple too */
+ if (environ == NULL)
+ environ = *_NSGetEnviron();
#endif
-diff -Nurd -x'*~' Python-2.6.4.orig/configure Python-2.6.4/configure
---- Python-2.6.4.orig/configure 2009-09-29 09:01:59.000000000 -0400
-+++ Python-2.6.4/configure 2009-12-11 01:41:33.000000000 -0500
-@@ -4156,7 +4156,7 @@
+diff -Nurd -x'*~' Python-2.6.6.orig/configure Python-2.6.6/configure
+--- Python-2.6.6.orig/configure 2010-05-24 22:27:03.000000000 -0400
++++ Python-2.6.6/configure 2010-10-10 14:06:05.000000000 -0400
+@@ -4771,7 +4771,7 @@
;;
Darwin*)
LDLIBRARY='libpython$(VERSION).dylib'
@@ -89,17 +258,17 @@
RUNSHARED='DYLD_LIBRARY_PATH=`pwd`:${DYLD_LIBRARY_PATH}'
;;
-@@ -13063,7 +13063,8 @@
+@@ -7228,7 +7228,8 @@
fi
LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs -arch_only
${MACOSX_DEFAULT_ARCH}"
- LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name
$(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
-+ LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -framework CoreFoundation"
++ LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -Wl,-framework,CoreFoundation"
+ LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name
$(BINLIBDEST)/config/$(INSTSONAME)'
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION)
-current_version $(VERSION)';;
esac
-@@ -13207,14 +13208,6 @@
+@@ -7366,14 +7367,6 @@
# Use -undefined dynamic_lookup whenever possible (10.3 and
later).
# This allows an extension to be used in any Python
@@ -114,7 +283,7 @@
LDSHARED='$(CC) $(LDFLAGS) -bundle'
if test "$enable_framework" ; then
# Link against the framework. All externals
should be defined.
-@@ -13222,10 +13215,9 @@
+@@ -7381,10 +7374,9 @@
LDSHARED="$LDSHARED
"'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
else
# No framework, use the Python app as
bundle-loader
@@ -127,10 +296,19 @@
;;
Linux*|GNU*|QNX*) LDSHARED='$(CC) -shared';;
BSD/OS*/4*) LDSHARED="gcc -shared";;
-diff -Nurd -x'*~' Python-2.6.4.orig/setup.py Python-2.6.4/setup.py
---- Python-2.6.4.orig/setup.py 2009-10-08 05:48:32.000000000 -0400
-+++ Python-2.6.4/setup.py 2009-12-10 23:56:21.000000000 -0500
-@@ -214,12 +214,16 @@
+@@ -12845,7 +12837,7 @@
+
+ if test $ac_sys_system = Darwin
+ then
+- LIBS="$LIBS -framework CoreFoundation"
++ LIBS="$LIBS -Wl,-framework,CoreFoundation"
+ fi
+
+
+diff -Nurd -x'*~' Python-2.6.6.orig/setup.py Python-2.6.6/setup.py
+--- Python-2.6.6.orig/setup.py 2010-07-17 08:31:09.000000000 -0400
++++ Python-2.6.6/setup.py 2010-10-10 14:24:51.000000000 -0400
+@@ -260,12 +260,16 @@
longest, g)
if missing:
@@ -147,7 +325,7 @@
if self.failed:
failed = self.failed[:]
-@@ -227,6 +231,7 @@
+@@ -273,6 +277,7 @@
print "Failed to build these modules:"
print_three_column(failed)
print
@@ -155,7 +333,7 @@
def build_extension(self, ext):
-@@ -309,9 +314,8 @@
+@@ -355,9 +360,8 @@
return sys.platform
def detect_modules(self):
@@ -167,7 +345,7 @@
# Add paths specified in the environment variables LDFLAGS and
# CPPFLAGS for header and library files.
-@@ -614,10 +618,9 @@
+@@ -691,10 +695,9 @@
depends = ['socketmodule.h']) )
# Detect SSL support for the socket module (via _ssl)
search_for_ssl_incs_in = [
@@ -180,7 +358,7 @@
search_for_ssl_incs_in
)
if ssl_incs is not None:
-@@ -625,9 +628,8 @@
+@@ -702,9 +705,8 @@
['/usr/kerberos/include'])
if krb5_h:
ssl_incs += krb5_h
@@ -192,16 +370,25 @@
] )
if (ssl_incs is not None and
-@@ -644,7 +646,7 @@
- openssl_ver = 0
- openssl_ver_re = re.compile(
- '^\s*#\s*define\s+OPENSSL_VERSION_NUMBER\s+(0x[0-9a-fA-F]+)' )
-- for ssl_inc_dir in inc_dirs + search_for_ssl_incs_in:
-+ for ssl_inc_dir in search_for_ssl_incs_in:
- name = os.path.join(ssl_inc_dir, 'openssl', 'opensslv.h')
- if os.path.isfile(name):
- try:
-@@ -741,50 +743,9 @@
+@@ -724,7 +726,7 @@
+
+ # look for the openssl version header on the compiler search path.
+ opensslv_h = find_file('openssl/opensslv.h', [],
+- inc_dirs + search_for_ssl_incs_in)
++ search_for_ssl_incs_in)
+ if opensslv_h:
+ name = os.path.join(opensslv_h[0], 'openssl/opensslv.h')
+ if sys.platform == 'darwin' and is_macosx_sdk_path(name):
+@@ -782,7 +784,7 @@
+ # a release. Most open source OSes come with one or more
+ # versions of BerkeleyDB already installed.
+
+- max_db_ver = (4, 7)
++ max_db_ver = (4, 8)
+ min_db_ver = (3, 3)
+ db_setup_debug = False # verbose debug prints from this script?
+
+@@ -818,50 +820,9 @@
# construct a list of paths to look for the header file in on
# top of the normal inc_dirs.
db_inc_paths = [
@@ -253,7 +440,7 @@
db_inc_paths = [p for p in db_inc_paths if os.path.exists(p)]
db_ver_inc_map = {}
-@@ -889,12 +850,7 @@
+@@ -987,12 +948,7 @@
# We hunt for #define SQLITE_VERSION "n.n.n"
# We need to find >= sqlite version 3.0.8
sqlite_incdir = sqlite_libdir = None
@@ -267,16 +454,16 @@
]
MIN_SQLITE_VERSION_NUMBER = (3, 0, 8)
MIN_SQLITE_VERSION = ".".join([str(x)
-@@ -903,7 +859,7 @@
- # Scan the default include directories before the SQLite specific
- # ones. This allows one to override the copy of sqlite on OSX,
- # where /usr/include contains an old version of sqlite.
+@@ -1004,7 +960,7 @@
+ if sys.platform == 'darwin':
+ sysroot = macosx_sdk_root()
+
- for d in inc_dirs + sqlite_inc_paths:
+ for d in sqlite_inc_paths:
f = os.path.join(d, "sqlite3.h")
- if os.path.exists(f):
- if sqlite_setup_debug: print "sqlite: found %s"%f
-@@ -931,11 +887,9 @@
+
+ if sys.platform == 'darwin' and is_macosx_sdk_path(d):
+@@ -1036,11 +992,9 @@
sqlite_dirs_to_check = [
os.path.join(sqlite_incdir, '..', 'lib64'),
os.path.join(sqlite_incdir, '..', 'lib'),
@@ -289,7 +476,23 @@
if sqlite_libfile:
sqlite_libdir =
[os.path.abspath(os.path.dirname(sqlite_libfile))]
-@@ -1542,16 +1496,12 @@
+@@ -1199,6 +1153,7 @@
+ panel_library = 'panelw'
+ curses_libs = [curses_library]
+ exts.append( Extension('_curses', ['_cursesmodule.c'],
++ include_dirs=["@PREFIX@/include/ncursesw"],
+ libraries = curses_libs) )
+ elif curses_library == 'curses' and platform != 'darwin':
+ # OSX has an old Berkeley curses, not good enough for
+@@ -1219,6 +1174,7 @@
+ if (module_enabled(exts, '_curses') and
+ self.compiler.find_library_file(lib_dirs, panel_library)):
+ exts.append( Extension('_curses_panel', ['_curses_panel.c'],
++ include_dirs=["@PREFIX@/include/ncursesw"],
+ libraries = [panel_library] + curses_libs)
)
+ else:
+ missing.append('_curses_panel')
+@@ -1667,16 +1623,12 @@
# AquaTk is a separate method. Only one Tkinter will be built on
# Darwin - either AquaTk, if it is found, or X11 based Tk.
platform = self.get_platform()
Index: python25-10.6.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/languages/python25-10.6.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- python25-10.6.info 16 Jan 2010 23:18:40 -0000 1.1
+++ python25-10.6.info 14 Oct 2010 05:13:57 -0000 1.2
@@ -1,8 +1,10 @@
-Package: python25
-Version: 2.5.4
-Revision: 102
+Info2: <<
+Package: python%type_pkg[python]
+Version: 2.5.5
+Revision: 103
Epoch: 1
Distribution: 10.6
+Type: python 2.5
Maintainer: Daniel Macks <dma...@netspace.org>
Conflicts: <<
python-nox (<= 2.2.1-8)
@@ -10,7 +12,7 @@
Replaces: <<
python (<= 2.2.1-8),
python-nox (<= 2.2.1-8),
- python25-socket, python25-socket-ssl
+ python%type_pkg[python]-socket, python%type_pkg[python]-socket-ssl
<<
Depends: <<
%N-shlibs (= %e:%v-%r),
@@ -18,7 +20,7 @@
bzip2-shlibs,
db44-aes-shlibs | db44-shlibs,
gdbm3-shlibs,
- libgettext3-shlibs,
+ libgettext8-shlibs,
libncursesw5-shlibs,
readline5-shlibs,
sqlite3-shlibs (>= 3.2.8-1001),
@@ -34,7 +36,7 @@
gdbm3,
gettext-bin,
gettext-tools,
- libgettext3-dev,
+ libgettext8-dev,
libjpeg,
libncurses5 (>= 5.4-20041023-1006),
libncursesw5,
@@ -44,12 +46,12 @@
tcltk-dev (>= 8.4.1-1),
x11-dev
<<
-Source: http://python.org/ftp/python/%v/Python-%v.tgz
-Source2: http://www.python.org/ftp/python/doc/%v/html-%v.zip
-Source-MD5: ad47b23778f64edadaaa8b5534986eed
+Source: http://python.org/ftp/python/%v/Python-%v.tar.bz2
+Source2: http://www.python.org/ftp/python/doc/2.5.4/html-2.5.4.zip
+Source-MD5: 1d00e2fb19418e486c30b850df625aa3
Source2-MD5: 64b4db34805109fcfd4ff528859c5a1b
PatchFile: %n-10.6.patch
-PatchFile-MD5: a9e4521dcee89e2090efd3d5adb43c70
+PatchFile-MD5: 0973471e11b951b6208ffe97cce69fc5
PatchScript: <<
sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
perl -pi -e 's|-Wno-long-double||' configure
@@ -81,63 +83,63 @@
perl -pi -e 's|-fno-common||g' %i/lib/python2.5/config/Makefile
# don't propagate our hackery
- perl -pi -e 's|-L%p/lib/system-openssl/lib||'
%i/lib/python2.5/config/Makefile
+ perl -pi -e 's|-L%p/lib/system-openssl/lib||'
%i/lib/python%type_raw[python]/config/Makefile
# fix all main things to be python-versioned filenames with
# unversioned symlinks to them
pushd %i/bin
- sed 's|%p/bin/python|%p/bin/python2.5|g' < idle > idle2.5
+ sed 's|%p/bin/python|%p/bin/python%type_raw[python]|g' < idle
> idle%type_raw[python]
rm idle
- chmod 755 idle2.5
- ln -s idle2.5 %i/bin/idle
+ chmod 755 idle%type_raw[python]
+ ln -s idle%type_raw[python] %i/bin/idle
- sed 's|%p/bin/python|%p/bin/python2.5|g' < pydoc > pydoc2.5
+ sed 's|%p/bin/python|%p/bin/python%type_raw[python]|g' < pydoc
> pydoc%type_raw[python]
rm pydoc
- chmod 755 pydoc2.5
- ln -s pydoc2.5 %i/bin/pydoc
+ chmod 755 pydoc%type_raw[python]
+ ln -s pydoc%type_raw[python] %i/bin/pydoc
- sed 's|%p/bin/python|%p/bin/python2.5|g' < smtpd.py >
smtpd.py2.5
+ sed 's|%p/bin/python|%p/bin/python%type_raw[python]|g' <
smtpd.py > smtpd.py%type_raw[python]
rm smtpd.py
- chmod 755 smtpd.py2.5
- ln -s smtpd.py2.5 %i/bin/smtpd.py
+ chmod 755 smtpd.py%type_raw[python]
+ ln -s smtpd.py%type_raw[python] %i/bin/smtpd.py
# was created as hard-link...why do they do that?
rm python
- ln -s python2.5 python
+ ln -s python%type_raw[python] python
popd
- /bin/mv %i/share/man/man1/python.1 %i/share/man/man1/python25.1
- ln -s python25.1 %i/share/man/man1/python.1
+ /bin/mv %i/share/man/man1/python.1
%i/share/man/man1/python%type_pkg[python]].1
+ ln -s python%type_pkg[python].1 %i/share/man/man1/python.1
# install some docs and other useful tidbits
rm -rf Misc/RPM
- /bin/cp -R Misc Tools %i/lib/python2.5
+ /bin/cp -R Misc Tools %i/lib/python%type_raw[python]
mkdir -p %i/share/doc/%n
/bin/cp -R Demo Doc %i/share/doc/%n
mkdir -p %i/share/doc/%n/html
- /bin/cp -R ../Python-Docs-%v/ %i/share/doc/%n/html
+ /bin/cp -R ../Python-Docs-2.5.4/ %i/share/doc/%n/html
<<
SplitOff: <<
Package: %N-shlibs
Replaces: python (<= 2.2.1-8), python-nox (<= 2.2.1-8)
- Files: lib/python2.5/config/libpython2.5.dylib
+ Files: lib/python%type_raw[python]/config/libpython%type_raw[python].dylib
Shlibs: %p/lib/python2.5/config/libpython2.5.dylib 2.5.0 %n (>= 2.5-1)
DocFiles: README LICENSE
<<
SplitOff2: <<
Package: python
- Depends: python25 (>= %e:%v-%r)
+ Depends: %N (>= %e:%v-%r)
Conflicts: python-nox
Replaces: python-nox, python25 (<< 1:2.5.1-3)
Files: <<
+ bin/idle
bin/python
bin/pydoc
- bin/idle
- bin/smtpd.py
bin/python-config
+ bin/smtpd.py
share/man/man1/python.1
<<
DocFiles: README LICENSE
- Description: Generic "python" command that invokes python25
+ Description: Generic "python" command that invokes python%type_pkg[python]
<<
DocFiles: README LICENSE
Description: Interpreted, object-oriented language
@@ -146,10 +148,10 @@
This package installs unix python - not the OSX Framework version.
Builds a two-level namespace dynamic libpython (needed for koffice).
- The interpretter is installed as "python2.5", and all associated
+ The interpretter is installed as "python%type_raw[python]", and all associated
commands are similarly named with the python-version in them. To get
the simple "python" command, install the fink package "python" (note:
- the "python" command there is not guaranteed to be python2.5!).
+ the "python" command there is not guaranteed to be python%type_raw[python]!).
<<
DescPackaging: <<
@@ -186,6 +188,11 @@
http://www.opensource.apple.com/source/python/python-44/2.5/fix/posixmodule.c.ed
Not broken on 10.[45] so not bothering to see if can be
backported to give unified %n pkg.
+
+ Fix 10.6 mmapmodule.c missing #include to get O_RDWR (compile
+ failure which doesn't abort build process!). Seems safe enough
+ keep in all distros' pkgs
<<
License: OSI-Approved
Homepage: http://www.python.org
+<<
Index: python25.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/languages/python25.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- python25.info 16 Jan 2010 23:18:40 -0000 1.6
+++ python25.info 14 Oct 2010 05:13:57 -0000 1.7
@@ -1,8 +1,10 @@
-Package: python25
-Version: 2.5.4
-Revision: 1
+Info2: <<
+Package: python%type_pkg[python]
+Version: 2.5.5
+Revision: 3
Epoch: 1
Distribution: 10.4, 10.5
+Type: python 2.5
Maintainer: Daniel Macks <dma...@netspace.org>
Conflicts: <<
python-nox (<= 2.2.1-8)
@@ -10,7 +12,7 @@
Replaces: <<
python (<= 2.2.1-8),
python-nox (<= 2.2.1-8),
- python25-socket, python25-socket-ssl
+ python%type_pkg[python]-socket, python%type_pkg[python]-socket-ssl
<<
Depends: <<
%N-shlibs (= %e:%v-%r),
@@ -18,7 +20,7 @@
bzip2-shlibs,
db44-aes-shlibs | db44-shlibs,
gdbm3-shlibs,
- libgettext3-shlibs,
+ libgettext8-shlibs,
libncursesw5-shlibs,
readline5-shlibs,
sqlite3-shlibs (>= 3.2.8-1001),
@@ -34,7 +36,7 @@
gdbm3,
gettext-bin,
gettext-tools,
- libgettext3-dev,
+ libgettext8-dev,
libjpeg,
libncurses5 (>= 5.4-20041023-1006),
libncursesw5,
@@ -44,12 +46,12 @@
tcltk-dev (>= 8.4.1-1),
x11-dev
<<
-Source: http://python.org/ftp/python/%v/Python-%v.tgz
-Source2: http://www.python.org/ftp/python/doc/%v/html-%v.zip
-Source-MD5: ad47b23778f64edadaaa8b5534986eed
+Source: http://python.org/ftp/python/%v/Python-%v.tar.bz2
+Source2: http://www.python.org/ftp/python/doc/2.5.4/html-2.5.4.zip
+Source-MD5: 1d00e2fb19418e486c30b850df625aa3
Source2-MD5: 64b4db34805109fcfd4ff528859c5a1b
PatchFile: %n.patch
-PatchFile-MD5: 0a2080a5ce7ced57baa4f126e6bd6e60
+PatchFile-MD5: b35316a349d3982919ab4f005b008000
PatchScript: <<
sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
perl -pi -e 's|-Wno-long-double||' configure
@@ -81,63 +83,63 @@
perl -pi -e 's|-fno-common||g' %i/lib/python2.5/config/Makefile
# don't propagate our hackery
- perl -pi -e 's|-L%p/lib/system-openssl/lib||'
%i/lib/python2.5/config/Makefile
+ perl -pi -e 's|-L%p/lib/system-openssl/lib||'
%i/lib/python%type_raw[python]/config/Makefile
# fix all main things to be python-versioned filenames with
# unversioned symlinks to them
pushd %i/bin
- sed 's|%p/bin/python|%p/bin/python2.5|g' < idle > idle2.5
+ sed 's|%p/bin/python|%p/bin/python%type_raw[python]|g' < idle
> idle%type_raw[python]
rm idle
- chmod 755 idle2.5
- ln -s idle2.5 %i/bin/idle
+ chmod 755 idle%type_raw[python]
+ ln -s idle%type_raw[python] %i/bin/idle
- sed 's|%p/bin/python|%p/bin/python2.5|g' < pydoc > pydoc2.5
+ sed 's|%p/bin/python|%p/bin/python%type_raw[python]|g' < pydoc
> pydoc%type_raw[python]
rm pydoc
- chmod 755 pydoc2.5
- ln -s pydoc2.5 %i/bin/pydoc
+ chmod 755 pydoc%type_raw[python]
+ ln -s pydoc%type_raw[python] %i/bin/pydoc
- sed 's|%p/bin/python|%p/bin/python2.5|g' < smtpd.py >
smtpd.py2.5
+ sed 's|%p/bin/python|%p/bin/python%type_raw[python]|g' <
smtpd.py > smtpd.py%type_raw[python]
rm smtpd.py
- chmod 755 smtpd.py2.5
- ln -s smtpd.py2.5 %i/bin/smtpd.py
+ chmod 755 smtpd.py%type_raw[python]
+ ln -s smtpd.py%type_raw[python] %i/bin/smtpd.py
# was created as hard-link...why do they do that?
rm python
- ln -s python2.5 python
+ ln -s python%type_raw[python] python
popd
- /bin/mv %i/share/man/man1/python.1 %i/share/man/man1/python25.1
- ln -s python25.1 %i/share/man/man1/python.1
+ /bin/mv %i/share/man/man1/python.1
%i/share/man/man1/python%type_pkg[python]].1
+ ln -s python%type_pkg[python].1 %i/share/man/man1/python.1
# install some docs and other useful tidbits
rm -rf Misc/RPM
- /bin/cp -R Misc Tools %i/lib/python2.5
+ /bin/cp -R Misc Tools %i/lib/python%type_raw[python]
mkdir -p %i/share/doc/%n
/bin/cp -R Demo Doc %i/share/doc/%n
mkdir -p %i/share/doc/%n/html
- /bin/cp -R ../Python-Docs-%v/ %i/share/doc/%n/html
+ /bin/cp -R ../Python-Docs-2.5.4/ %i/share/doc/%n/html
<<
SplitOff: <<
Package: %N-shlibs
Replaces: python (<= 2.2.1-8), python-nox (<= 2.2.1-8)
- Files: lib/python2.5/config/libpython2.5.dylib
+ Files: lib/python%type_raw[python]/config/libpython%type_raw[python].dylib
Shlibs: %p/lib/python2.5/config/libpython2.5.dylib 2.5.0 %n (>= 2.5-1)
DocFiles: README LICENSE
<<
SplitOff2: <<
Package: python
- Depends: python25 (>= %e:%v-%r)
+ Depends: %N (>= %e:%v-%r)
Conflicts: python-nox
Replaces: python-nox, python25 (<< 1:2.5.1-3)
Files: <<
+ bin/idle
bin/python
bin/pydoc
- bin/idle
- bin/smtpd.py
bin/python-config
+ bin/smtpd.py
share/man/man1/python.1
<<
DocFiles: README LICENSE
- Description: Generic "python" command that invokes python25
+ Description: Generic "python" command that invokes python%type_pkg[python]
<<
DocFiles: README LICENSE
Description: Interpreted, object-oriented language
@@ -146,10 +148,10 @@
This package installs unix python - not the OSX Framework version.
Builds a two-level namespace dynamic libpython (needed for koffice).
- The interpretter is installed as "python2.5", and all associated
+ The interpretter is installed as "python%type_raw[python]", and all associated
commands are similarly named with the python-version in them. To get
the simple "python" command, install the fink package "python" (note:
- the "python" command there is not guaranteed to be python2.5!).
+ the "python" command there is not guaranteed to be python%type_raw[python]!).
<<
DescPackaging: <<
@@ -181,5 +183,11 @@
Cannot use db47 (or higher)
<<
+DescPort: <<
+ Fix 10.6 mmapmodule.c missing #include to get O_RDWR (compile
+ failure which doesn't abort build process!). Seems safe enough
+ keep in all distros' pkgs
+<<
License: OSI-Approved
Homepage: http://www.python.org
+<<
Index: python26.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/languages/python26.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- python26.info 9 Feb 2010 20:11:33 -0000 1.4
+++ python26.info 14 Oct 2010 05:13:57 -0000 1.5
@@ -1,16 +1,17 @@
-Package: python26
-Version: 2.6.4
+Info2: <<
+Package: python%type_pkg[python]
+Version: 2.6.6
Revision: 1
Epoch: 1
-Distribution: 10.4, 10.5
+Type: python 2.6
Maintainer: Daniel Macks <dma...@netspace.org>
Depends: <<
%N-shlibs (= %e:%v-%r),
blt-shlibs,
bzip2-shlibs,
- db47-aes-shlibs | db47-shlibs,
+ db48-aes-shlibs | db48-shlibs,
gdbm3-shlibs,
- libgettext3-shlibs,
+ libgettext8-shlibs,
libncursesw5-shlibs,
readline5-shlibs,
sqlite3-shlibs (>= 3.2.8-1001),
@@ -21,13 +22,12 @@
BuildDepends: <<
blt-dev (>= 2.4z-15),
bzip2-dev,
- db47-aes | db47,
+ db48-aes | db48,
fink (>= 0.24.12-1),
gdbm3,
gettext-bin,
gettext-tools,
- libgettext3-dev,
- libncurses5 (>= 5.4-20041023-1006),
+ libgettext8-dev,
libncursesw5,
readline5,
sqlite3-dev (>= 3.2.8-1001),
@@ -36,11 +36,11 @@
x11-dev
<<
Source: http://python.org/ftp/python/%v/Python-%v.tgz
-Source-MD5: 17dcac33e4f3adb69a57c2607b6de246
+Source-MD5: b2f209df270a33315e62c1ffac1937f0
Source2: http://www.python.org/ftp/python/doc/%v/python-%v-docs-html.tar.bz2
-Source2-MD5: 349ccac9cacc80a9ed3b3d4724eeda66
+Source2-MD5: d963121537cd6e295ef91301b660633a
PatchFile: %n.patch
-PatchFile-MD5: ca8d596fec54b2a1361c3f672d892e31
+PatchFile-MD5: 5d4c42e5ae16fb94c947120a6f1cbaf4
PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
SetLDFLAGS: -L%p/lib/system-openssl/lib
ConfigureParams: --enable-shared
@@ -48,7 +48,7 @@
CompileScript: <<
#!/bin/sh -ex
if [ "%m" = "x86_64" ]; then
- perl -pi.bak -e 's|num_missing != 5:|num_missing != 7:|g'
./setup.py
+ perl -pi.bak -e 's|num_missing != 5:|num_missing != 7:|g;
s|have 5 missing|have 7 missing|' ./setup.py
# Architecture:x86_64 has tcltk-8.5.x, other arch have 8.4.x
perl -pi.bak -e "s/8.4\'/8.5\'/" ./setup.py
# Architecture:x86_64 can't build with toolbox-glue
@@ -63,22 +63,22 @@
make install DESTDIR=%d
# don't propagate our hackery
- perl -pi -e 's|-L%p/lib/system-openssl/lib||'
%i/lib/python2.6/config/Makefile
+ perl -pi -e 's|-L%p/lib/system-openssl/lib||'
%i/lib/python%type_raw[python]/config/Makefile
# fix all main things to be python-versioned filenames with
# unversioned symlinks to them
pushd %i/bin
for f in 2to3 idle pydoc smtpd.py; do
- mv ${f} ${f}2.6
- ln -s ${f}2.6 %i/bin/${f}
+ mv ${f} ${f}%type_raw[python]
+ ln -s ${f}%type_raw[python] %i/bin/${f}
done
popd
- /bin/mv %i/share/man/man1/python.1 %i/share/man/man1/python26.1
- ln -s python26.1 %i/share/man/man1/python.1
+ /bin/mv %i/share/man/man1/python.1
%i/share/man/man1/python%type_raw[python].1
+ ln -s python%type_raw[python].1 %i/share/man/man1/python.1
# install some docs and other useful tidbits
rm -rf Misc/RPM
- /bin/cp -R Misc Tools %i/lib/python2.6
+ /bin/cp -R Misc Tools %i/lib/python%type_raw[python]
mkdir -p %i/share/doc/%n
/bin/cp -R Demo Doc %i/share/doc/%n
mkdir -p %i/share/doc/%n/html
@@ -86,7 +86,7 @@
<<
SplitOff: <<
Package: %N-shlibs
- Files: lib/python2.6/config/libpython2.6.dylib
+ Files: lib/python%type_raw[python]/config/libpython%type_raw[python].dylib
Shlibs: %p/lib/python2.6/config/libpython2.6.dylib 2.6.0 %n (>= 1:2.6-1)
DocFiles: README LICENSE
<<
@@ -105,7 +105,7 @@
share/man/man1/python.1
<<
DocFiles: README LICENSE
- Description: Generic "python" command that invokes python26
+ Description: Generic "python" command that invokes python%type_pkg[python]
<<
DocFiles: README LICENSE
Description: Interpreted, object-oriented language
@@ -114,14 +114,14 @@
This package installs unix python - not the OSX Framework version.
Builds a two-level namespace dynamic libpython (needed for koffice).
- The interpretter is installed as "python2.6", and all associated
+ The interpretter is installed as "python%type_raw[python]", and all associated
commands are similarly named with the python-version in them. To get
the simple "python" command, install the fink package "python" (note:
- the "python" command there is not guaranteed to be python2.6!).
+ the "python" command there is not guaranteed to be python%type_raw[python]!).
<<
DescUsage: <<
- python2.6 changes the compiler options used to compile
- third-party python modules. Please do not add 2.6 variants
+ python%type_raw[python] changes the compiler options used to compile
+ third-party python modules. Please do not add %type_raw[python] variants
to them without actually testing that they build cleanly.
<<
@@ -136,7 +136,7 @@
Continue this practice so that -pyXX varianted packages don't
need special-casing for certain variants.
- Make sure all compiled modules link against libpython2.6 (and
+ Make sure all compiled modules link against libpython%type_raw[python]
(and
propagate this to third-party compiled modules) to ensure that
all symbols resolved at compile-time to avoid packager
mistakes and user runtime surprises.
@@ -160,12 +160,23 @@
-config script to continue this tradition (bug in previous
versions accidentally did the Right Thing here).
- Cannot use higher than db47
+ Upstream patch to allow using higher than db47. See:
+ http://bugs.python.org/issue6949
+ http://bugs.python.org/file16549/python-support_bdb-4.8-v2.patch
<<
DescPort: <<
libpython needs to link to CF because that lib has the parent
thread that load modules that need to have CF available. See:
http://bugs.python.org/issue7085
+ But make sure framework flag is propagated as a single word.
+
+ Patch setup.py to find ncursesw headers and drop libncurses5 dep.
+
+ platform.mac_ver fails on 64bit (returns blanks) because it
+ requires uses the MacOS module when reading gestalt and MacOS
+ is not available on 64bit. Add fallback implementation using
+ posix.uname.
<<
License: OSI-Approved
Homepage: http://www.python.org
+<<
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today.
http://p.sf.net/sfu/beautyoftheweb
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
