[51009] trunk/dports/devel/glib2/Portfile

[ryandesign at macports.org]

Revision: 51009
          http://trac.macports.org/changeset/51009
Author:   ryandesign at macports.org
Date:     2009-05-14 22:10:09 -0700 (Thu, 14 May 2009)
Log Message:
-----------
glib2: never attempt to merge glibconfig.h; should fix #19183

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

Modified: trunk/dports/devel/glib2/Portfile
===================================================================
--- trunk/dports/devel/glib2/Portfile	2009-05-15 04:53:32 UTC (rev 51008)
+++ trunk/dports/devel/glib2/Portfile	2009-05-15 05:10:09 UTC (rev 51009)
@@ -6,6 +6,7 @@
 name                    glib2
 set my_name             glib
 version                 2.20.1
+revision                1
 set branch              [join [lrange [split ${version} .] 0 1] .]
 categories              devel
 maintainers             ryandesign
@@ -142,14 +143,7 @@
         }
     }
 
-    pre-destroot {
-        global merger_dont_diff
-
-        # These tests must be done in pre-destroot to ensure universal_archs_to_use has the correct values.
-        if { [llength ${universal_archs_to_use}] > 2 } {
-            set merger_dont_diff ${prefix}/lib/glib-2.0/include/glibconfig.h
-        }
-    }
+    set merger_dont_diff ${prefix}/lib/glib-2.0/include/glibconfig.h
 }
 
 livecheck.check         regex
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090514/ea2e0b73/attachment.html>