[54852] trunk/dports/devel/orbit2/Portfile

jeremyhu at macports.org jeremyhu at macports.org
Sun Aug 2 20:54:33 PDT 2009


Revision: 54852
          http://trac.macports.org/changeset/54852
Author:   jeremyhu at macports.org
Date:     2009-08-02 20:54:32 -0700 (Sun, 02 Aug 2009)
Log Message:
-----------
orbit2: Don't diff-merge orbit-config.h ... breaks on 3-way universal

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

Modified: trunk/dports/devel/orbit2/Portfile
===================================================================
--- trunk/dports/devel/orbit2/Portfile	2009-08-03 03:53:30 UTC (rev 54851)
+++ trunk/dports/devel/orbit2/Portfile	2009-08-03 03:54:32 UTC (rev 54852)
@@ -6,6 +6,7 @@
 name            orbit2
 set my_name     ORBit2
 version         2.14.17
+revision        1
 set branch      [join [lrange [split ${version} .] 0 1] .]
 maintainers     nomaintainer
 categories      devel gnome
@@ -32,6 +33,9 @@
 
 use_parallel_build  yes
 
+# This file doesn't merge right for 3-way universal
+set merger_dont_diff "${prefix}/include/orbit-2.0/orbit/orbit-config.h"
+
 test.run        yes
 test.target     check
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090802/a5a4d40b/attachment-0001.html>


More information about the macports-changes mailing list