Ignore:
Timestamp:
Aug 3, 2009, 3:54:32 AM (8 years ago)
Author:
jeremyhu@…
Message:

orbit2: Don't diff-merge orbit-config.h ... breaks on 3-way universal

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/devel/orbit2/Portfile

    r53493 r54852  
    77set my_name     ORBit2
    88version         2.14.17
     9revision        1
    910set branch      [join [lrange [split ${version} .] 0 1] .]
    1011maintainers     nomaintainer
     
    3233
    3334use_parallel_build  yes
     35
     36# This file doesn't merge right for 3-way universal
     37set merger_dont_diff "${prefix}/include/orbit-2.0/orbit/orbit-config.h"
    3438
    3539test.run        yes
Note: See TracChangeset for help on using the changeset viewer.