--- a/components/git/Makefile	Fri Dec 04 15:43:29 2015 -0800
+++ b/components/git/Makefile	Fri Dec 04 16:01:58 2015 -0800
@@ -61,8 +61,9 @@
 CONFIGURE_LIBDIR.64 =	$(CONFIGURE_PREFIX)/lib
 
 CONFIGURE_PREFIX    =	/usr
+CONFIGURE_OPTIONS  +=	--sysconfdir=/etc
+CONFIGURE_OPTIONS  +=	--libexecdir=/usr/lib
 CONFIGURE_OPTIONS  +=	--with-libpcre
-CONFIGURE_OPTIONS  +=	--libexecdir=/usr/lib
 CONFIGURE_OPTIONS  +=	--with-perl=$(PERL)
 CONFIGURE_OPTIONS  +=	--with-python=$(PYTHON.$(PYTHON_VERSION))
 CONFIGURE_OPTIONS  +=	CFLAGS="$(CFLAGS)"

--- a/components/git/git.p5m	Fri Dec 04 15:43:29 2015 -0800
+++ b/components/git/git.p5m	Fri Dec 04 16:01:58 2015 -0800
@@ -249,6 +249,10 @@
 file path=usr/perl5/$(PERL_VERSION)/man/man3/Git::SVN::Ra.3
 file path=usr/perl5/$(PERL_VERSION)/man/man3/Git::SVN::Utils.3
 file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Git/.packlist
+# perl/Makefile.PL installs this file if and only if 'require Error' fails.
+# Thus if git is installed, it succeeds, and the file is not installed.  So
+# ignore that and just pull from the source.
+file perl/private-Error.pm path=usr/perl5/vendor_perl/$(PERL_VERSION)/Error.pm
 file path=usr/perl5/vendor_perl/$(PERL_VERSION)/Git.pm
 file path=usr/perl5/vendor_perl/$(PERL_VERSION)/Git/I18N.pm
 file path=usr/perl5/vendor_perl/$(PERL_VERSION)/Git/IndexInfo.pm
@@ -340,7 +344,7 @@
 file path=usr/share/gitk/lib/msgs/ru.msg
 file path=usr/share/gitk/lib/msgs/sv.msg
 file path=usr/share/gitk/lib/msgs/vi.msg
-file path=usr/share/gitweb/gitweb.cgi
+file path=usr/share/gitweb/gitweb.cgi mode=0555
 file path=usr/share/gitweb/static/git-favicon.png
 file path=usr/share/gitweb/static/git-logo.png
 file path=usr/share/gitweb/static/gitweb.css

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/git/patches/gpg.patch	Fri Dec 04 16:01:58 2015 -0800
@@ -0,0 +1,15 @@
+On Solaris, GnuPG's main executable is "gpg2" instead of "gpg".  Perhaps
+that should be otherwise, but until we deliver a "gpg" executable, git
+should look for "gpg2" instead.  This is not suitable for upstream.
+
+--- git-2.6.1/gpg-interface.c	Fri Oct  2 15:40:47 2015
++++ git-2.6.1/gpg-interface.c	Fri Dec  4 14:12:20 2015
+@@ -5,7 +5,7 @@
+ #include "sigchain.h"
+ 
+ static char *configured_signing_key;
+-static const char *gpg_program = "gpg";
++static const char *gpg_program = "gpg2";
+ 
+ #define PGP_SIGNATURE "-----BEGIN PGP SIGNATURE-----"
+ #define PGP_MESSAGE "-----BEGIN PGP MESSAGE-----"