[pkgsrc/trunk]: pkgsrc/devel/mercurial remove a bashism ("select") in the mer...

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1d31b49bc397
branches:  trunk
changeset: 509766:1d31b49bc397
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Tue Mar 14 13:56:12 2006 +0000

description:
remove a bashism ("select") in the merge script
(this is quite invasive: it disables "FileMerge.app" on MacOS)
bump PKGREVISION

diffstat:

 devel/mercurial/Makefile         |   4 +-
 devel/mercurial/distinfo         |   3 +-
 devel/mercurial/patches/patch-aa |  44 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 48 insertions(+), 3 deletions(-)

diffs (73 lines):

diff -r a4bafc3c1db5 -r 1d31b49bc397 devel/mercurial/Makefile
--- a/devel/mercurial/Makefile  Tue Mar 14 13:55:27 2006 +0000
+++ b/devel/mercurial/Makefile  Tue Mar 14 13:56:12 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2006/03/04 21:29:18 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2006/03/14 13:56:12 drochner Exp $
 #
 
 DISTNAME=              mercurial-0.8
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            devel
 MASTER_SITES=          http://www.selenic.com/mercurial/release/
 
diff -r a4bafc3c1db5 -r 1d31b49bc397 devel/mercurial/distinfo
--- a/devel/mercurial/distinfo  Tue Mar 14 13:55:27 2006 +0000
+++ b/devel/mercurial/distinfo  Tue Mar 14 13:56:12 2006 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.2 2006/03/01 18:27:26 drochner Exp $
+$NetBSD: distinfo,v 1.3 2006/03/14 13:56:12 drochner Exp $
 
 SHA1 (mercurial-0.8.tar.gz) = e9381f8e6dd4af64d11493adcf8bcaa0f07122f6
 RMD160 (mercurial-0.8.tar.gz) = 45f84b85c09d0bff6020dabdb7c595d4e5becf3c
 Size (mercurial-0.8.tar.gz) = 229641 bytes
+SHA1 (patch-aa) = c419f0edd19ca447e417ccfa35b6fb8dc6d6c4f2
diff -r a4bafc3c1db5 -r 1d31b49bc397 devel/mercurial/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/mercurial/patches/patch-aa  Tue Mar 14 13:56:12 2006 +0000
@@ -0,0 +1,44 @@
+$NetBSD: patch-aa,v 1.1 2006/03/14 13:56:12 drochner Exp $
+
+--- hgmerge.orig       2006-03-09 10:32:29.000000000 +0100
++++ hgmerge
+@@ -44,39 +44,6 @@ elif [ -n "$DIFF3" ]; then
+     cp "$LOCAL.orig" "$LOCAL"
+ fi
+ 
+-# on MacOS X try FileMerge.app, shipped with Apple's developer tools
+-# TODO: make proper temp files. foo.orig and foo.link are dangerous
+-FILEMERGE='/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge'
+-if type "$FILEMERGE" > /dev/null 2>&1; then
+-    cp "$LOCAL.orig" "$LOCAL"
+-    ln "$LOCAL" "$LOCAL.link"
+-    # filemerge prefers the right by default
+-    if ! "$FILEMERGE" -left "$OTHER" -right "$LOCAL" -ancestor "$BASE" -merge "$LOCAL"
+-    then
+-        echo "FileMerge failed to launch"
+-        exit 1
+-    fi
+-    if ! test "$LOCAL" -ef "$LOCAL.link"
+-    then
+-        rm "$LOCAL.orig" "$LOCAL.link"
+-        exit 0
+-    else
+-        rm "$LOCAL.link"
+-        echo "$LOCAL is unchanged. Was the merge successful?"
+-        select answer in yes no
+-        do
+-            if test "$answer" == "yes"
+-            then
+-                rm "$LOCAL.orig"
+-                exit 0
+-            else
+-                exit 1
+-            fi
+-        done
+-        exit 1
+-    fi
+-fi
+-
+ if [ -n "$DISPLAY" ]; then
+     # try using kdiff3, which is fairly nice
+     if type kdiff3 > /dev/null 2>&1; then