[51990] trunk/dports/lang/python25

[blb at macports.org]

Revision: 51990
          http://trac.macports.org/changeset/51990
Author:   blb at macports.org
Date:     2009-06-07 20:14:04 -0700 (Sun, 07 Jun 2009)
Log Message:
-----------
lang/python25 - further to r51955, make sure bsddb and tkinter are built against MacPorts-installed db46 and tk

Modified Paths:
--------------
    trunk/dports/lang/python25/Portfile
    trunk/dports/lang/python25/files/patch-setup.py.diff

Modified: trunk/dports/lang/python25/Portfile
===================================================================
--- trunk/dports/lang/python25/Portfile	2009-06-08 03:10:37 UTC (rev 51989)
+++ trunk/dports/lang/python25/Portfile	2009-06-08 03:14:04 UTC (rev 51990)
@@ -5,7 +5,7 @@
 
 name                    python25
 version                 2.5.4
-revision                4
+revision                5
 set branch              [join [lrange [split ${version} .] 0 1] .]
 categories              lang
 platforms               darwin
@@ -29,7 +29,8 @@
 # <http://bugs.python.org/issue1180>
 patchfiles              patch-Makefile.pre.in.diff \
                         patch-Lib-cgi.py.diff \
-                        patch-Lib-distutils-dist.py.diff
+                        patch-Lib-distutils-dist.py.diff \
+                        patch-setup.py.diff
 
 depends_lib             port:gettext port:zlib port:openssl port:tk \
                         port:sqlite3 port:db46 port:bzip2 \
@@ -43,13 +44,16 @@
 use_parallel_build      no
 
 post-patch {
-        reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/Lib/cgi.py
+        reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/Lib/cgi.py \
+                ${worksrcpath}/setup.py
         reinplace "s|/Applications/MacPython|${applications_dir}/MacPython|g" \
-                Mac/Makefile.in Mac/IDLE/Makefile.in \
-                Mac/Tools/Doc/setup.py Mac/PythonLauncher/Makefile.in \
-                Mac/BuildScript/build-installer.py
+                ${worksrcpath}/Mac/Makefile.in \
+                ${worksrcpath}/Mac/IDLE/Makefile.in \
+                ${worksrcpath}/Mac/Tools/Doc/setup.py \
+                ${worksrcpath}/Mac/PythonLauncher/Makefile.in \
+                ${worksrcpath}/Mac/BuildScript/build-installer.py
         reinplace "s|xargs -0 rm -r|xargs -0 rm -rf|g" \
-                Mac/PythonLauncher/Makefile.in
+                ${worksrcpath}/Mac/PythonLauncher/Makefile.in
 }
 
 build.target            all

Modified: trunk/dports/lang/python25/files/patch-setup.py.diff
===================================================================
--- trunk/dports/lang/python25/files/patch-setup.py.diff	2009-06-08 03:10:37 UTC (rev 51989)
+++ trunk/dports/lang/python25/files/patch-setup.py.diff	2009-06-08 03:14:04 UTC (rev 51990)
@@ -1,11 +1,41 @@
---- 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
+--- setup.py.orig	2008-10-16 12:58:19.000000000 -0600
++++ setup.py	2009-06-07 20:55:17.000000000 -0600
+@@ -609,7 +609,7 @@
+         # a release.  Most open source OSes come with one or more
+         # versions of BerkeleyDB already installed.
  
- # 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"]
+-        max_db_ver = (4, 5)
++        max_db_ver = (4, 6)
+         # NOTE: while the _bsddb.c code links against BerkeleyDB 4.6.x
+         # we leave that version disabled by default as it has proven to be
+         # quite a buggy library release on many platforms.
+@@ -636,6 +636,7 @@
+             db_inc_paths.append('/usr/local/include/db4%d' % x)
+             db_inc_paths.append('/pkg/db-4.%d/include' % x)
+             db_inc_paths.append('/opt/db-4.%d/include' % x)
++            db_inc_paths.append('__PREFIX__/include/db4%d' % x)
+         # 3.x minor number specific paths
+         for x in (3,):
+             db_inc_paths.append('/usr/include/db3%d' % x)
+@@ -711,6 +712,7 @@
  
- def add_dir_to_list(dirlist, dir):
-     """Add the directory 'dir' to the list 'dirlist' (at the front) if
+                 # check lib directories parallel to the location of the header
+                 db_dirs_to_check = [
++                    os.path.join('__PREFIX__', 'lib', 'db46'),
+                     os.path.join(db_incdir, '..', 'lib64'),
+                     os.path.join(db_incdir, '..', 'lib'),
+                     os.path.join(db_incdir, '..', '..', 'lib64'),
+@@ -1212,13 +1214,7 @@
+     def detect_tkinter(self, inc_dirs, lib_dirs):
+         # The _tkinter module.
+ 
+-        # Rather than complicate the code below, detecting and building
+-        # 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()
+-        if (platform == 'darwin' and
+-            self.detect_tkinter_darwin(inc_dirs, lib_dirs)):
+-            return
+ 
+         # Assume we haven't found any of the libraries or include files
+         # The versions with dots are used on Unix, and the versions without
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090607/c784c963/attachment.html>