Import of pkgsrc-2016Q3

devel/git-base/MESSAGE

@@ -1,9 +1,11 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2014/01/16 09:34:27 wiz Exp $
+$NetBSD: MESSAGE,v 1.3 2016/05/26 15:41:06 khorben Exp $
 
 NOTE:	Pristine templates are located in:
 	${GIT_TEMPLATE_INSTDIR}.
 
+To use the git-cvsimport repository conversion from CVS, install git-cvs.
+
 To use the git-svn interface to Subversion, install git-svn.
 
 ===========================================================================

devel/git-base/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2015/07/12 18:56:09 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2016/07/21 13:12:25 wiz Exp $
 
 .include "../../devel/git/Makefile.common"
 

devel/git-base/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2015/07/31 12:57:23 adam Exp $
+@comment $NetBSD: PLIST,v 1.14 2016/09/07 08:56:33 adam Exp $
 bin/git
 bin/git-cvsserver
 bin/git-receive-pack
@@ -149,6 +149,7 @@ libexec/git-core/git-stash
 libexec/git-core/git-status
 libexec/git-core/git-stripspace
 libexec/git-core/git-submodule
+libexec/git-core/git-submodule--helper
 libexec/git-core/git-svn
 libexec/git-core/git-symbolic-ref
 libexec/git-core/git-tag
@@ -176,6 +177,7 @@ libexec/git-core/mergetools/diffmerge
 libexec/git-core/mergetools/diffuse
 libexec/git-core/mergetools/ecmerge
 libexec/git-core/mergetools/emerge
+libexec/git-core/mergetools/examdiff
 libexec/git-core/mergetools/gvimdiff
 libexec/git-core/mergetools/gvimdiff2
 libexec/git-core/mergetools/gvimdiff3
@@ -201,6 +203,7 @@ share/examples/git/templates/hooks/pre-applypatch.sample
 share/examples/git/templates/hooks/pre-commit.sample
 share/examples/git/templates/hooks/pre-push.sample
 share/examples/git/templates/hooks/pre-rebase.sample
+share/examples/git/templates/hooks/pre-receive.sample
 share/examples/git/templates/hooks/prepare-commit-msg.sample
 share/examples/git/templates/hooks/update.sample
 share/examples/git/templates/info/exclude
@@ -210,6 +213,7 @@ share/locale/de/LC_MESSAGES/git.mo
 share/locale/fr/LC_MESSAGES/git.mo
 share/locale/is/LC_MESSAGES/git.mo
 share/locale/it/LC_MESSAGES/git.mo
+share/locale/ko/LC_MESSAGES/git.mo
 share/locale/pt_PT/LC_MESSAGES/git.mo
 share/locale/ru/LC_MESSAGES/git.mo
 share/locale/sv/LC_MESSAGES/git.mo

devel/git-base/distinfo

@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.34 2015/09/13 09:24:32 wiz Exp $
+$NetBSD: distinfo,v 1.54 2016/09/07 08:56:33 adam Exp $
 
-SHA1 (git-2.5.2.tar.xz) = 5078512c7dba1db2d98814c1abe7550dc18507c9
-RMD160 (git-2.5.2.tar.xz) = 82d2f002871e02371392986a0fe90150c01c7337
-Size (git-2.5.2.tar.xz) = 3744080 bytes
-SHA1 (patch-aa) = 8c1096065d26b93a6e10bc6926d3fc3686f711f2
+SHA1 (git-2.10.0.tar.xz) = a5c580e30b686e6b9424e886bf5d93ade635d837
+RMD160 (git-2.10.0.tar.xz) = d80fc2c17db82625e3c57362555de5d63cecb257
+SHA512 (git-2.10.0.tar.xz) = 69d031f55141c2cb2cfce69ac808d1765c1502e10867e8f6e8fb2d9ac5e2fa5773f3ba4a8f4b59e313c715e757c97b3cd3f1b13da45c7bc3958bf53026f0718e
+Size (git-2.10.0.tar.xz) = 4096264 bytes
+SHA1 (patch-aa) = a58f3c2f45c1fbafd751d10b9ef34e6c9afc2c6f
 SHA1 (patch-ac) = 376cdd1c58b143c820ff6395987a8a77cf9b52ba
 SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca
 SHA1 (patch-af) = 06460f220b4703a1ff98809006ec1aed5017bb23

devel/git-base/options.mk

@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2014/08/01 19:18:39 schmonz Exp $
+# $NetBSD: options.mk,v 1.4 2016/04/11 04:22:33 dbj Exp $
 #
 PKG_OPTIONS_VAR=	PKG_OPTIONS.git
 PKG_SUPPORTED_OPTIONS=	python apple-common-crypto
@@ -26,7 +26,7 @@ CONFIGURE_ARGS+=	--without-python
 
 .if !empty(PKG_OPTIONS:Mapple-common-crypto)
 .  if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
-PKG_FAIL_REASON=	"apple-common-crypto not available on this system"
+PKG_FAIL_REASON+=	"apple-common-crypto not available on this system"
 .  endif
 CONFIGURE_ARGS+=	--without-openssl
 .else

devel/git-base/patches/patch-aa

@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.4 2014/11/20 21:43:10 bsiegert Exp $
+$NetBSD: patch-aa,v 1.8 2016/09/07 08:56:33 adam Exp $
 
---- Makefile.orig	2014-05-30 21:38:10.000000000 +0000
+--- Makefile.orig	2016-09-03 01:59:09.000000000 +0000
 +++ Makefile
-@@ -354,8 +354,6 @@ GIT-VERSION-FILE: FORCE
- 
- CFLAGS = -g -O2 -Wall
+@@ -396,8 +396,6 @@ DEVELOPER_CFLAGS = -Werror \
+ 	-Wunused \
+ 	-Wvla
  LDFLAGS =
 -ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
 -ALL_LDFLAGS = $(LDFLAGS)
  STRIP ?= strip
  
- # Among the variables below, these:
-@@ -396,13 +394,9 @@ htmldir_relative = $(patsubst $(prefix)/
+ # Create as necessary, replace existing, make ranlib unneeded.
+@@ -441,13 +439,9 @@ htmldir_relative = $(patsubst $(prefix)/
  
  export prefix bindir sharedir sysconfdir gitwebdir localedir
  
@@ -22,12 +22,12 @@ $NetBSD: patch-aa,v 1.4 2014/11/20 21:43:10 bsiegert Exp $
 -TAR = tar
  FIND = find
 -INSTALL = install
- RPMBUILD = rpmbuild
  TCL_PATH = tclsh
  TCLTK_PATH = wish
-@@ -1635,8 +1629,8 @@ ifdef DEFAULT_HELP_FORMAT
- BASIC_CFLAGS += -DDEFAULT_HELP_FORMAT='"$(DEFAULT_HELP_FORMAT)"'
- endif
+ XGETTEXT = xgettext
+@@ -1647,8 +1641,8 @@ PAGER_ENV_CQ = "$(subst ",\",$(subst \,\
+ PAGER_ENV_CQ_SQ = $(subst ','\'',$(PAGER_ENV_CQ))
+ BASIC_CFLAGS += -DPAGER_ENV='$(PAGER_ENV_CQ_SQ)'
  
 -ALL_CFLAGS += $(BASIC_CFLAGS)
 -ALL_LDFLAGS += $(BASIC_LDFLAGS)
@@ -36,10 +36,10 @@ $NetBSD: patch-aa,v 1.4 2014/11/20 21:43:10 bsiegert Exp $
  
  export DIFF TAR INSTALL DESTDIR SHELL_PATH
  
-@@ -2349,11 +2343,10 @@ install: all
+@@ -2341,11 +2335,10 @@ install: all
  ifndef NO_GETTEXT
-	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(localedir_SQ)'
-	(cd po/build/locale && $(TAR) cf - .) | \
+ 	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(localedir_SQ)'
+ 	(cd po/build/locale && $(TAR) cf - .) | \
 -	(cd '$(DESTDIR_SQ)$(localedir_SQ)' && umask 022 && $(TAR) xof -)
 +	(cd '$(DESTDIR_SQ)$(localedir_SQ)' && umask 022 && $(TAR) xf -)
  endif