Index: git/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/devel/git/Makefile.common,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile.common
--- git/Makefile.common	24 May 2016 11:30:30 -0000	1.4
+++ git/Makefile.common	24 May 2016 19:53:45 -0000
@@ -6,8 +6,6 @@
 # used by devel/git-gitk/Makefile
 # used by www/gitweb/Makefile
 
-MAKE_JOBS_SAFE=	no # 2.8.3 with gmake-4.2
-
 .include "../../devel/git/Makefile.version"
 
 DISTNAME=	git-${GIT_VERSION}
Index: git-base/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/devel/git-base/distinfo,v
retrieving revision 1.49
diff -u -p -r1.49 distinfo
--- git-base/distinfo	22 May 2016 18:00:37 -0000	1.49
+++ git-base/distinfo	24 May 2016 19:53:45 -0000
@@ -4,9 +4,9 @@ SHA1 (git-2.8.3.tar.xz) = cbde50ff94b70c
 RMD160 (git-2.8.3.tar.xz) = 7662ccea6893954d4d03843f1717713b853cc352
 SHA512 (git-2.8.3.tar.xz) = 747b6927700ab47648746f61984588a040ec0bda6db218e1c0a86cb443846fc3efd4875758bab9b1004d6239f285ce546f7df0b9d189177d77b0f8ba62776ad2
 Size (git-2.8.3.tar.xz) = 3979536 bytes
-SHA1 (patch-aa) = 38893bb1cff2668ac66e39fe1aa33de9636180d1
+SHA1 (patch-aa) = a1ab140967ab4e904078b0f8b803fc9f6d75ca65
 SHA1 (patch-ac) = 376cdd1c58b143c820ff6395987a8a77cf9b52ba
-SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca
+SHA1 (patch-ae) = 8e4196c9fe36853b521e997ce11d0ecb61409e72
 SHA1 (patch-af) = 06460f220b4703a1ff98809006ec1aed5017bb23
 SHA1 (patch-ag) = 4f0b9a5745203ea7ef369c8272b3ea7c644762f0
 SHA1 (patch-ah) = f22a2160631fb624e9e20616c68ad1a4aa2bebc7
Index: git-base/patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/devel/git-base/patches/patch-aa,v
retrieving revision 1.6
diff -u -p -r1.6 patch-aa
--- git-base/patches/patch-aa	7 Apr 2016 13:26:37 -0000	1.6
+++ git-base/patches/patch-aa	24 May 2016 19:53:45 -0000
@@ -1,8 +1,14 @@
 $NetBSD: patch-aa,v 1.6 2016/04/07 13:26:37 adam Exp $
 
---- Makefile.orig	2016-04-03 19:07:18.000000000 +0000
-+++ Makefile
-@@ -379,8 +379,6 @@ GIT-VERSION-FILE: FORCE
+o Adjust {C,LD}FLAGS and other variables
+o Delete perl/perl.mak and perl/PM.stamp (redefined in perl/Makefile to avoid
+  build issues when MAKE_JOBS > 1 and perl/ subdirectory is entered first).
+  Also define FIND_SQ similarly to other *_SQ variables.
+o Do not install gitweb
+
+--- Makefile.orig	2016-05-19 19:17:58.000000000 +0200
++++ Makefile	2016-05-24 18:34:40.747118026 +0200
+@@ -376,8 +376,6 @@ GIT-VERSION-FILE: FORCE
  
  CFLAGS = -g -O2 -Wall
  LDFLAGS =
@@ -11,7 +17,7 @@ $NetBSD: patch-aa,v 1.6 2016/04/07 13:26
  STRIP ?= strip
  
  ifdef DEVELOPER
-@@ -436,13 +434,9 @@ htmldir_relative = $(patsubst $(prefix)/
+@@ -433,13 +431,9 @@ htmldir_relative = $(patsubst $(prefix)/
  
  export prefix bindir sharedir sysconfdir gitwebdir localedir
  
@@ -25,7 +31,15 @@ $NetBSD: patch-aa,v 1.6 2016/04/07 13:26
  RPMBUILD = rpmbuild
  TCL_PATH = tclsh
  TCLTK_PATH = wish
-@@ -1619,8 +1613,8 @@ ifdef DEFAULT_HELP_FORMAT
+@@ -1570,6 +1564,7 @@ PERL_PATH_SQ = $(subst ','\'',$(PERL_PAT
+ PYTHON_PATH_SQ = $(subst ','\'',$(PYTHON_PATH))
+ TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
+ DIFF_SQ = $(subst ','\'',$(DIFF))
++FIND_SQ = $(subst ','\'',$(FIND))
+ PERLLIB_EXTRA_SQ = $(subst ','\'',$(PERLLIB_EXTRA))
+ 
+ LIBS = $(GITLIBS) $(EXTLIBS)
+@@ -1613,8 +1608,8 @@ ifdef DEFAULT_HELP_FORMAT
  BASIC_CFLAGS += -DDEFAULT_HELP_FORMAT='"$(DEFAULT_HELP_FORMAT)"'
  endif
  
@@ -36,7 +50,38 @@ $NetBSD: patch-aa,v 1.6 2016/04/07 13:26
  
  export DIFF TAR INSTALL DESTDIR SHELL_PATH
  
-@@ -2315,11 +2309,10 @@ install: all
+@@ -1656,7 +1651,7 @@ ifndef NO_TCLTK
+ 	$(QUIET_SUBDIR0)gitk-git $(QUIET_SUBDIR1) all
+ endif
+ ifndef NO_PERL
+-	$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' localedir='$(localedir_SQ)' all
++	$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) FIND='$(FIND_SQ)' PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' localedir='$(localedir_SQ)' all
+ endif
+ 	$(QUIET_SUBDIR0)templates $(QUIET_SUBDIR1) SHELL_PATH='$(SHELL_PATH_SQ)' PERL_PATH='$(PERL_PATH_SQ)'
+ 
+@@ -1779,20 +1774,8 @@ git.res: git.rc GIT-VERSION-FILE
+ $(SCRIPT_PERL_GEN): GIT-BUILD-OPTIONS
+ 
+ ifndef NO_PERL
+-$(SCRIPT_PERL_GEN): perl/perl.mak
+-
+-perl/perl.mak: perl/PM.stamp
+-
+-perl/PM.stamp: FORCE
+-	@$(FIND) perl -type f -name '*.pm' | sort >$@+ && \
+-	{ cmp $@+ $@ >/dev/null 2>/dev/null || mv $@+ $@; } && \
+-	$(RM) $@+
+-
+-perl/perl.mak: GIT-CFLAGS GIT-PREFIX perl/Makefile perl/Makefile.PL
+-	$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)
+-
+ PERL_DEFINES = $(PERL_PATH_SQ):$(PERLLIB_EXTRA_SQ)
+-$(SCRIPT_PERL_GEN): % : %.perl perl/perl.mak GIT-PERL-DEFINES GIT-VERSION-FILE
++$(SCRIPT_PERL_GEN): % : %.perl GIT-PERL-DEFINES GIT-VERSION-FILE
+ 	$(QUIET_GEN)$(RM) $@ $@+ && \
+ 	INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \
+ 	INSTLIBDIR_EXTRA='$(PERLLIB_EXTRA_SQ)' && \
+@@ -2309,11 +2292,10 @@ install: all
  ifndef NO_GETTEXT
  	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(localedir_SQ)'
  	(cd po/build/locale && $(TAR) cf - .) | \
Index: git-base/patches/patch-ae
===================================================================
RCS file: /cvsroot/pkgsrc/devel/git-base/patches/patch-ae,v
retrieving revision 1.1
diff -u -p -r1.1 patch-ae
--- git-base/patches/patch-ae	9 Sep 2013 13:54:44 -0000	1.1
+++ git-base/patches/patch-ae	24 May 2016 19:53:45 -0000
@@ -1,9 +1,12 @@
 $NetBSD: patch-ae,v 1.1 2013/09/09 13:54:44 wiz Exp $
 
-In pkgsrc, all Perl modules are installed into vendor_perl, not
-site_perl.
+o In pkgsrc, all Perl modules are installed into vendor_perl, not
+  site_perl.
+o Define the PM.stamp target (previously in main Makefile).
+  This avoid `*** No rule to make target 'PM.stamp', needed by 'perl.mak'.'
+  problem when MAKE_JOBS > 1 and perl/ subdirectory is entered first.
 
---- perl/Makefile.orig	2008-08-17 16:43:06.000000000 -0400
+--- perl/Makefile.orig	2016-05-19 17:17:58.000000000 +0000
 +++ perl/Makefile
 @@ -13,7 +13,7 @@ ifndef V
  endif
@@ -14,3 +17,15 @@ site_perl.
  
  clean:
  	$(QUIET)test -f $(makfile) && $(MAKE) -f $(makfile) $@ || exit 0
+@@ -24,6 +24,11 @@ clean:
+ 
+ $(makfile): PM.stamp
+ 
++PM.stamp:
++	@$(FIND) . -type f -name '*.pm' | sort >$@+ && \
++	{ cmp $@+ $@ >/dev/null 2>/dev/null || mv $@+ $@; } && \
++	$(RM) $@+
++
+ ifdef NO_PERL_MAKEMAKER
+ instdir_SQ = $(subst ','\'',$(prefix)/lib)
+