diff options
| author | drochner <drochner@pkgsrc.org> | 2006-03-14 13:56:12 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2006-03-14 13:56:12 +0000 |
| commit | 48eed22b417ccb6f0e79c1427126e6b86132d0d7 (patch) | |
| tree | 4e58ba7b2d517b2305c6c7b193d06342f71acb08 | |
| parent | ee001872381b82f5b2fb715b2e707cecee9e5e2e (diff) | |
| download | pkgsrc-48eed22b417ccb6f0e79c1427126e6b86132d0d7.tar.gz | |
remove a bashism ("select") in the merge script
(this is quite invasive: it disables "FileMerge.app" on MacOS)
bump PKGREVISION
| -rw-r--r-- | devel/mercurial/Makefile | 4 | ||||
| -rw-r--r-- | devel/mercurial/distinfo | 3 | ||||
| -rw-r--r-- | devel/mercurial/patches/patch-aa | 44 |
3 files changed, 48 insertions, 3 deletions
diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile index d1add7acd90..7fb6507cabd 100644 --- a/devel/mercurial/Makefile +++ b/devel/mercurial/Makefile @@ -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 --git a/devel/mercurial/distinfo b/devel/mercurial/distinfo index 9f6aaba3e03..7ab52797e19 100644 --- a/devel/mercurial/distinfo +++ b/devel/mercurial/distinfo @@ -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 --git a/devel/mercurial/patches/patch-aa b/devel/mercurial/patches/patch-aa new file mode 100644 index 00000000000..94e4956f3d6 --- /dev/null +++ b/devel/mercurial/patches/patch-aa @@ -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 |