Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/languages
In directory
sc8-pr-cvs17:/tmp/cvs-serv2656/10.3/unstable/main/finkinfo/languages
Modified Files:
python24.info python24.patch
Log Message:
backport new version (with recent fixes) from 10.4...builds and looks good on
10.3
Index: python24.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/languages/python24.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- python24.patch 31 Mar 2005 12:58:41 -0000 1.3
+++ python24.patch 18 Jul 2007 05:16:12 -0000 1.4
@@ -102,8 +102,8 @@
def __repr__(self):
if inspect.stack()[1][3] == '?':
---- Python-2.4/setup.py.orig Sat Dec 11 14:38:36 2004
-+++ Python-2.4/setup.py Sat Dec 11 14:47:51 2004
+--- Python/setup.py 2005-10-13 16:24:35.000000000 -0600
++++ Python/setup.py.orig 2005-10-13 16:19:05.000000000 -0600
@@ -245,8 +245,8 @@
# Add paths to popular package managers on OS X/darwin
if sys.platform == "darwin":
@@ -115,6 +115,20 @@
# DarwinPorts installs into /opt/local by default
add_dir_to_list(self.compiler.library_dirs, '/opt/local/lib')
add_dir_to_list(self.compiler.include_dirs, '/opt/local/include')
+@@ -265,11 +265,11 @@
+ # lib_dirs and inc_dirs are used to search for files;
+ # if a file is found in one of those directories, it can
+ # be assumed that no additional -I,-L directives are needed.
+- lib_dirs = self.compiler.library_dirs + [
++ lib_dirs = self.compiler.library_dirs + ['@PREFIX@/lib',
+ '/lib64', '/usr/lib64',
+ '/lib', '/usr/lib',
+ ]
+- inc_dirs = self.compiler.include_dirs + ['/usr/include']
++ inc_dirs = self.compiler.include_dirs +
['@PREFIX@/include','/usr/include']
+ exts = []
+
+ platform = self.get_platform()
@@ -456,6 +456,7 @@
'/usr/contrib/ssl/include/'
]
Index: python24.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/languages/python24.info,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- python24.info 18 Jul 2007 05:03:48 -0000 1.17
+++ python24.info 18 Jul 2007 05:16:12 -0000 1.18
@@ -1,17 +1,17 @@
Package: python24
-Version: 2.4.2
-Revision: 4
+Version: 2.4.3
+Revision: 2
Epoch: 1
Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
Conflicts: python24-nox, python-nox (<= 2.2.1-8)
Replaces: python24-nox, python (<= 2.2.1-8), python-nox (<= 2.2.1-8)
Depends: %N-shlibs (= %e:%v-%r), tcltk (>= 8.4.1-1), python24-socket
-BuildConflicts: libquicktime0, blt-dev
-BuildDepends: readline (>= 4.3-25), db43-ssl | db43, fink (>= 0.17.0-1),
gdbm3, gmp (>= 4.1.4-1), libmpfr1, tcltk-dev, expat, bzip2-dev, gettext-dev,
gettext-bin, gettext-tools, libncurses5, x11-dev
+BuildConflicts: libquicktime0
+BuildDepends: readline5, db43-ssl | db43, gdbm3, gmp (>= 4.1.4-1), libmpfr1,
tcltk-dev, expat1, bzip2-dev, libgettext3-dev, gettext-bin, gettext-tools,
libncurses5, x11-dev, blt-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: 07cfc759546f6723bb367be5b1ce9875
-Source2-MD5: 647e9d2f540575004ea20be875256980
+Source-MD5: edf994473a8c1a963aaa71e442b285b7
+Source2-MD5: 469674aa69df8650873f096bfccfbcf3
PatchScript: (sed 's|@PREFIX@|%p|g' < %a/%n.patch | patch -p1)
ConfigureParams: --mandir=%p/share/man
GCC: 3.3
@@ -37,7 +37,7 @@
<<
SplitOff: <<
Package: %N-shlibs
- Depends: readline-shlibs (>= 4.3-25), expat-shlibs, gdbm3-shlibs, gmp-shlibs
(>= 4.1.4-1), libmpfr1-shlibs, db43-ssl-shlibs | db43-shlibs, tcltk-shlibs (>=
8.4.1)
+ Depends: readline5-shlibs, expat1-shlibs, gdbm3-shlibs, gmp-shlibs (>=
4.1.4-1), libmpfr1-shlibs, db43-ssl-shlibs | db43-shlibs, tcltk-shlibs (>=
8.4.1), blt-shlibs
Conflicts: python24-nox-shlibs
Replaces: python24-nox-shlibs, python (<= 2.2.1-8), python-nox (<= 2.2.1-8)
Files: lib/python2.4/config/libpython2.4.dylib
@@ -74,6 +74,9 @@
Built against db43 or db43-ssl because Subversion is built against
db43 or db43-ssl so that the svn-swig-py23 and the svn-swig-py24
packages use a consistent Berkeley DB.
+
+ blt is silently detected and tkinter links it if found, so make sure
+ it's present in case other packages need that support.
<<
License: OSI-Approved
Homepage: http://www.python.org
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
