Ticket #17090: Portfile-apr.diff

Portfile

@@ -1 +1 @@
 # $Id: Portfile 45504 2009-01-16 19:23:25Z dluke@macports.org $
 
 PortSystem      1.0
+PortGroup   muniversal 1.0
 
 name            apr
 version         1.3.3
@@ -34 +35 @@
         use_parallel_build      no
 }
 
+# muniversal non-merging required for apr-util (see below) but it breaks libtool
+if {[variant_isset universal] && ${os.arch}=="i386"} {
+        set merger_dont_diff "${prefix}/share/apr-1/build/apr_rules.mk \
+                ${prefix}/share/apr-1/build/libtool"
+}
+
+# We need arch specific rules.mk and libtool for apr-util. Also fix pesky libtool
+# "unable to infer tagged configuration" when using -m32/64 switches
+if {[variant_isset universal] && ${os.arch}=="i386"} {
+        post-install {
+                system "chmod 755 ${prefix}/bin/apr-1-config"
+                reinplace  "s|/libtool|/i386-libtool --tag=CC|g" \
+                        "${prefix}/share/apr-1/build/i386-apr_rules.mk"
+                reinplace  "s|/libtool|/x86_64-libtool --tag=CC|g" \
+                        "${prefix}/share/apr-1/build/x86_64-apr_rules.mk"
+
+                # Copy i386 libtool for ports depending on apr-util and fix tag error
+                system "cp ${prefix}/share/apr-1/build/i386-libtool \
+                                        ${prefix}/share/apr-1/build/libtool"
+                reinplace "s| -m32||g" "${prefix}/share/apr-1/build/libtool"
+                system "chmod 755 ${prefix}/share/apr-1/build/libtool"
+        }
+}
+
 livecheck.check regex
 livecheck.url   http://apache.org/dist/apr/
 livecheck.regex {<a href="#apr">APR (\d+(?:\.\d+)*) is the latest available version</a>}