[52130] trunk/dports/devel/dbus/Portfile

[mcalhoun at macports.org]

Revision: 52130
          http://trac.macports.org/changeset/52130
Author:   mcalhoun at macports.org
Date:     2009-06-10 14:02:18 -0700 (Wed, 10 Jun 2009)
Log Message:
-----------
dbus: Merge of three different architectures fails for file dbus-arch-deps.h.

Modified Paths:
--------------
    trunk/dports/devel/dbus/Portfile

Modified: trunk/dports/devel/dbus/Portfile
===================================================================
--- trunk/dports/devel/dbus/Portfile	2009-06-10 20:53:42 UTC (rev 52129)
+++ trunk/dports/devel/dbus/Portfile	2009-06-10 21:02:18 UTC (rev 52130)
@@ -121,6 +121,16 @@
 set plistDir  ${prefix}/Library/LaunchDaemons
 set plistFl   ${plistDir}/org.freedesktop.dbus-system.plist
 
+# universal_archs_to_use might not be set before pre-fetch.
+pre-destroot {
+    global merger_dont_diff merger_configure_env
+
+    # PortGroup muniversal has difficulty merging three files.
+    if  { [llength ${universal_archs_to_use}] == 3 } {
+        set merger_dont_diff "${prefix}/lib/dbus-1.0/include/dbus/dbus-arch-deps.h"
+    }
+}
+
 post-destroot {
     if {![variant_isset darwin_7]} {
         # Simplify startup script over startupitem.create.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090610/4966d6a7/attachment.html>