5 files changed, 30 insertions, 29 deletions
diff --git a/devel/scmgit-base/PLIST b/devel/scmgit-base/PLIST
index 6613ada5cfe..2c7bbce809c 100644
--- a/devel/scmgit-base/PLIST
+++ b/devel/scmgit-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.37 2012/10/28 01:17:09 christos Exp $
+@comment $NetBSD: PLIST,v 1.38 2012/11/16 21:18:38 adam Exp $
 bin/git
 bin/git-cvsserver
 bin/git-receive-pack
@@ -186,6 +186,7 @@ libexec/git-core/git-whatchanged
 libexec/git-core/git-write-tree
 libexec/git-core/mergetools/araxis
 libexec/git-core/mergetools/bc3
+libexec/git-core/mergetools/codecompare
 libexec/git-core/mergetools/defaults
 libexec/git-core/mergetools/deltawalker
 libexec/git-core/mergetools/diffuse
diff --git a/devel/scmgit-base/distinfo b/devel/scmgit-base/distinfo
index 60a8140e7ce..b875eed5b22 100644
--- a/devel/scmgit-base/distinfo
+++ b/devel/scmgit-base/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.62 2012/10/06 18:28:13 adam Exp $
+$NetBSD: distinfo,v 1.63 2012/11/16 21:18:39 adam Exp $
 
-SHA1 (git-1.7.12.2.tar.gz) = 277b759139ddb62c6935da37de8a483e2c234a97
-RMD160 (git-1.7.12.2.tar.gz) = 8b50f2fe3c04e3bf7c3489e14f0cf2512eee251e
-Size (git-1.7.12.2.tar.gz) = 4106910 bytes
-SHA1 (patch-aa) = 5d94f08d4ee6146401e84f8ca1bde8eb1459731a
+SHA1 (git-1.8.0.tar.gz) = a03afc33f8f0723ad12649d79f1e8968526b4bf7
+RMD160 (git-1.8.0.tar.gz) = 84fc876984629b05042a0f4c418a340503862120
+Size (git-1.8.0.tar.gz) = 4225055 bytes
+SHA1 (patch-aa) = b1a8a325a62013438324ec001bbe48eaebd56f5a
 SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091
 SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca
-SHA1 (patch-af) = 726b26f54b81973163d5941ad4a3392ea33a7ec2
+SHA1 (patch-af) = bdabf7e3b24171cbdc2117735e83765e6e23648c
 SHA1 (patch-ag) = 4f0b9a5745203ea7ef369c8272b3ea7c644762f0
 SHA1 (patch-ah) = f22a2160631fb624e9e20616c68ad1a4aa2bebc7
 SHA1 (patch-ai) = 56b63d4790a11f5eb128186ad5efdd1bcf102f2e
diff --git a/devel/scmgit-base/patches/patch-aa b/devel/scmgit-base/patches/patch-aa
index 310a914f4fb..c14a509d3c8 100644
--- a/devel/scmgit-base/patches/patch-aa
+++ b/devel/scmgit-base/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.18 2012/09/04 12:17:12 adam Exp $
+$NetBSD: patch-aa,v 1.19 2012/11/16 21:18:39 adam Exp $
 
---- Makefile.orig	2012-08-20 01:22:48.000000000 +0000
+--- Makefile.orig	2012-10-21 21:32:15.000000000 +0000
 +++ Makefile
-@@ -325,8 +325,6 @@ endif
+@@ -343,8 +343,6 @@ endif
  
  CFLAGS = -g -O2 -Wall
  LDFLAGS =
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.18 2012/09/04 12:17:12 adam Exp $
  STRIP ?= strip
  
  # Among the variables below, these:
-@@ -361,13 +359,9 @@ pathsep = :
+@@ -379,13 +377,9 @@ pathsep = :
  
  export prefix bindir sharedir sysconfdir gitwebdir localedir
  
@@ -25,7 +25,7 @@ $NetBSD: patch-aa,v 1.18 2012/09/04 12:17:12 adam Exp $
  RPMBUILD = rpmbuild
  TCL_PATH = tclsh
  TCLTK_PATH = wish
-@@ -1003,9 +997,10 @@ ifeq ($(uname_S),Darwin)
+@@ -1023,9 +1017,10 @@ ifeq ($(uname_S),Darwin)
  	BASIC_CFLAGS += -DPRECOMPOSE_UNICODE
  endif
  ifeq ($(uname_S),SunOS)
@@ -37,7 +37,7 @@ $NetBSD: patch-aa,v 1.18 2012/09/04 12:17:12 adam Exp $
  	SANE_TOOL_PATH = /usr/xpg6/bin:/usr/xpg4/bin
  	NO_STRCASESTR = YesPlease
  	NO_MEMMEM = YesPlease
-@@ -1048,8 +1043,6 @@ ifeq ($(uname_S),SunOS)
+@@ -1068,8 +1063,6 @@ ifeq ($(uname_S),SunOS)
  		NO_STRTOUMAX = YesPlease
  		GIT_TEST_CMP = cmp
  	endif
@@ -46,7 +46,7 @@ $NetBSD: patch-aa,v 1.18 2012/09/04 12:17:12 adam Exp $
  	BASIC_CFLAGS += -D__EXTENSIONS__ -D__sun__ -DHAVE_ALLOCA_H
  endif
  ifeq ($(uname_O),Cygwin)
-@@ -1941,8 +1934,8 @@ ifdef DEFAULT_HELP_FORMAT
+@@ -2038,8 +2031,8 @@ ifdef DEFAULT_HELP_FORMAT
  BASIC_CFLAGS += -DDEFAULT_HELP_FORMAT='"$(DEFAULT_HELP_FORMAT)"'
  endif
  
@@ -57,7 +57,7 @@ $NetBSD: patch-aa,v 1.18 2012/09/04 12:17:12 adam Exp $
  
  export DIFF TAR INSTALL DESTDIR SHELL_PATH
  
-@@ -2634,7 +2627,6 @@ ifndef NO_GETTEXT
+@@ -2732,7 +2725,6 @@ ifndef NO_GETTEXT
  endif
  ifndef NO_PERL
  	$(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
diff --git a/devel/scmgit-base/patches/patch-af b/devel/scmgit-base/patches/patch-af
index 99a1aacdfc6..413b82467f8 100644
--- a/devel/scmgit-base/patches/patch-af
+++ b/devel/scmgit-base/patches/patch-af
@@ -1,11 +1,20 @@
-$NetBSD: patch-af,v 1.9 2012/09/25 14:22:48 taca Exp $
+$NetBSD: patch-af,v 1.10 2012/11/16 21:18:39 adam Exp $
 
 * Use BSR_INSTALL_*.
 * FIXME: Add "--skip-validation" to xmlto command.
 
---- Documentation/Makefile.orig	2012-08-20 01:22:48.000000000 +0000
+--- Documentation/Makefile.orig	2012-10-21 21:32:15.000000000 +0000
 +++ Documentation/Makefile
-@@ -169,16 +169,16 @@ pdf: user-manual.pdf
+@@ -47,7 +47,7 @@ man7dir=$(mandir)/man7
+ ASCIIDOC = asciidoc
+ ASCIIDOC_EXTRA =
+ MANPAGE_XSL = manpage-normal.xsl
+-XMLTO = xmlto
++XMLTO = xmlto --skip-validation
+ XMLTO_EXTRA =
+ INSTALL?=install
+ RM ?= rm -f
+@@ -170,16 +170,16 @@ pdf: user-manual.pdf
  install: install-man
  
  install-man: man
@@ -30,12 +39,3 @@ $NetBSD: patch-af,v 1.9 2012/09/25 14:22:48 taca Exp $
  	if test -r $(DESTDIR)$(infodir)/dir; then \
  	  $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) git.info ;\
  	  $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) gitman.info ;\
-@@ -245,7 +245,7 @@ manpage-base-url.xsl: manpage-base-url.x
- 
- %.1 %.5 %.7 : %.xml manpage-base-url.xsl
- 	$(QUIET_XMLTO)$(RM) $@ && \
--	xmlto -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
-+	xmlto --skip-validation -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
- 
- %.xml : %.txt
- 	$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
diff --git a/devel/scmgit/Makefile.version b/devel/scmgit/Makefile.version
index e6b990d5ade..d10af47b351 100644
--- a/devel/scmgit/Makefile.version
+++ b/devel/scmgit/Makefile.version
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.version,v 1.48 2012/10/06 18:28:12 adam Exp $
+# $NetBSD: Makefile.version,v 1.49 2012/11/16 21:18:37 adam Exp $
 #
 # used by devel/scmgit/Makefile.common
 # used by www/gitweb/Makefile
 
-GIT_VERSION=	1.7.12.2
+GIT_VERSION=	1.8.0