[52864] trunk/dports/lang/python25

[landonf at macports.org]

Revision: 52864
          http://trac.macports.org/changeset/52864
Author:   landonf at macports.org
Date:     2009-06-24 15:01:14 -0700 (Wed, 24 Jun 2009)
Log Message:
-----------
Snow Leopard support:
- Disable framework build on 10.6 to avoid dependencies on 32-bit-only Carbon extensions (hack).
- Remove use of -arch_only `uname -m`, as this will return i386 on systems with a x86_64 default toolchain.

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

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

Modified: trunk/dports/lang/python25/Portfile
===================================================================
--- trunk/dports/lang/python25/Portfile	2009-06-24 21:53:10 UTC (rev 52863)
+++ trunk/dports/lang/python25/Portfile	2009-06-24 22:01:14 UTC (rev 52864)
@@ -80,6 +80,15 @@
 
 platform macosx {
 post-destroot {
+if ([variant_isset darwin_10]) {
+        file rename ${destroot}${prefix}/share/man/man1/python.1 ${destroot}${prefix}/share/man/man1/python${branch}.1
+
+        # delete symlinks without version suffix, use python_select instead to choose version
+        foreach bin { python pythonw idle pydoc smtpd.py python-config } {
+            file delete ${destroot}${prefix}/bin/${bin}
+        }
+} else {
+
         set framewpath ${frameworks_dir}/Python.framework
         set framewdir  ${framewpath}/Versions/${branch}
 
@@ -120,6 +129,7 @@
         ln -s ${framewdir}/Python ${python_staticlink}
 }
 }
+}
 
 post-activate {
     ui_msg "\nTo fully complete your installation and make python $branch the default, please run
@@ -151,9 +161,11 @@
 }
 
 platform darwin 10 {
-        configure.args-append           --disable-toolbox-glue
-        configure.cppflags-append       -D_DARWIN_C_SOURCE
-        patchfiles-append               patch-configure-badcflags.diff
+        configure.args-delete       --enable-framework=${frameworks_dir}
+        configure.args-append       --disable-toolbox-glue --disable-framework
+        configure.cppflags-append   -D_DARWIN_C_SOURCE
+        patchfiles-append           patch-configure-badcflags.diff \
+                                    patch-configure-arch_only.diff
 }
 
 platform puredarwin {

Added: trunk/dports/lang/python25/files/patch-configure-arch_only.diff
===================================================================
--- trunk/dports/lang/python25/files/patch-configure-arch_only.diff	                        (rev 0)
+++ trunk/dports/lang/python25/files/patch-configure-arch_only.diff	2009-06-24 22:01:14 UTC (rev 52864)
@@ -0,0 +1,20 @@
+--- configure.orig	2009-06-24 13:57:38.000000000 -0700
++++ configure	2009-06-24 13:58:38.000000000 -0700
+@@ -11362,7 +11362,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)';;
+@@ -11374,7 +11374,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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090624/266926c0/attachment.html>