[56897] trunk/dports/lang/python26

[jmr at macports.org]

Revision: 56897
          http://trac.macports.org/changeset/56897
Author:   jmr at macports.org
Date:     2009-09-02 21:00:12 -0700 (Wed, 02 Sep 2009)
Log Message:
-----------
python26: fix curses module, avoid using system X11, add arch_only fix for 64-bit (still lots of other 64-bit issues)

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

Added Paths:
-----------
    trunk/dports/lang/python26/files/patch-configure-arch_only.diff

Modified: trunk/dports/lang/python26/Portfile
===================================================================
--- trunk/dports/lang/python26/Portfile	2009-09-03 03:56:17 UTC (rev 56896)
+++ trunk/dports/lang/python26/Portfile	2009-09-03 04:00:12 UTC (rev 56897)
@@ -42,7 +42,8 @@
                         patch-Mac-Makefile.in.diff \
                         patch-Mac-PythonLauncher-Makefile.in.diff \
                         patch-Mac-Tools-Doc-setup.py.diff \
-                        patch-readlinefix.diff
+                        patch-readlinefix.diff \
+                        patch-configure-arch_only.diff
 
 depends_lib             port:gettext port:zlib port:openssl port:tk \
                         port:sqlite3 port:db46 port:ncurses port:gdbm \
@@ -51,6 +52,8 @@
 configure.args          --enable-framework=${frameworks_dir} \
                         --enable-ipv6
 
+configure.cppflags-append -I${prefix}/include/ncurses
+
 use_parallel_build      no
 
 post-patch {

Added: trunk/dports/lang/python26/files/patch-configure-arch_only.diff
===================================================================
--- trunk/dports/lang/python26/files/patch-configure-arch_only.diff	                        (rev 0)
+++ trunk/dports/lang/python26/files/patch-configure-arch_only.diff	2009-09-03 04:00:12 UTC (rev 56897)
@@ -0,0 +1,20 @@
+--- configure.orig	2009-08-30 05:49:17.000000000 +1000
++++ configure	2009-09-03 08:26:40.000000000 +1000
+@@ -12920,7 +12920,7 @@
+     if test "${enable_universalsdk}"; then
+ 	    :
+     else
+-	LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `arch`"
++	LIBTOOL_CRUFT="${LIBTOOL_CRUFT}"
+     fi
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
+@@ -12932,7 +12932,7 @@
+         else
+             LIBTOOL_CRUFT=""
+     fi
+-    LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs -arch_only `arch`"
++    LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs"
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
+ esac

Modified: trunk/dports/lang/python26/files/patch-setup.py.diff
===================================================================
--- trunk/dports/lang/python26/files/patch-setup.py.diff	2009-09-03 03:56:17 UTC (rev 56896)
+++ trunk/dports/lang/python26/files/patch-setup.py.diff	2009-09-03 04:00:12 UTC (rev 56897)
@@ -1,6 +1,15 @@
---- setup.py.orig	2008-09-29 18:15:45.000000000 -0600
-+++ setup.py	2008-11-30 23:13:09.000000000 -0700
-@@ -1506,13 +1506,7 @@
+--- setup.py.orig	2009-04-01 05:20:48.000000000 +1100
++++ setup.py	2009-09-03 10:20:32.000000000 +1000
+@@ -1494,7 +1496,7 @@
+         # For 8.4a2, the X11 headers are not included. Rather than include a
+         # complicated search, this is a hard-coded path. It could bail out
+         # if X11 libs are not found...
+-        include_dirs.append('/usr/X11R6/include')
++        #include_dirs.append('/usr/X11R6/include')
+         frameworks = ['-framework', 'Tcl', '-framework', 'Tk']
+ 
+         # All existing framework builds of Tcl/Tk don't support 64-bit
+@@ -1529,13 +1531,7 @@
      def detect_tkinter(self, inc_dirs, lib_dirs):
          # The _tkinter module.
  
@@ -14,3 +23,31 @@
  
          # Assume we haven't found any of the libraries or include files
          # The versions with dots are used on Unix, and the versions without
+@@ -1583,17 +1579,17 @@
+         if platform == 'sunos5':
+             include_dirs.append('/usr/openwin/include')
+             added_lib_dirs.append('/usr/openwin/lib')
+-        elif os.path.exists('/usr/X11R6/include'):
+-            include_dirs.append('/usr/X11R6/include')
+-            added_lib_dirs.append('/usr/X11R6/lib64')
+-            added_lib_dirs.append('/usr/X11R6/lib')
+-        elif os.path.exists('/usr/X11R5/include'):
+-            include_dirs.append('/usr/X11R5/include')
+-            added_lib_dirs.append('/usr/X11R5/lib')
+-        else:
++        #elif os.path.exists('/usr/X11R6/include'):
++        #    include_dirs.append('/usr/X11R6/include')
++        #    added_lib_dirs.append('/usr/X11R6/lib64')
++        #    added_lib_dirs.append('/usr/X11R6/lib')
++        #elif os.path.exists('/usr/X11R5/include'):
++        #    include_dirs.append('/usr/X11R5/include')
++        #    added_lib_dirs.append('/usr/X11R5/lib')
++        #else:
+             # Assume default location for X11
+-            include_dirs.append('/usr/X11/include')
+-            added_lib_dirs.append('/usr/X11/lib')
++        #    include_dirs.append('/usr/X11/include')
++        #    added_lib_dirs.append('/usr/X11/lib')
+ 
+         # If Cygwin, then verify that X is installed before proceeding
+         if platform == 'cygwin':
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090902/70185058/attachment.html>