Updated scmgit to 1.5.0

Here is the very brief list of ...
Updates in v1.5.0 since v1.4.4 series
-------------------------------------

* Index manipulation
* Repository layout and objects transfer
* Bare repositories
* Reflog
* Crufts removal
* Detached HEAD
* Packed refs
* Configuration
* Updated features
* Less external dependency
* I18n
* e-mailed patches
* Foreign SCM interfaces
* User support
* Sliding mmap
* Shallow clones

...

the complete list is in the source package.

5 files changed, 39 insertions, 49 deletions

diff --git a/devel/scmgit/Makefile b/devel/scmgit/Makefile
index a6c279b131b..60e535aa896 100644
--- a/devel/scmgit/Makefile
+++ b/devel/scmgit/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2007/01/22 14:33:31 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2007/02/18 22:38:42 rillig Exp $
 #
 
-DISTNAME=	git-1.4.4.1
+DISTNAME=	git-1.5.0
 PKGNAME=	scm${DISTNAME}
-PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.kernel.org/pub/software/scm/git/
 
@@ -30,6 +29,7 @@ INSTALL_TARGET=	install install-doc
 MAKE_FLAGS+=	mandir=${PREFIX}/${PKGMANDIR}
 LDFLAGS=	${COMPILER_RPATH_FLAG}${PREFIX}/lib
 LIBS.SunOS+=	-liconv
+CFLAGS.NetBSD+=	-D_NETBSD_SOURCE
 
 PERL5_PACKLIST=	auto/Git/.packlist
 PERL5_CONFIGURE_DIRS=	${WRKSRC}/perl
@@ -48,7 +48,6 @@ PLIST_SUBST+=	IF_NEEDS_SUBPROCESS_PY="@comment "
 post-install:
 	chmod 644 ${PREFIX}/${PKGMANDIR}/man1/git*.1
 	chmod 644 ${PREFIX}/${PKGMANDIR}/man7/git*.7
-	chmod 644 ${PREFIX}/share/git-core/python/*.py
 
 .include "../../lang/perl5/module.mk"
 .include "../../converters/libiconv/buildlink3.mk"
diff --git a/devel/scmgit/PLIST b/devel/scmgit/PLIST
index ad47e697fb5..b00ef62fd3e 100644
--- a/devel/scmgit/PLIST
+++ b/devel/scmgit/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.4 2006/11/26 22:34:30 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2007/02/18 22:38:43 rillig Exp $
 bin/git
 bin/git-add
+bin/git-add--interactive
 bin/git-am
 bin/git-annotate
 bin/git-apply
@@ -17,10 +18,12 @@ bin/git-checkout
 bin/git-checkout-index
 bin/git-cherry
 bin/git-cherry-pick
+bin/git-citool
 bin/git-clean
 bin/git-clone
 bin/git-commit
 bin/git-commit-tree
+bin/git-config
 bin/git-convert-objects
 bin/git-count-objects
 bin/git-cvsexportcommit
@@ -33,19 +36,24 @@ bin/git-diff-files
 bin/git-diff-index
 bin/git-diff-stages
 bin/git-diff-tree
+bin/git-fast-import
 bin/git-fetch
 bin/git-fetch-pack
 bin/git-fmt-merge-msg
 bin/git-for-each-ref
 bin/git-format-patch
+bin/git-fsck
 bin/git-fsck-objects
+bin/git-gc
 bin/git-get-tar-commit-id
 bin/git-grep
+bin/git-gui
 bin/git-hash-object
 bin/git-http-fetch
 bin/git-http-push
 bin/git-imap-send
 bin/git-index-pack
+bin/git-init
 bin/git-init-db
 bin/git-instaweb
 bin/git-local-fetch
@@ -58,13 +66,12 @@ bin/git-mailinfo
 bin/git-mailsplit
 bin/git-merge
 bin/git-merge-base
+bin/git-merge-file
 bin/git-merge-index
 bin/git-merge-octopus
 bin/git-merge-one-file
 bin/git-merge-ours
-bin/git-merge-recur
 bin/git-merge-recursive
-bin/git-merge-recursive-old
 bin/git-merge-resolve
 bin/git-merge-stupid
 bin/git-merge-tree
@@ -86,7 +93,9 @@ bin/git-quiltimport
 bin/git-read-tree
 bin/git-rebase
 bin/git-receive-pack
+bin/git-reflog
 bin/git-relink
+bin/git-remote
 bin/git-repack
 bin/git-repo-config
 bin/git-request-pull
@@ -152,6 +161,7 @@ man/man1/git-clean.1
 man/man1/git-clone.1
 man/man1/git-commit-tree.1
 man/man1/git-commit.1
+man/man1/git-config.1
 man/man1/git-convert-objects.1
 man/man1/git-count-objects.1
 man/man1/git-cvsexportcommit.1
@@ -164,12 +174,15 @@ man/man1/git-diff-index.1
 man/man1/git-diff-stages.1
 man/man1/git-diff-tree.1
 man/man1/git-diff.1
+man/man1/git-fast-import.1
 man/man1/git-fetch-pack.1
 man/man1/git-fetch.1
 man/man1/git-fmt-merge-msg.1
 man/man1/git-for-each-ref.1
 man/man1/git-format-patch.1
 man/man1/git-fsck-objects.1
+man/man1/git-fsck.1
+man/man1/git-gc.1
 man/man1/git-get-tar-commit-id.1
 man/man1/git-grep.1
 man/man1/git-hash-object.1
@@ -178,6 +191,7 @@ man/man1/git-http-push.1
 man/man1/git-imap-send.1
 man/man1/git-index-pack.1
 man/man1/git-init-db.1
+man/man1/git-init.1
 man/man1/git-instaweb.1
 man/man1/git-local-fetch.1
 man/man1/git-log.1
@@ -188,6 +202,7 @@ man/man1/git-ls-tree.1
 man/man1/git-mailinfo.1
 man/man1/git-mailsplit.1
 man/man1/git-merge-base.1
+man/man1/git-merge-file.1
 man/man1/git-merge-index.1
 man/man1/git-merge-one-file.1
 man/man1/git-merge-tree.1
@@ -211,7 +226,9 @@ man/man1/git-quiltimport.1
 man/man1/git-read-tree.1
 man/man1/git-rebase.1
 man/man1/git-receive-pack.1
+man/man1/git-reflog.1
 man/man1/git-relink.1
+man/man1/git-remote.1
 man/man1/git-repack.1
 man/man1/git-repo-config.1
 man/man1/git-request-pull.1
@@ -255,8 +272,6 @@ man/man1/git-whatchanged.1
 man/man1/git-write-tree.1
 man/man1/gitk.1
 man/man7/git.7
-share/git-core/python/gitMergeCommon.py
-${IF_NEEDS_SUBPROCESS_PY}share/git-core/python/subprocess.py
 share/git-core/templates/description
 share/git-core/templates/hooks/applypatch-msg
 share/git-core/templates/hooks/commit-msg
@@ -274,5 +289,4 @@ share/git-core/templates/info/exclude
 @exec ${MKDIR} %D/share/git-core/templates/branches
 @dirrm share/git-core/templates/branches
 @dirrm share/git-core/templates
-@dirrm share/git-core/python
 @dirrm share/git-core
diff --git a/devel/scmgit/distinfo b/devel/scmgit/distinfo
index 349dc1a99db..1983e38aa3c 100644
--- a/devel/scmgit/distinfo
+++ b/devel/scmgit/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2007/01/22 14:33:31 rillig Exp $
+$NetBSD: distinfo,v 1.5 2007/02/18 22:38:43 rillig Exp $
 
-SHA1 (git-1.4.4.1.tar.gz) = 5e22daf46866068fd2734ddab3f2a0ca7cc517a8
-RMD160 (git-1.4.4.1.tar.gz) = 7881c835a382a001267ff89d0d738a1de97ffb95
-Size (git-1.4.4.1.tar.gz) = 1052897 bytes
-SHA1 (patch-aa) = 8901ddf3f60035d053a21c0afb540c1cdcf035c2
+SHA1 (git-1.5.0.tar.gz) = ea22c14f017fc8f9afa75ac6ac92d0fdee40d844
+RMD160 (git-1.5.0.tar.gz) = db539c6abd4f602359c17205a0bd0311a76f7b4d
+Size (git-1.5.0.tar.gz) = 1238666 bytes
+SHA1 (patch-aa) = ea9c34ec5390e626e13ed7e499c10adc9011d4d6
 SHA1 (patch-ab) = 89872ba1d182230359582c8c2c35424c045ee381
 SHA1 (patch-ac) = 5c86dfda134040f6eeafe4f18a742d99a5b003cc
-SHA1 (patch-ad) = 4fbd861a46c01b83fb6548378a523a52b52f5c75
+SHA1 (patch-ae) = 27881c9b69eb9be484856f2c2fe490d6d3b636ed
diff --git a/devel/scmgit/patches/patch-aa b/devel/scmgit/patches/patch-aa
index 1ed05f33b64..fa3891d9568 100644
--- a/devel/scmgit/patches/patch-aa
+++ b/devel/scmgit/patches/patch-aa
@@ -1,14 +1,12 @@
-$NetBSD: patch-aa,v 1.4 2007/01/22 14:33:31 rillig Exp $
+$NetBSD: patch-aa,v 1.5 2007/02/18 22:38:43 rillig Exp $
 
 NetBSD 3.0 needs -liconv, too.
 
 CFLAGS, LDFLAGS and LIBS should be taken from the environment.
 
-Install perl modules into the "vendor" directories.
-
---- Makefile.orig	2006-11-23 03:38:07.000000000 +0100
-+++ Makefile	2007-01-22 15:17:52.611639144 +0100
-@@ -106,8 +106,6 @@ uname_P := $(shell sh -c 'uname -p 2>/de
+--- Makefile.orig	2007-02-14 03:46:46.000000000 +0100
++++ Makefile	2007-02-18 22:54:11.000000000 +0100
+@@ -114,8 +114,6 @@ uname_P := $(shell sh -c 'uname -p 2>/de
  
  # CFLAGS and LDFLAGS are for the users to override from the command line.
  
@@ -17,15 +15,15 @@ Install perl modules into the "vendor" directories.
  ALL_CFLAGS = $(CFLAGS)
  ALL_LDFLAGS = $(LDFLAGS)
  STRIP ?= strip
-@@ -348,6 +346,7 @@ ifeq ($(uname_S),Darwin)
- 	endif
+@@ -344,6 +342,7 @@ ifeq ($(uname_S),Darwin)
+ 	NO_STRLCPY = YesPlease
  endif
  ifeq ($(uname_S),SunOS)
 +	NEEDS_LIBICONV = YesPlease
  	NEEDS_SOCKET = YesPlease
  	NEEDS_NSL = YesPlease
  	SHELL_PATH = /bin/bash
-@@ -393,9 +392,7 @@ ifeq ($(uname_S),OpenBSD)
+@@ -391,9 +390,7 @@ ifeq ($(uname_S),OpenBSD)
  	BASIC_LDFLAGS += -L/usr/local/lib
  endif
  ifeq ($(uname_S),NetBSD)
@@ -36,21 +34,12 @@ Install perl modules into the "vendor" directories.
  	BASIC_CFLAGS += -I/usr/pkg/include
  	BASIC_LDFLAGS += -L/usr/pkg/lib
  	ALL_LDFLAGS += -Wl,-rpath,/usr/pkg/lib
-@@ -577,7 +574,7 @@ PERL_PATH_SQ = $(subst ','\'',$(PERL_PAT
- PYTHON_PATH_SQ = $(subst ','\'',$(PYTHON_PATH))
- GIT_PYTHON_DIR_SQ = $(subst ','\'',$(GIT_PYTHON_DIR))
+@@ -594,7 +591,7 @@ prefix_SQ = $(subst ','\'',$(prefix))
+ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
+ PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
  
 -LIBS = $(GITLIBS) $(EXTLIBS)
 +LIBS += $(GITLIBS) $(EXTLIBS)
  
  BASIC_CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER_SQ)' $(COMPAT_CFLAGS)
  LIB_OBJS += $(COMPAT_OBJS)
-@@ -769,7 +766,7 @@ $(XDIFF_LIB): $(XDIFF_OBJS)
- 
- perl/Makefile: perl/Git.pm perl/Makefile.PL GIT-CFLAGS
- 	(cd perl && $(PERL_PATH) Makefile.PL \
--		PREFIX='$(prefix_SQ)')
-+		INSTALLDIRS=vendor PREFIX='$(prefix_SQ)')
- 
- doc:
- 	$(MAKE) -C Documentation all
diff --git a/devel/scmgit/patches/patch-ad b/devel/scmgit/patches/patch-ad
deleted file mode 100644
index 2febdc37656..00000000000
--- a/devel/scmgit/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2007/01/22 14:33:31 rillig Exp $
-
---- convert-objects.c.orig	2006-11-23 03:38:07.000000000 +0100
-+++ convert-objects.c	2007-01-22 14:57:28.302368232 +0100
-@@ -1,5 +1,7 @@
- #define _XOPEN_SOURCE 600 /* glibc2 and AIX 5.3L need 500, OpenBSD needs 600 for S_ISLNK() */
-+#if !defined(__sun)
- #define _XOPEN_SOURCE_EXTENDED 1 /* AIX 5.3L needs this */
-+#endif
- #define _GNU_SOURCE
- #include <time.h>
- #include "cache.h"