[44573] trunk/dports

[blb at macports.org]

Revision: 44573
          http://trac.macports.org/changeset/44573
Author:   blb at macports.org
Date:     2008-12-30 16:31:21 -0800 (Tue, 30 Dec 2008)
Log Message:
-----------
audio/taglib, emulators/basiliskii, net/traceroute, and sysutils/krbafs -
fix working with libtool 2

Modified Paths:
--------------
    trunk/dports/audio/taglib/Portfile
    trunk/dports/emulators/basiliskii/Portfile
    trunk/dports/net/traceroute/Portfile
    trunk/dports/sysutils/krbafs/Portfile

Modified: trunk/dports/audio/taglib/Portfile
===================================================================
--- trunk/dports/audio/taglib/Portfile	2008-12-30 22:52:55 UTC (rev 44572)
+++ trunk/dports/audio/taglib/Portfile	2008-12-31 00:31:21 UTC (rev 44573)
@@ -24,7 +24,11 @@
 pre-configure {
    if {[variant_isset universal]} {
       delete ${worksrcpath}/autom4te.cache
-      copy -force ${prefix}/share/libtool/ltmain.sh ${worksrcpath}/admin
+      if {[file exists ${prefix}/share/libtool/config/ltmain.sh]} {
+         copy -force ${prefix}/share/libtool/config/ltmain.sh ${worksrcpath}/admin
+      } else {
+         copy -force ${prefix}/share/libtool/ltmain.sh ${worksrcpath}/admin
+      }
       copy -force ${prefix}/share/aclocal/libtool.m4 ${worksrcpath}/admin/libtool.m4.in
       system "cd ${worksrcpath} && autoreconf"
    }

Modified: trunk/dports/emulators/basiliskii/Portfile
===================================================================
--- trunk/dports/emulators/basiliskii/Portfile	2008-12-30 22:52:55 UTC (rev 44572)
+++ trunk/dports/emulators/basiliskii/Portfile	2008-12-31 00:31:21 UTC (rev 44573)
@@ -25,5 +25,9 @@
 build.args              CC=c++
 
 post-patch {
-    copy -force ${prefix}/share/libtool/config.guess ${prefix}/share/libtool/config.sub ${worksrcpath}
+    if {[file exists ${prefix}/share/libtool/config/config.guess]} {
+        copy -force ${prefix}/share/libtool/config/config.guess ${prefix}/share/libtool/config/config.sub ${worksrcpath}
+    } else {
+        copy -force ${prefix}/share/libtool/config.guess ${prefix}/share/libtool/config.sub ${worksrcpath}
+    }
 }

Modified: trunk/dports/net/traceroute/Portfile
===================================================================
--- trunk/dports/net/traceroute/Portfile	2008-12-30 22:52:55 UTC (rev 44572)
+++ trunk/dports/net/traceroute/Portfile	2008-12-31 00:31:21 UTC (rev 44573)
@@ -18,7 +18,11 @@
 
 pre-configure {
    foreach f {config.guess config.sub} {
-      file copy -force ${prefix}/share/libtool/${f} ${worksrcpath}
+      if {[file exists ${prefix}/share/libtool/config/${f}]} {
+         file copy -force ${prefix}/share/libtool/config/${f} ${worksrcpath}
+      } else {
+         file copy -force ${prefix}/share/libtool/${f} ${worksrcpath}
+      }
    }
 }
 

Modified: trunk/dports/sysutils/krbafs/Portfile
===================================================================
--- trunk/dports/sysutils/krbafs/Portfile	2008-12-30 22:52:55 UTC (rev 44572)
+++ trunk/dports/sysutils/krbafs/Portfile	2008-12-31 00:31:21 UTC (rev 44573)
@@ -24,7 +24,11 @@
 patchfiles          patch-Makefile.in.diff
 depends_build       port:libtool
 pre-configure {
-   copy -force ${prefix}/share/libtool/config.guess ${worksrcpath}
+    if {[file exists ${prefix}/share/libtool/config/config.guess]} {
+        copy -force ${prefix}/share/libtool/config/config.guess ${worksrcpath}
+    } else {
+        copy -force ${prefix}/share/libtool/config.guess ${worksrcpath}
+    }
 }
 post-patch {
    reinplace "s|@install_prefix@|${destroot}|g" "${worksrcpath}/Makefile.in"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081230/f98622db/attachment.html>