Update to 1.5.2.3. Various changes.

7 files changed, 70 insertions, 67 deletions

diff --git a/devel/scmgit/Makefile b/devel/scmgit/Makefile
index 3c2852d89f9..c29176fcd84 100644
--- a/devel/scmgit/Makefile
+++ b/devel/scmgit/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2007/04/26 01:23:48 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.14 2007/07/08 20:19:57 wiz Exp $
 #
 
-DISTNAME=	git-1.5.1.1
+DISTNAME=	git-1.5.2.3
 PKGNAME=	scm${DISTNAME}
-PKGREVISION=	1
 CATEGORIES=	devel scm
 MASTER_SITES=	http://www.kernel.org/pub/software/scm/git/
 
diff --git a/devel/scmgit/PLIST b/devel/scmgit/PLIST
index 69b3948e13c..682b9307a75 100644
--- a/devel/scmgit/PLIST
+++ b/devel/scmgit/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2007/04/15 21:46:41 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2007/07/08 20:19:57 wiz Exp $
 bin/git
 bin/git-add
 bin/git-add--interactive
@@ -14,6 +14,7 @@ bin/git-blame
 bin/git-branch
 bin/git-bundle
 bin/git-cat-file
+bin/git-check-attr
 bin/git-check-ref-format
 bin/git-checkout
 bin/git-checkout-index
@@ -75,6 +76,7 @@ bin/git-merge-ours
 bin/git-merge-recursive
 bin/git-merge-resolve
 bin/git-merge-stupid
+bin/git-merge-subtree
 bin/git-merge-tree
 bin/git-mergetool
 bin/git-mktag
@@ -154,6 +156,7 @@ man/man1/git-blame.1
 man/man1/git-branch.1
 man/man1/git-bundle.1
 man/man1/git-cat-file.1
+man/man1/git-check-attr.1
 man/man1/git-check-ref-format.1
 man/man1/git-checkout-index.1
 man/man1/git-checkout.1
@@ -272,6 +275,8 @@ man/man1/git-verify-tag.1
 man/man1/git-whatchanged.1
 man/man1/git-write-tree.1
 man/man1/gitk.1
+man/man5/gitattributes.5
+man/man5/gitignore.5
 man/man7/git.7
 share/git-core/templates/description
 share/git-core/templates/hooks/applypatch-msg
@@ -284,6 +289,24 @@ share/git-core/templates/hooks/pre-commit
 share/git-core/templates/hooks/pre-rebase
 share/git-core/templates/hooks/update
 share/git-core/templates/info/exclude
+share/git-gui/lib/blame.tcl
+share/git-gui/lib/branch.tcl
+share/git-gui/lib/browser.tcl
+share/git-gui/lib/class.tcl
+share/git-gui/lib/commit.tcl
+share/git-gui/lib/console.tcl
+share/git-gui/lib/database.tcl
+share/git-gui/lib/diff.tcl
+share/git-gui/lib/error.tcl
+share/git-gui/lib/index.tcl
+share/git-gui/lib/merge.tcl
+share/git-gui/lib/option.tcl
+share/git-gui/lib/remote.tcl
+share/git-gui/lib/shortcut.tcl
+share/git-gui/lib/tclIndex
+share/git-gui/lib/transport.tcl
+@dirrm share/git-gui/lib
+@dirrm share/git-gui
 @dirrm share/git-core/templates/info
 @dirrm share/git-core/templates/hooks
 @exec ${MKDIR} %D/share/git-core/templates/branches
diff --git a/devel/scmgit/distinfo b/devel/scmgit/distinfo
index bb7ebf3a51a..9f9f5786e97 100644
--- a/devel/scmgit/distinfo
+++ b/devel/scmgit/distinfo
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.10 2007/04/26 01:24:29 dmcmahill Exp $
+$NetBSD: distinfo,v 1.11 2007/07/08 20:19:57 wiz Exp $
 
-SHA1 (git-1.5.1.1.tar.gz) = 6d0607e125e8466e85af411fde894ee7ef96098d
-RMD160 (git-1.5.1.1.tar.gz) = efbc8e5b49831561915f2b674efca5a6c5ffc6a2
-Size (git-1.5.1.1.tar.gz) = 1322959 bytes
-SHA1 (patch-aa) = 3341fce439889b78c244cc48cf6c1f2ef3578a75
+SHA1 (git-1.5.2.3.tar.gz) = 6fa3888840ca6de7d8d5b7fdac46849393d893dd
+RMD160 (git-1.5.2.3.tar.gz) = 8e0286e7dec43d6b0dfba312f5895d7260778ab6
+Size (git-1.5.2.3.tar.gz) = 1411121 bytes
+SHA1 (patch-aa) = 5e04beafa83732910493a5e3f4fe0c314b62e671
 SHA1 (patch-ab) = 59aaf91ef1f0d5a9ded006157467d8bd12d7b87b
 SHA1 (patch-ac) = 5c86dfda134040f6eeafe4f18a742d99a5b003cc
-SHA1 (patch-ad) = 6be56a65b692d16dfce45b167d2a0858ca9064cd
 SHA1 (patch-ae) = d267e41f5f883bde801728328c67fd733d3bd351
-SHA1 (patch-af) = d5cceb813a2e222116e220182e92eef75f40f8a4
+SHA1 (patch-af) = 28b0d77a56c0ca6c9ce6fe992956a79e23064695
 SHA1 (patch-ag) = 6f4e3c0418286c0ca3fbc00a72a90e59983cb6bc
-SHA1 (patch-ah) = 6de6fcc23f919a1278f90788f8e12f532bc0a5e3
+SHA1 (patch-ah) = 8715acb5c596573c7bd39fc327dd12009ff57ee3
diff --git a/devel/scmgit/patches/patch-aa b/devel/scmgit/patches/patch-aa
index 5e0833952b1..494cb0bcd73 100644
--- a/devel/scmgit/patches/patch-aa
+++ b/devel/scmgit/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.7 2007/04/26 01:23:49 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.8 2007/07/08 20:19:57 wiz Exp $
 
 NetBSD 3.0 needs -liconv, too.
 
 AR, CC, CFLAGS, LDFLAGS and LIBS should be taken from the environment.
 
---- Makefile.orig	2007-04-12 01:41:44.000000000 +0000
+--- Makefile.orig	2007-07-02 08:11:39.000000000 +0000
 +++ Makefile
-@@ -123,8 +123,6 @@ uname_P := $(shell sh -c 'uname -p 2>/de
+@@ -137,8 +137,6 @@ uname_P := $(shell sh -c 'uname -p 2>/de
  
  # CFLAGS and LDFLAGS are for the users to override from the command line.
  
@@ -15,18 +15,18 @@ AR, CC, CFLAGS, LDFLAGS and LIBS should be taken from the environment.
  ALL_CFLAGS = $(CFLAGS)
  ALL_LDFLAGS = $(LDFLAGS)
  STRIP ?= strip
-@@ -154,10 +152,6 @@ GITWEB_SITE_FOOTER =
+@@ -174,10 +172,6 @@ GITWEB_SITE_FOOTER =
  
- export prefix bindir gitexecdir template_dir
+ export prefix bindir gitexecdir sharedir template_dir sysconfdir
  
 -CC = gcc
 -AR = ar
 -TAR = tar
 -INSTALL = install
  RPMBUILD = rpmbuild
- 
- # sparse is architecture-neutral, which means that we need to tell it
-@@ -360,6 +354,7 @@ ifeq ($(uname_S),Darwin)
+ TCL_PATH = tclsh
+ TCLTK_PATH = wish
+@@ -408,6 +402,7 @@ ifeq ($(uname_S),Darwin)
  	NO_STRLCPY = YesPlease
  endif
  ifeq ($(uname_S),SunOS)
@@ -34,7 +34,7 @@ AR, CC, CFLAGS, LDFLAGS and LIBS should be taken from the environment.
  	NEEDS_SOCKET = YesPlease
  	NEEDS_NSL = YesPlease
  	SHELL_PATH = /bin/bash
-@@ -377,8 +372,6 @@ ifeq ($(uname_S),SunOS)
+@@ -426,8 +421,6 @@ ifeq ($(uname_S),SunOS)
  		NO_C99_FORMAT = YesPlease
  		NO_STRTOUMAX = YesPlease
  	endif
@@ -43,7 +43,7 @@ AR, CC, CFLAGS, LDFLAGS and LIBS should be taken from the environment.
  	BASIC_CFLAGS += -D__EXTENSIONS__
  endif
  ifeq ($(uname_O),Cygwin)
-@@ -408,9 +401,7 @@ ifeq ($(uname_S),OpenBSD)
+@@ -457,9 +450,7 @@ ifeq ($(uname_S),OpenBSD)
  	BASIC_LDFLAGS += -L/usr/local/lib
  endif
  ifeq ($(uname_S),NetBSD)
@@ -54,27 +54,32 @@ AR, CC, CFLAGS, LDFLAGS and LIBS should be taken from the environment.
  	BASIC_CFLAGS += -I/usr/pkg/include
  	BASIC_LDFLAGS += -L/usr/pkg/lib
  	ALL_LDFLAGS += -Wl,-rpath,/usr/pkg/lib
-@@ -648,7 +639,7 @@ prefix_SQ = $(subst ','\'',$(prefix))
- SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
- PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
+@@ -711,7 +702,7 @@ PERL_PATH_SQ = $(subst ','\'',$(PERL_PAT
+ PYTHON_PATH_SQ = $(subst ','\'',$(PYTHON_PATH))
+ TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
  
 -LIBS = $(GITLIBS) $(EXTLIBS)
 +LIBS += $(GITLIBS) $(EXTLIBS)
  
  BASIC_CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER_SQ)' \
  	-DETC_GITCONFIG='"$(ETC_GITCONFIG_SQ)"' $(COMPAT_CFLAGS)
-@@ -890,10 +881,10 @@ check: common-cmds.h
+@@ -997,14 +988,14 @@ check: common-cmds.h
  ### Installation rules
  
  install: all
 -	$(INSTALL) -d -m755 '$(DESTDIR_SQ)$(bindir_SQ)'
 -	$(INSTALL) -d -m755 '$(DESTDIR_SQ)$(gitexecdir_SQ)'
 -	$(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexecdir_SQ)'
--	$(INSTALL) git$X gitk '$(DESTDIR_SQ)$(bindir_SQ)'
+-	$(INSTALL) git$X '$(DESTDIR_SQ)$(bindir_SQ)'
 +	$(BSD_INSTALL_PROGRAM_DIR) '$(DESTDIR_SQ)$(bindir_SQ)'
 +	$(BSD_INSTALL_PROGRAM_DIR) '$(DESTDIR_SQ)$(gitexecdir_SQ)'
 +	$(BSD_INSTALL_SCRIPT) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexecdir_SQ)'
-+	$(BSD_INSTALL_SCRIPT) git$X gitk '$(DESTDIR_SQ)$(bindir_SQ)'
++	$(BSD_INSTALL_SCRIPT) git$X '$(DESTDIR_SQ)$(bindir_SQ)'
  	$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
  	$(MAKE) -C perl prefix='$(prefix_SQ)' install
+ ifndef NO_TCLTK
+-	$(INSTALL) gitk-wish '$(DESTDIR_SQ)$(bindir_SQ)'/gitk
++	$(BSD_INSTALL_SCRIPT) gitk-wish '$(DESTDIR_SQ)$(bindir_SQ)'/gitk
  	$(MAKE) -C git-gui install
+ endif
+ 	if test 'z$(bindir_SQ)' != 'z$(gitexecdir_SQ)'; \
diff --git a/devel/scmgit/patches/patch-ad b/devel/scmgit/patches/patch-ad
deleted file mode 100644
index 90d221d67d5..00000000000
--- a/devel/scmgit/patches/patch-ad
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2007/04/26 01:23:49 dmcmahill Exp $
-
-Avoid conflicting with the wcwidth which exists in libc but
-with a different prototype:
-
-utf8.c:66: error: conflicting types for `wcwidth'
-/usr/include/wchar.h:146: error: previous declaration of `wcwidth'
-
---- utf8.c.orig	2007-03-05 02:15:33.000000000 +0000
-+++ utf8.c
-@@ -62,7 +62,7 @@ static int bisearch(ucs_char_t ucs, cons
-  * in ISO 10646.
-  */
- 
--static int wcwidth(ucs_char_t ch)
-+static int git_wcwidth(ucs_char_t ch)
- {
- 	/*
- 	 * Sorted list of non-overlapping intervals of non-spacing characters,
-@@ -207,7 +207,7 @@ invalid:
- 		return 0;
- 	}
- 
--	return wcwidth(ch);
-+	return git_wcwidth(ch);
- }
- 
- int is_utf8(const char *text)
diff --git a/devel/scmgit/patches/patch-af b/devel/scmgit/patches/patch-af
index 14d641df5d0..55df8a4aadc 100644
--- a/devel/scmgit/patches/patch-af
+++ b/devel/scmgit/patches/patch-af
@@ -1,18 +1,23 @@
-$NetBSD: patch-af,v 1.1 2007/04/26 01:23:49 dmcmahill Exp $
+$NetBSD: patch-af,v 1.2 2007/07/08 20:19:58 wiz Exp $
 
---- Documentation/Makefile.orig	2007-03-05 02:15:33.000000000 +0000
+--- Documentation/Makefile.orig	2007-07-02 08:11:39.000000000 +0000
 +++ Documentation/Makefile
-@@ -59,9 +59,10 @@ man1: $(DOC_MAN1)
+@@ -67,12 +67,12 @@ man5: $(DOC_MAN5)
  man7: $(DOC_MAN7)
  
  install: man
--	$(INSTALL) -d -m755 $(DESTDIR)$(man1dir) $(DESTDIR)$(man7dir)
+-	$(INSTALL) -d -m755 $(DESTDIR)$(man1dir)
+-	$(INSTALL) -d -m755 $(DESTDIR)$(man5dir)
+-	$(INSTALL) -d -m755 $(DESTDIR)$(man7dir)
 -	$(INSTALL) -m644 $(DOC_MAN1) $(DESTDIR)$(man1dir)
+-	$(INSTALL) -m644 $(DOC_MAN5) $(DESTDIR)$(man5dir)
 -	$(INSTALL) -m644 $(DOC_MAN7) $(DESTDIR)$(man7dir)
 +	$(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(man1dir)
++	$(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(man5dir)
 +	$(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(man7dir)
 +	$(BSD_INSTALL_MAN) $(DOC_MAN1) $(DESTDIR)$(man1dir)
++	$(BSD_INSTALL_MAN) $(DOC_MAN5) $(DESTDIR)$(man5dir)
 +	$(BSD_INSTALL_MAN) $(DOC_MAN7) $(DESTDIR)$(man7dir)
  
  
- #
+ ../GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
diff --git a/devel/scmgit/patches/patch-ah b/devel/scmgit/patches/patch-ah
index 363a202fc4b..f169160bd50 100644
--- a/devel/scmgit/patches/patch-ah
+++ b/devel/scmgit/patches/patch-ah
@@ -1,9 +1,9 @@
-$NetBSD: patch-ah,v 1.1 2007/04/26 01:23:49 dmcmahill Exp $
+$NetBSD: patch-ah,v 1.2 2007/07/08 20:19:58 wiz Exp $
 
---- git-gui/Makefile.orig	2007-04-12 01:41:44.000000000 +0000
+--- git-gui/Makefile.orig	2007-07-02 08:11:39.000000000 +0000
 +++ git-gui/Makefile
-@@ -54,8 +54,8 @@ $(patsubst %.sh,%,$(SCRIPT_SH)): GIT-VER
- all:: $(ALL_PROGRAMS)
+@@ -115,8 +115,8 @@ GIT-GUI-VARS: .FORCE-GIT-GUI-VARS
+ all:: $(ALL_PROGRAMS) lib/tclIndex
  
  install: all
 -	$(INSTALL) -d -m755 '$(DESTDIR_SQ)$(gitexecdir_SQ)'
@@ -11,5 +11,5 @@ $NetBSD: patch-ah,v 1.1 2007/04/26 01:23:49 dmcmahill Exp $
 +	$(BSD_INSTALL_PROGRAM_DIR) '$(DESTDIR_SQ)$(gitexecdir_SQ)'
 +	$(BSD_INSTALL_SCRIPT) git-gui '$(DESTDIR_SQ)$(gitexecdir_SQ)'
  	$(foreach p,$(GITGUI_BUILT_INS), rm -f '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git-gui' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;)
- 
- dist-version:
+ 	$(INSTALL) -d -m755 '$(DESTDIR_SQ)$(libdir_SQ)'
+ 	$(INSTALL) -m644 lib/tclIndex '$(DESTDIR_SQ)$(libdir_SQ)'