Fix build on OS X 10.4

- Correct a sublime piece of gmake logic to catch at least 10.4
  rather than 10.5 and later:
    ifeq ($(shell echo "$(uname_R)" | awk -F. '{if ($$1 >= 9)
    print "y"}')_$(shell test -d $(TKFRAMEWORK) || echo n),y_n)

- Then handle the case that on 10.4
    share/git-gui/lib/Git Gui.app/Contents/MacOS/Wish
  becomes
    share/git-gui/lib/Git Gui.app/Contents/MacOS/Wish Shell

Bump PKGREVISION and Slowly Back Away From The Package

5 files changed, 24 insertions, 8 deletions

diff --git a/devel/scmgit-base/Makefile b/devel/scmgit-base/Makefile
index 5c6d968bd98..d1582f5abde 100644
--- a/devel/scmgit-base/Makefile
+++ b/devel/scmgit-base/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.26 2010/10/11 20:46:21 minskim Exp $
+# $NetBSD: Makefile,v 1.27 2010/12/23 23:42:40 abs Exp $
 #
 
 .include "../../devel/scmgit/Makefile.common"
 
 PKGNAME=		scmgit-base-${GIT_VERSION}
+PKGREVISION=		1
 COMMENT=		GIT Tree History Storage Tool (base package)
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/devel/scmgit-base/PLIST b/devel/scmgit-base/PLIST
index 3196349514d..93d4ae45df9 100644
--- a/devel/scmgit-base/PLIST
+++ b/devel/scmgit-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2010/10/28 10:23:08 adam Exp $
+@comment $NetBSD: PLIST,v 1.21 2010/12/23 23:42:40 abs Exp $
 bin/git
 bin/git-cvsserver
 bin/git-receive-pack
@@ -209,7 +209,7 @@ ${PLIST.gui}share/git-gui/lib/diff.tcl
 ${PLIST.gui}share/git-gui/lib/encoding.tcl
 ${PLIST.gui}share/git-gui/lib/error.tcl
 ${PLIST.macosx}share/git-gui/lib/Git Gui.app/Contents/Info.plist
-${PLIST.macosx}share/git-gui/lib/Git Gui.app/Contents/MacOS/Wish
+${PLIST.macosx}share/git-gui/lib/Git Gui.app/Contents/MacOS/${WISH_APP}
 ${PLIST.macosx}share/git-gui/lib/Git Gui.app/Contents/Resources/Scripts/AppMain.tcl
 ${PLIST.macosx}share/git-gui/lib/Git Gui.app/Contents/Resources/git-gui.icns
 ${PLIST.gui}share/git-gui/lib/git-gui.ico
diff --git a/devel/scmgit-base/distinfo b/devel/scmgit-base/distinfo
index 1a669582d1c..eaf6a5c4ac6 100644
--- a/devel/scmgit-base/distinfo
+++ b/devel/scmgit-base/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.29 2010/12/17 23:37:50 abs Exp $
+$NetBSD: distinfo,v 1.30 2010/12/23 23:42:40 abs Exp $
 
 SHA1 (git-1.7.3.4.tar.bz2) = 8bda6668531fc41a72a680978798deb9ee048846
 RMD160 (git-1.7.3.4.tar.bz2) = 37cdb8b50c802655643a243ef26fe3d50145d29c
@@ -8,5 +8,5 @@ SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091
 SHA1 (patch-ae) = 06ea26658a986dc702c1c2c04c1a27f0a01e4dce
 SHA1 (patch-af) = 60029a215edf5218a76be41932afb5b9f8c4729a
 SHA1 (patch-ag) = 4f0b9a5745203ea7ef369c8272b3ea7c644762f0
-SHA1 (patch-ah) = d60b5304109f64f70146a222f6eb1deeb58dd6ac
+SHA1 (patch-ah) = 132ab70b77140c88b2f24b9c696cbe306eb41ca8
 SHA1 (patch-ai) = 56b63d4790a11f5eb128186ad5efdd1bcf102f2e
diff --git a/devel/scmgit-base/options.mk b/devel/scmgit-base/options.mk
index f60aec4d2d7..26354779882 100644
--- a/devel/scmgit-base/options.mk
+++ b/devel/scmgit-base/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2010/04/28 22:01:43 morr Exp $
+# $NetBSD: options.mk,v 1.4 2010/12/23 23:42:40 abs Exp $
 #
 PKG_OPTIONS_VAR=	PKG_OPTIONS.scmgit
 PKG_SUPPORTED_OPTIONS=	scmgit-gui python
@@ -15,6 +15,12 @@ PLIST.gui=		yes
 USE_TOOLS+=		wish:run
 CONFIGURE_ARGS+=	--with-tcltk=${WISH:Q}
 .  if ${OPSYS} == "Darwin" && exists(/System/Library/Frameworks/Tk.framework)
+.    if exists(/System/Library/Frameworks/Tk.framework/Resources/Wish.app)
+WISH_APP=Wish
+.    else
+WISH_APP=Wish Shell
+.    endif
+PLIST_SUBST+= WISH_APP=${WISH_APP:Q}
 PLIST.macosx=		yes
 PRIVILEGED_STAGES+=	clean
 .  endif
diff --git a/devel/scmgit-base/patches/patch-ah b/devel/scmgit-base/patches/patch-ah
index b430a99485a..ce6b50b01ab 100644
--- a/devel/scmgit-base/patches/patch-ah
+++ b/devel/scmgit-base/patches/patch-ah
@@ -1,6 +1,6 @@
-$NetBSD: patch-ah,v 1.5 2008/08/20 03:04:20 bjs Exp $
+$NetBSD: patch-ah,v 1.6 2010/12/23 23:42:41 abs Exp $
 
---- git-gui/Makefile.orig	2008-08-17 16:43:06.000000000 -0400
+--- git-gui/Makefile.orig	2010-12-16 02:52:11.000000000 +0000
 +++ git-gui/Makefile
 @@ -48,11 +48,11 @@ endif
  RM_RF     ?= rm -rf
@@ -32,3 +32,12 @@ $NetBSD: patch-ah,v 1.5 2008/08/20 03:04:20 bjs Exp $
  	INSTALL_A0 = src=
  	INSTALL_A1 = && echo '   ' INSTALL '   ' `basename "$$src"` && find "$$src" | cpio -pud
  
+@@ -105,7 +105,7 @@ endif
+ 
+ ifeq ($(uname_S),Darwin)
+ 	TKFRAMEWORK = /Library/Frameworks/Tk.framework/Resources/Wish.app
+-	ifeq ($(shell echo "$(uname_R)" | awk -F. '{if ($$1 >= 9) print "y"}')_$(shell test -d $(TKFRAMEWORK) || echo n),y_n)
++	ifeq ($(shell echo "$(uname_R)" | awk -F. '{if ($$1 >= 8) print "y"}')_$(shell test -d $(TKFRAMEWORK) || echo n),y_n)
+ 		TKFRAMEWORK = /System/Library/Frameworks/Tk.framework/Resources/Wish.app
+ 		ifeq ($(shell test -d $(TKFRAMEWORK) || echo n),n)
+ 			TKFRAMEWORK = /System/Library/Frameworks/Tk.framework/Resources/Wish\ Shell.app