[51904] trunk/dports/textproc

[toby at macports.org]

Revision: 51904
          http://trac.macports.org/changeset/51904
Author:   toby at macports.org
Date:     2009-06-06 01:25:44 -0700 (Sat, 06 Jun 2009)
Log Message:
-----------
more preparation for removal of universal_sysroot

Modified Paths:
--------------
    trunk/dports/textproc/help2man/Portfile
    trunk/dports/textproc/libiconv/Portfile

Modified: trunk/dports/textproc/help2man/Portfile
===================================================================
--- trunk/dports/textproc/help2man/Portfile	2009-06-06 08:06:51 UTC (rev 51903)
+++ trunk/dports/textproc/help2man/Portfile	2009-06-06 08:25:44 UTC (rev 51904)
@@ -29,7 +29,11 @@
 
 post-patch {
 	if {[variant_isset universal]} {
-        reinplace "s|-bundle|-bundle -isysroot ${configure.universal_sysroot} ${configure.universal_ldflags}|" ${worksrcpath}/Makefile.in
+		if {[info exists universal_sysroot]} {
+			reinplace "s|-bundle|-bundle -isysroot ${universal_sysroot} ${configure.universal_ldflags}|" ${worksrcpath}/Makefile.in
+		} else {
+			reinplace "s|-bundle|-bundle ${configure.universal_ldflags}|" ${worksrcpath}/Makefile.in
+		}
 	}
 }
 

Modified: trunk/dports/textproc/libiconv/Portfile
===================================================================
--- trunk/dports/textproc/libiconv/Portfile	2009-06-06 08:06:51 UTC (rev 51903)
+++ trunk/dports/textproc/libiconv/Portfile	2009-06-06 08:25:44 UTC (rev 51904)
@@ -116,7 +116,7 @@
     }
 
     # See http://trac.macports.org/ticket/18440.
-    if { ${universal_sysroot}=="/Developer/SDKs/MacOSX10.4u.sdk" } {
+    if { ${os.major}=="8" } {
             foreach arch "ppc64 x86_64" {
                 lappend merger_configure_env(${arch}) \
                     am_cv_func_iconv='yes' \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090606/764e63a0/attachment-0001.html>