[45074] trunk/dports

[blb at macports.org]

Revision: 45074
          http://trac.macports.org/changeset/45074
Author:   blb at macports.org
Date:     2009-01-07 23:07:36 -0800 (Wed, 07 Jan 2009)
Log Message:
-----------
Multiple ports - work with either libtool 1.x or libtool 2.x installed,
ticket #17833 (maintainer timeout)

Modified Paths:
--------------
    trunk/dports/archivers/arj/Portfile
    trunk/dports/comms/gnokii/Portfile
    trunk/dports/erlang/erlsom/Portfile
    trunk/dports/net/libnet/Portfile
    trunk/dports/net/ssldump/Portfile
    trunk/dports/net/trafshow/Portfile
    trunk/dports/print/a2ps/Portfile

Modified: trunk/dports/archivers/arj/Portfile
===================================================================
--- trunk/dports/archivers/arj/Portfile	2009-01-08 06:59:35 UTC (rev 45073)
+++ trunk/dports/archivers/arj/Portfile	2009-01-08 07:07:36 UTC (rev 45074)
@@ -17,7 +17,11 @@
 configure.dir   ${autoconf.dir}
 
 post-extract {
-    copy -force ${prefix}/share/libtool/config.guess ${prefix}/share/libtool/config.sub ${worksrcpath}/${autoconf.dir}
+    if {[file exists ${prefix}/share/libtool/config/config.guess]} {
+        copy -force ${prefix}/share/libtool/config/config.guess ${prefix}/share/libtool/config/config.sub ${worksrcpath}/${autoconf.dir}
+    } else {
+        copy -force ${prefix}/share/libtool/config.guess ${prefix}/share/libtool/config.sub ${worksrcpath}/${autoconf.dir}
+    }
 }
 
 patchfiles	patch-conifgure.in patch-environ.c patch-makefile.in patch-postproc.c patch-uxspec.c

Modified: trunk/dports/comms/gnokii/Portfile
===================================================================
--- trunk/dports/comms/gnokii/Portfile	2009-01-08 06:59:35 UTC (rev 45073)
+++ trunk/dports/comms/gnokii/Portfile	2009-01-08 07:07:36 UTC (rev 45074)
@@ -17,7 +17,7 @@
 checksums		md5 fd1cc8e95e112d7414a8420518b881d6
 
 depends_lib		lib:gtk.1:gtk1 \
-			path:${prefix}/share/libtool/ltmain.sh:libtool
+			port:libtool
 
 configure.args		--disable-shared --disable-nls -enable-security
 
@@ -29,6 +29,10 @@
 # the ltmain.sh supplied with gnokii and OSX 10.4 both have problems
 platform darwin { 
   post-extract {
-    file copy		-force ${prefix}/share/libtool/ltmain.sh ${worksrcpath}/config
+    if {[file exists ${prefix}/share/libtool/config/ltmain.sh]} {
+      file copy		-force ${prefix}/share/libtool/config/ltmain.sh ${worksrcpath}/config
+    } else {
+      file copy		-force ${prefix}/share/libtool/ltmain.sh ${worksrcpath}/config
+    }
   }
 }

Modified: trunk/dports/erlang/erlsom/Portfile
===================================================================
--- trunk/dports/erlang/erlsom/Portfile	2009-01-08 06:59:35 UTC (rev 45073)
+++ trunk/dports/erlang/erlsom/Portfile	2009-01-08 07:07:36 UTC (rev 45074)
@@ -24,6 +24,10 @@
 build.target		debuginfo
 
 post-extract {
-    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}
+    }
     file delete -force "${worksrcpath}/configure"
 }

Modified: trunk/dports/net/libnet/Portfile
===================================================================
--- trunk/dports/net/libnet/Portfile	2009-01-08 06:59:35 UTC (rev 45073)
+++ trunk/dports/net/libnet/Portfile	2009-01-08 07:07:36 UTC (rev 45074)
@@ -34,7 +34,11 @@
 platform darwin {
 	depends_lib-append port:libtool
 	pre-configure {
-		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/ssldump/Portfile
===================================================================
--- trunk/dports/net/ssldump/Portfile	2009-01-08 06:59:35 UTC (rev 45073)
+++ trunk/dports/net/ssldump/Portfile	2009-01-08 07:07:36 UTC (rev 45074)
@@ -23,7 +23,11 @@
 					rmd160 941cf8f2ef8459ec4f9ce65772e134505d46566f
 patchfiles			patch-ssl_ssldecode_c
 pre-configure {
-	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}
+	}
 }
 configure.args		--mandir=${destroot}${prefix}/share/man \
 					--prefix=${destroot}${prefix} \

Modified: trunk/dports/net/trafshow/Portfile
===================================================================
--- trunk/dports/net/trafshow/Portfile	2009-01-08 06:59:35 UTC (rev 45073)
+++ trunk/dports/net/trafshow/Portfile	2009-01-08 07:07:36 UTC (rev 45074)
@@ -29,7 +29,11 @@
 fetch.user      anonymous
 fetch.password  -macports@
 
-pre-configure		{	copy -force ${prefix}/share/libtool/config.guess ${prefix}/share/libtool/config.sub ${worksrcpath}
+pre-configure		{	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}
+				}
 			}
 
 configure.cflags-append   "-I${prefix}/include"

Modified: trunk/dports/print/a2ps/Portfile
===================================================================
--- trunk/dports/print/a2ps/Portfile	2009-01-08 06:59:35 UTC (rev 45073)
+++ trunk/dports/print/a2ps/Portfile	2009-01-08 07:07:36 UTC (rev 45074)
@@ -22,7 +22,11 @@
 platform darwin {
 	depends_lib-append port:libtool
 	post-patch {
-		copy -force ${prefix}/share/libtool/config.guess ${prefix}/share/libtool/config.sub ${worksrcpath}/auxdir/
+		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}
+		}
 	}
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090107/6cb4815f/attachment-0001.html>