diff options
| author | roberto <roberto@FreeBSD.org> | 2007-10-03 00:13:09 +0800 |
|---|---|---|
| committer | roberto <roberto@FreeBSD.org> | 2007-10-03 00:13:09 +0800 |
| commit | d6f3aa221cdc72d48b1695d319913c9356d3b168 (patch) | |
| tree | 5c3164a8ea1794d19c7d8e323772cf71ede353b6 /devel/mercurial | |
| parent | a97f7703e83909842cc739e85ee880d39a5c1b32 (diff) | |
| download | freebsd-ports-gnome-d6f3aa221cdc72d48b1695d319913c9356d3b168.tar.gz freebsd-ports-gnome-d6f3aa221cdc72d48b1695d319913c9356d3b168.tar.zst freebsd-ports-gnome-d6f3aa221cdc72d48b1695d319913c9356d3b168.zip | |
A bug in our /bin/sh is making one of the tests fail when looking for a
OS X only utility (FileMerge). The bug has been fixed recently but as it
is irrelevant to FreeBSD, remove the offending line to avoid tripping on
the bug on older systems.
This should fix hgmerge on these systems.
Reminded by: tobez
Diffstat (limited to 'devel/mercurial')
| -rw-r--r-- | devel/mercurial/files/patch-hgmerge | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/devel/mercurial/files/patch-hgmerge b/devel/mercurial/files/patch-hgmerge new file mode 100644 index 000000000000..bbc911b23e02 --- /dev/null +++ b/devel/mercurial/files/patch-hgmerge @@ -0,0 +1,11 @@ +--- hgmerge.orig Tue Jun 26 04:18:18 2007 ++++ hgmerge Tue Oct 2 18:07:44 2007 +@@ -37,7 +37,7 @@ + type "$PATCH" >/dev/null 2>&1 || PATCH= + + # find optional visual utilities +-FILEMERGE="/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge" ++FILEMERGE= + KDIFF3="kdiff3" + TKDIFF="tkdiff" + MELD="meld" |