[74386] trunk/dports/x11/gtk1

[michaelld at macports.org]

Revision: 74386
          http://trac.macports.org/changeset/74386
Author:   michaelld at macports.org
Date:     2010-12-14 12:41:32 -0800 (Tue, 14 Dec 2010)
Log Message:
-----------
gtk1: Patch ltmain.sh to allow for +universal building.

Modified Paths:
--------------
    trunk/dports/x11/gtk1/Portfile

Added Paths:
-----------
    trunk/dports/x11/gtk1/files/patch-ltmain.sh.diff

Modified: trunk/dports/x11/gtk1/Portfile
===================================================================
--- trunk/dports/x11/gtk1/Portfile	2010-12-14 20:36:13 UTC (rev 74385)
+++ trunk/dports/x11/gtk1/Portfile	2010-12-14 20:41:32 UTC (rev 74386)
@@ -33,15 +33,21 @@
 patchfiles	patch-config.guess patch-config.sub \
 			patch-gtk.m4.diff
 
-configure.ccache    no
-configure.args	--disable-nls --disable-shm --with-locale --mandir=${prefix}/share/man \
-		--infodir=${prefix}/share/info
-
 post-patch {
 	   copy -force ${distpath}/ltconfig13 ${worksrcpath}/ltconfig
 	   copy -force ${distpath}/ltmain13 ${worksrcpath}/ltmain.sh
+       # fix ltmain.sh to handle universal library creation.
+       system "cd ${worksrcpath} && \
+               patch -p0 < ${filespath}/patch-ltmain.sh.diff"
 }
 
+configure.ccache    no
+configure.ldflags-delete "-L${prefix}/lib"
+configure.cppflags-delete "-I${prefix}/include"
+configure.args	--disable-nls --disable-shm --with-locale \
+                --mandir=${prefix}/share/man \
+                --infodir=${prefix}/share/info
+
 post-destroot {
 	      ln -sf libgdk-1.2.0.9.1.dylib ${destroot}${prefix}/lib/libgdk.1.dylib
 	      ln -sf libgtk-1.2.0.9.1.dylib ${destroot}${prefix}/lib/libgtk.1.dylib
@@ -55,6 +61,3 @@
 livecheck.type  regex
 livecheck.url   ftp://ftp.gtk.org/pub/gtk/v1.2/
 livecheck.regex "gtk\\+-(\\d+(?:\\.\\d+)*)${extract.suffix}"
-
-# port:glib1 is not universal
-universal_variant no

Added: trunk/dports/x11/gtk1/files/patch-ltmain.sh.diff
===================================================================
--- trunk/dports/x11/gtk1/files/patch-ltmain.sh.diff	                        (rev 0)
+++ trunk/dports/x11/gtk1/files/patch-ltmain.sh.diff	2010-12-14 20:41:32 UTC (rev 74386)
@@ -0,0 +1,29 @@
+--- ltmain.sh.orig	2010-12-14 14:01:46.000000000 -0500
++++ ltmain.sh	2010-12-14 14:14:41.000000000 -0500
+@@ -1239,6 +1239,11 @@
+ 	  prev=
+ 	  continue
+ 	  ;;
++        xarch)
++          linkopts="$linkopts $arg"
++	  prev=
++	  continue
++          ;;
+ 	*)
+ 	  eval "$prev=\"\$arg\""
+ 	  prev=
+@@ -1264,6 +1269,14 @@
+ 	continue
+ 	;;
+ 
++      # Darwin uses the -arch flag to determine output architecture.
++      # Add it to the link options for "archive_cmds".
++      -arch)
++	linkopts="$linkopts $arg"
++	prev=xarch
++	continue
++	;;
++
+       -avoid-version)
+ 	avoid_version=yes
+ 	continue
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101214/9175ce65/attachment.html>