[48185] trunk/dports/lang/python24

[blb at macports.org]

Revision: 48185
          http://trac.macports.org/changeset/48185
Author:   blb at macports.org
Date:     2009-03-16 00:42:14 -0700 (Mon, 16 Mar 2009)
Log Message:
-----------
lang/python24 - fix LINKFORSHARED to point specifically to this port's
framework library
don't use broken poll (ticket #18376)

Modified Paths:
--------------
    trunk/dports/lang/python24/Portfile

Added Paths:
-----------
    trunk/dports/lang/python24/files/pyconfig.ed

Modified: trunk/dports/lang/python24/Portfile
===================================================================
--- trunk/dports/lang/python24/Portfile	2009-03-16 07:34:55 UTC (rev 48184)
+++ trunk/dports/lang/python24/Portfile	2009-03-16 07:42:14 UTC (rev 48185)
@@ -4,6 +4,7 @@
 
 name                    python24
 version                 2.4.6
+revision                1
 set major               [lindex [split $version .] 0]
 set branch              [join [lrange [split ${version} .] 0 1] .]
 categories              lang
@@ -104,6 +105,14 @@
         # install select file for python_select
         xinstall -m 755 -d ${destroot}${prefix}/etc/select/python
         xinstall -m 644 ${filespath}/python[string map {. {}} ${branch}] ${destroot}${prefix}/etc/select/python/
+
+        # Without this, LINKFORSHARED is set to
+        # ... $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)
+        # (this becomes Python.framework/Versions/2.4/Python) which doesn't
+        # quite work (see ticket #15099); instead specifically list the
+        # full path to the proper Python framework file (which becomes
+        # ${prefix}/Library/Frameworks/Python.framework/Versions/2.4/Python)
+        reinplace {s|^\(LINKFORSHARED=.*\)$(PYTHONFRAMEWORKDIR).*$|\1 $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)|} ${destroot}${prefix}/lib/python${branch}/config/Makefile
 }
 }
 
@@ -113,6 +122,13 @@
 \n\tsudo python_select $name\n"
 }
 
+platform darwin {
+        post-configure {
+                # See http://trac.macports.org/ticket/18376
+                system "cd ${worksrcpath} && ed - pyconfig.h < ${filespath}/pyconfig.ed"
+        }
+}
+
 platform darwin 9 {
         configure.cppflags-append       -D__DARWIN_UNIX03
 }

Added: trunk/dports/lang/python24/files/pyconfig.ed
===================================================================
--- trunk/dports/lang/python24/files/pyconfig.ed	                        (rev 0)
+++ trunk/dports/lang/python24/files/pyconfig.ed	2009-03-16 07:42:14 UTC (rev 48185)
@@ -0,0 +1,2 @@
+g,.*\(HAVE_POLL[_A-Z]*\).*,s,,/* #undef \1 */,
+w
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090316/7ea2b406/attachment.html>