Reimport scmgit-base as git-base-1.8.4 in devel/git-base.

Git is a free and open source distributed version control system
designed to handle everything from small to very large projects with
speed and efficiency.

Git is easy to learn and has a tiny footprint with lightning fast
performance. It outclasses SCM tools like Subversion, CVS, Perforce,
and ClearCase with features like cheap local branching, convenient
staging areas, and multiple workflows.

This package contains only the git program (and subcommands).  It does
not contain man pages or the tk-based repository browser.

15 files changed, 671 insertions, 0 deletions

diff --git a/devel/git-base/DESCR b/devel/git-base/DESCR
new file mode 100644
index 00000000000..48778b139ee
--- /dev/null
+++ b/devel/git-base/DESCR
@@ -0,0 +1,11 @@
+Git is a free and open source distributed version control system
+designed to handle everything from small to very large projects with
+speed and efficiency.
+
+Git is easy to learn and has a tiny footprint with lightning fast
+performance. It outclasses SCM tools like Subversion, CVS, Perforce,
+and ClearCase with features like cheap local branching, convenient
+staging areas, and multiple workflows.
+
+This package contains only the git program (and subcommands).  It does
+not contain man pages or the tk-based repository browser.
diff --git a/devel/git-base/MESSAGE b/devel/git-base/MESSAGE
new file mode 100644
index 00000000000..e246642954c
--- /dev/null
+++ b/devel/git-base/MESSAGE
@@ -0,0 +1,9 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2013/09/09 13:54:44 wiz Exp $
+
+NOTE:	Pristine templates are located in:
+	${GIT_TEMPLATE_INSTDIR}.
+
+To use the git-svn interface to Subversion you must also install the
+p5-subversion package in devel/p5-subversion.
+===========================================================================
diff --git a/devel/git-base/Makefile b/devel/git-base/Makefile
new file mode 100644
index 00000000000..1d5c525c3a2
--- /dev/null
+++ b/devel/git-base/Makefile
@@ -0,0 +1,110 @@
+# $NetBSD: Makefile,v 1.1 2013/09/09 13:54:44 wiz Exp $
+
+.include "../../devel/git/Makefile.common"
+
+PKGNAME=	git-base-${GIT_VERSION}
+COMMENT=	GIT Tree History Storage Tool (base package)
+
+CONFLICTS+=		git<4.9.5nb1		# misc/git
+CONFLICTS+=		scmgit-base-[0-9]*
+
+DEPENDS+=		p5-Error>=0.17015:../../devel/p5-Error
+# for git-send-email
+DEPENDS+=		p5-MIME-Base64>=3.13:../../converters/p5-MIME-Base64
+DEPENDS+=		p5-Email-Valid>=0.190:../../mail/p5-Email-Valid
+DEPENDS+=		p5-MailTools>=2.11:../../mail/p5-MailTools
+DEPENDS+=		p5-Net-SMTP-SSL>=1.01:../../mail/p5-Net-SMTP-SSL
+DEPENDS+=		p5-Authen-SASL>=1.0:../../security/p5-Authen-SASL
+
+USE_LANGUAGES=		c99
+USE_TOOLS+=		perl:run sh:run msgfmt
+
+PERL5_CONFIGURE=	no
+PERL5_PACKLIST=		auto/Git/.packlist
+REPLACE_PERL+=		*.perl */*.perl */*/*.perl
+REPLACE_PERL+=		contrib/hooks/update-paranoid
+
+CFLAGS.NetBSD+=		-D_NETBSD_SOURCE
+
+CONFIGURE_ARGS+=	--with-curl=${BUILDLINK_PREFIX.curl}
+CONFIGURE_ARGS+=	--with-expat=${BUILDLINK_PREFIX.expat}
+CONFIGURE_ARGS+=	--with-iconv=${BUILDLINK_PREFIX.iconv}
+CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
+CONFIGURE_ARGS+=	--with-perl=${PERL5:Q}
+CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib}
+CONFIGURE_ARGS+=	--without-tcltk
+
+BUILD_TARGET=		all
+
+REPLACE_SH+=		contrib/hooks/post-receive-email
+REPLACE_SH+=		contrib/hooks/pre-auto-gc-battery
+
+EGDIR=			${PREFIX}/share/examples/git
+
+GIT_COREDIR=		git-core
+GIT_TEMPLATEDIR=	templates
+
+GIT_TEMPLATES=		description info/exclude
+GIT_TEMPLATES+=		hooks/applypatch-msg.sample hooks/commit-msg.sample
+GIT_TEMPLATES+=		hooks/post-update.sample hooks/pre-applypatch.sample
+GIT_TEMPLATES+=		hooks/pre-commit.sample hooks/pre-rebase.sample
+GIT_TEMPLATES+=		hooks/prepare-commit-msg.sample hooks/update.sample
+
+# XXX unused as of now
+#GIT_CORE_EXECDIR=	libexec/${GIT_COREDIR}
+GIT_CORE_DATADIR=	share/${GIT_COREDIR}
+GIT_CORE_TEMPLATEDIR=	${GIT_CORE_DATADIR}/${GIT_TEMPLATEDIR}
+
+MAKE_DIRS=		${GIT_CORE_TEMPLATEDIR}
+MAKE_DIRS+=		${GIT_CORE_TEMPLATEDIR}/hooks
+MAKE_DIRS+=		${GIT_CORE_TEMPLATEDIR}/info
+
+REQD_FILES+=		${GIT_TEMPLATES:@.t.@\
+				${EGDIR}/${GIT_TEMPLATEDIR}/${.t.}\
+				${PREFIX}/${GIT_CORE_TEMPLATEDIR}/${.t.}\
+			@:M*}
+
+CONFIGURE_ENV+=		HOME=${PREFIX}
+CONFIGURE_ENV+=		gitexecdir=${GITCOREDIR}
+
+MAKE_FLAGS+=		INSTALL=${INSTALL:Q}
+
+GIT_TEMPLATE_INSTDIR=	${EGDIR}/${GIT_TEMPLATEDIR}
+MAKE_ENV+=		GIT_TEMPLATE_INSTDIR=${GIT_TEMPLATE_INSTDIR}
+MESSAGE_SUBST+=		GIT_TEMPLATE_INSTDIR=${GIT_TEMPLATE_INSTDIR}
+
+SUBST_CLASSES+=		fix-paths
+SUBST_FILES.fix-paths=	templates/hooks--post-receive.sample
+SUBST_MESSAGE.fix-paths=Fixing hard-coded pathnames
+SUBST_STAGE.fix-paths=	pre-build
+SUBST_VARS.fix-paths=	PREFIX
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS" || ${OPSYS} == "OSF1" || ${OPSYS} == "HPUX" || ${OPSYS} == "QNX" || ${OPSYS} == "UnixWare"
+SUBST_CLASSES+=		fix-cd-P
+SUBST_FILES.fix-cd-P=	git-sh-setup.sh
+SUBST_FILES.fix-cd-P+=	t/test-lib.sh
+SUBST_MESSAGE.fix-cd-P=	Fixing cd arguments.
+SUBST_STAGE.fix-cd-P=	pre-build
+SUBST_SED.fix-cd-P=	-e "s/cd -P/cd/g"
+.endif
+
+LDFLAGS.SunOS+=		-lintl -lnsl
+
+post-install:
+	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/contrib/completion/git-completion.bash \
+		${DESTDIR}${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/contrib/completion/git-prompt.sh \
+		${DESTDIR}${EGDIR}
+
+.include "options.mk"
+
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../lang/perl5/module.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/git-base/PLIST b/devel/git-base/PLIST
new file mode 100644
index 00000000000..f45667c1b8c
--- /dev/null
+++ b/devel/git-base/PLIST
@@ -0,0 +1,251 @@
+@comment $NetBSD: PLIST,v 1.1 2013/09/09 13:54:44 wiz Exp $
+bin/git
+bin/git-cvsserver
+bin/git-receive-pack
+bin/git-shell
+bin/git-upload-archive
+bin/git-upload-pack
+${PERL5_SUB_INSTALLVENDORLIB}/Git.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Git/I18N.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Git/IndexInfo.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Git/SVN.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Git/SVN/Editor.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Git/SVN/Fetcher.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Git/SVN/GlobSpec.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Git/SVN/Log.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Git/SVN/Memoize/YAML.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Git/SVN/Migration.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Git/SVN/Prompt.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Git/SVN/Ra.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Git/SVN/Utils.pm
+${PERL5_SUB_INSTALLVENDORARCH}/auto/Git/.packlist
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/Git.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/Git::I18N.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/Git::SVN::Editor.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/Git::SVN::Fetcher.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/Git::SVN::Memoize::YAML.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/Git::SVN::Prompt.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/Git::SVN::Ra.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/Git::SVN::Utils.3
+${PLIST.python}${PYSITELIB}/git_remote_helpers/__init__.py
+${PLIST.python}${PYSITELIB}/git_remote_helpers/__init__.pyc
+${PLIST.python}${PYSITELIB}/git_remote_helpers/git/__init__.py
+${PLIST.python}${PYSITELIB}/git_remote_helpers/git/__init__.pyc
+${PLIST.python}${PYSITELIB}/git_remote_helpers/git/exporter.py
+${PLIST.python}${PYSITELIB}/git_remote_helpers/git/exporter.pyc
+${PLIST.python}${PYSITELIB}/git_remote_helpers/git/git.py
+${PLIST.python}${PYSITELIB}/git_remote_helpers/git/git.pyc
+${PLIST.python}${PYSITELIB}/git_remote_helpers/git/importer.py
+${PLIST.python}${PYSITELIB}/git_remote_helpers/git/importer.pyc
+${PLIST.python}${PYSITELIB}/git_remote_helpers/git/non_local.py
+${PLIST.python}${PYSITELIB}/git_remote_helpers/git/non_local.pyc
+${PLIST.python}${PYSITELIB}/git_remote_helpers/git/repo.py
+${PLIST.python}${PYSITELIB}/git_remote_helpers/git/repo.pyc
+${PLIST.python}${PYSITELIB}/git_remote_helpers/util.py
+${PLIST.python}${PYSITELIB}/git_remote_helpers/util.pyc
+libexec/git-core/git
+libexec/git-core/git-add
+libexec/git-core/git-add--interactive
+libexec/git-core/git-am
+libexec/git-core/git-annotate
+libexec/git-core/git-apply
+libexec/git-core/git-archimport
+libexec/git-core/git-archive
+libexec/git-core/git-bisect
+libexec/git-core/git-bisect--helper
+libexec/git-core/git-blame
+libexec/git-core/git-branch
+libexec/git-core/git-bundle
+libexec/git-core/git-cat-file
+libexec/git-core/git-check-attr
+libexec/git-core/git-check-ignore
+libexec/git-core/git-check-mailmap
+libexec/git-core/git-check-ref-format
+libexec/git-core/git-checkout
+libexec/git-core/git-checkout-index
+libexec/git-core/git-cherry
+libexec/git-core/git-cherry-pick
+libexec/git-core/git-clean
+libexec/git-core/git-clone
+libexec/git-core/git-column
+libexec/git-core/git-commit
+libexec/git-core/git-commit-tree
+libexec/git-core/git-config
+libexec/git-core/git-count-objects
+libexec/git-core/git-credential
+libexec/git-core/git-credential-cache
+libexec/git-core/git-credential-cache--daemon
+libexec/git-core/git-credential-store
+libexec/git-core/git-cvsexportcommit
+libexec/git-core/git-cvsimport
+libexec/git-core/git-cvsserver
+libexec/git-core/git-daemon
+libexec/git-core/git-describe
+libexec/git-core/git-diff
+libexec/git-core/git-diff-files
+libexec/git-core/git-diff-index
+libexec/git-core/git-diff-tree
+libexec/git-core/git-difftool
+libexec/git-core/git-difftool--helper
+libexec/git-core/git-fast-export
+libexec/git-core/git-fast-import
+libexec/git-core/git-fetch
+libexec/git-core/git-fetch-pack
+libexec/git-core/git-filter-branch
+libexec/git-core/git-fmt-merge-msg
+libexec/git-core/git-for-each-ref
+libexec/git-core/git-format-patch
+libexec/git-core/git-fsck
+libexec/git-core/git-fsck-objects
+libexec/git-core/git-gc
+libexec/git-core/git-get-tar-commit-id
+libexec/git-core/git-grep
+libexec/git-core/git-hash-object
+libexec/git-core/git-help
+libexec/git-core/git-http-backend
+libexec/git-core/git-http-fetch
+libexec/git-core/git-http-push
+libexec/git-core/git-imap-send
+libexec/git-core/git-index-pack
+libexec/git-core/git-init
+libexec/git-core/git-init-db
+libexec/git-core/git-instaweb
+libexec/git-core/git-log
+libexec/git-core/git-lost-found
+libexec/git-core/git-ls-files
+libexec/git-core/git-ls-remote
+libexec/git-core/git-ls-tree
+libexec/git-core/git-mailinfo
+libexec/git-core/git-mailsplit
+libexec/git-core/git-merge
+libexec/git-core/git-merge-base
+libexec/git-core/git-merge-file
+libexec/git-core/git-merge-index
+libexec/git-core/git-merge-octopus
+libexec/git-core/git-merge-one-file
+libexec/git-core/git-merge-ours
+libexec/git-core/git-merge-recursive
+libexec/git-core/git-merge-resolve
+libexec/git-core/git-merge-subtree
+libexec/git-core/git-merge-tree
+libexec/git-core/git-mergetool
+libexec/git-core/git-mergetool--lib
+libexec/git-core/git-mktag
+libexec/git-core/git-mktree
+libexec/git-core/git-mv
+libexec/git-core/git-name-rev
+libexec/git-core/git-notes
+libexec/git-core/git-p4
+libexec/git-core/git-pack-objects
+libexec/git-core/git-pack-redundant
+libexec/git-core/git-pack-refs
+libexec/git-core/git-parse-remote
+libexec/git-core/git-patch-id
+libexec/git-core/git-peek-remote
+libexec/git-core/git-prune
+libexec/git-core/git-prune-packed
+libexec/git-core/git-pull
+libexec/git-core/git-push
+libexec/git-core/git-quiltimport
+libexec/git-core/git-read-tree
+libexec/git-core/git-rebase
+libexec/git-core/git-rebase--am
+libexec/git-core/git-rebase--interactive
+libexec/git-core/git-rebase--merge
+libexec/git-core/git-receive-pack
+libexec/git-core/git-reflog
+libexec/git-core/git-relink
+libexec/git-core/git-remote
+libexec/git-core/git-remote-ext
+libexec/git-core/git-remote-fd
+libexec/git-core/git-remote-ftp
+libexec/git-core/git-remote-ftps
+libexec/git-core/git-remote-http
+libexec/git-core/git-remote-https
+libexec/git-core/git-remote-testsvn
+libexec/git-core/git-repack
+libexec/git-core/git-replace
+libexec/git-core/git-repo-config
+libexec/git-core/git-request-pull
+libexec/git-core/git-rerere
+libexec/git-core/git-reset
+libexec/git-core/git-rev-list
+libexec/git-core/git-rev-parse
+libexec/git-core/git-revert
+libexec/git-core/git-rm
+libexec/git-core/git-send-email
+libexec/git-core/git-send-pack
+libexec/git-core/git-sh-i18n
+libexec/git-core/git-sh-i18n--envsubst
+libexec/git-core/git-sh-setup
+libexec/git-core/git-shell
+libexec/git-core/git-shortlog
+libexec/git-core/git-show
+libexec/git-core/git-show-branch
+libexec/git-core/git-show-index
+libexec/git-core/git-show-ref
+libexec/git-core/git-stage
+libexec/git-core/git-stash
+libexec/git-core/git-status
+libexec/git-core/git-stripspace
+libexec/git-core/git-submodule
+libexec/git-core/git-svn
+libexec/git-core/git-symbolic-ref
+libexec/git-core/git-tag
+libexec/git-core/git-tar-tree
+libexec/git-core/git-unpack-file
+libexec/git-core/git-unpack-objects
+libexec/git-core/git-update-index
+libexec/git-core/git-update-ref
+libexec/git-core/git-update-server-info
+libexec/git-core/git-upload-archive
+libexec/git-core/git-upload-pack
+libexec/git-core/git-var
+libexec/git-core/git-verify-pack
+libexec/git-core/git-verify-tag
+libexec/git-core/git-web--browse
+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/deltawalker
+libexec/git-core/mergetools/diffuse
+libexec/git-core/mergetools/ecmerge
+libexec/git-core/mergetools/emerge
+libexec/git-core/mergetools/gvimdiff
+libexec/git-core/mergetools/gvimdiff2
+libexec/git-core/mergetools/kdiff3
+libexec/git-core/mergetools/kompare
+libexec/git-core/mergetools/meld
+libexec/git-core/mergetools/opendiff
+libexec/git-core/mergetools/p4merge
+libexec/git-core/mergetools/tkdiff
+libexec/git-core/mergetools/tortoisemerge
+libexec/git-core/mergetools/vimdiff
+libexec/git-core/mergetools/vimdiff2
+libexec/git-core/mergetools/xxdiff
+share/examples/git/git-completion.bash
+share/examples/git/git-prompt.sh
+share/examples/git/templates/description
+share/examples/git/templates/hooks/applypatch-msg.sample
+share/examples/git/templates/hooks/commit-msg.sample
+share/examples/git/templates/hooks/post-update.sample
+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/prepare-commit-msg.sample
+share/examples/git/templates/hooks/update.sample
+share/examples/git/templates/info/exclude
+share/locale/da/LC_MESSAGES/git.mo
+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/nl/LC_MESSAGES/git.mo
+share/locale/pt_PT/LC_MESSAGES/git.mo
+share/locale/sv/LC_MESSAGES/git.mo
+share/locale/vi/LC_MESSAGES/git.mo
+share/locale/zh_CN/LC_MESSAGES/git.mo
+@pkgdir share/examples/git/templates/branches
diff --git a/devel/git-base/distinfo b/devel/git-base/distinfo
new file mode 100644
index 00000000000..ffb60812aee
--- /dev/null
+++ b/devel/git-base/distinfo
@@ -0,0 +1,14 @@
+$NetBSD: distinfo,v 1.1 2013/09/09 13:54:44 wiz Exp $
+
+SHA1 (git-1.8.4.tar.gz) = 2a361a2d185b8bc604f7f2ce2f502d0dea9d3279
+RMD160 (git-1.8.4.tar.gz) = 546720ff4234e0aec4867a81c7fba3130ccae397
+Size (git-1.8.4.tar.gz) = 4657759 bytes
+SHA1 (patch-aa) = 47e743aedffe231477d82d1190787af64faaa4b4
+SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091
+SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca
+SHA1 (patch-af) = d4741caeaed3ef6cfabf415f9fdbc95968307131
+SHA1 (patch-ag) = 4f0b9a5745203ea7ef369c8272b3ea7c644762f0
+SHA1 (patch-ah) = f22a2160631fb624e9e20616c68ad1a4aa2bebc7
+SHA1 (patch-ai) = 56b63d4790a11f5eb128186ad5efdd1bcf102f2e
+SHA1 (patch-config.mak.uname) = e7fa7a91d4d9dd6793d752b1833f97fcaea236b1
+SHA1 (patch-wrapper.c) = d8252c63cca9a134fca3f8f6f28663f563c7b4bc
diff --git a/devel/git-base/options.mk b/devel/git-base/options.mk
new file mode 100644
index 00000000000..a316e051dd9
--- /dev/null
+++ b/devel/git-base/options.mk
@@ -0,0 +1,25 @@
+# $NetBSD: options.mk,v 1.1 2013/09/09 13:54:44 wiz Exp $
+#
+PKG_OPTIONS_VAR=	PKG_OPTIONS.git
+PKG_SUPPORTED_OPTIONS=	python
+# python is not suggested because upstream's INSTALL does not list python
+# as a dependency and because all it does is install a python module,
+# which does not seem worth the dependency for everyone else.
+PKG_SUGGESTED_OPTIONS=
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=		python
+
+.if !empty(PKG_OPTIONS:Mpython)
+PY_PATCHPLIST=	yes
+MAKE_FLAGS+=	PYTHON_PATH=${PYTHONBIN}
+PLIST.python=		yes
+# not executable
+CHECK_INTERPRETER_SKIP+= ${PYSITELIB}/git_remote_helpers/*.py
+CHECK_INTERPRETER_SKIP+= ${PYSITELIB}/git_remote_helpers/git/*.py
+.include "../../lang/python/application.mk"
+.include "../../lang/python/extension.mk"
+.else
+CONFIGURE_ARGS+=	--without-python
+.endif
diff --git a/devel/git-base/patches/patch-aa b/devel/git-base/patches/patch-aa
new file mode 100644
index 00000000000..a54da23ed30
--- /dev/null
+++ b/devel/git-base/patches/patch-aa
@@ -0,0 +1,46 @@
+$NetBSD: patch-aa,v 1.1 2013/09/09 13:54:44 wiz Exp $
+
+--- Makefile.orig	2012-10-21 21:32:15.000000000 +0000
++++ Makefile
+@@ -343,8 +343,6 @@ endif
+ 
+ CFLAGS = -g -O2 -Wall
+ LDFLAGS =
+-ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
+-ALL_LDFLAGS = $(LDFLAGS)
+ STRIP ?= strip
+ 
+ # Among the variables below, these:
+@@ -379,13 +377,9 @@ pathsep = :
+ 
+ export prefix bindir sharedir sysconfdir gitwebdir localedir
+ 
+-CC = cc
+-AR = ar
+ RM = rm -f
+ DIFF = diff
+-TAR = tar
+ FIND = find
+-INSTALL = install
+ RPMBUILD = rpmbuild
+ TCL_PATH = tclsh
+ TCLTK_PATH = wish
+@@ -2038,8 +2031,8 @@ ifdef DEFAULT_HELP_FORMAT
+ BASIC_CFLAGS += -DDEFAULT_HELP_FORMAT='"$(DEFAULT_HELP_FORMAT)"'
+ endif
+ 
+-ALL_CFLAGS += $(BASIC_CFLAGS)
+-ALL_LDFLAGS += $(BASIC_LDFLAGS)
++ALL_CFLAGS = $(BASIC_CFLAGS) $(CPPFLAGS) $(CFLAGS)
++ALL_LDFLAGS = $(BASIC_LDFLAGS) $(LDFLAGS)
+ 
+ export DIFF TAR INSTALL DESTDIR SHELL_PATH
+ 
+@@ -2732,7 +2725,6 @@ ifndef NO_GETTEXT
+ endif
+ ifndef NO_PERL
+ 	$(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
+-	$(MAKE) -C gitweb install
+ endif
+ ifndef NO_PYTHON
+ 	$(MAKE) -C git_remote_helpers prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
diff --git a/devel/git-base/patches/patch-ac b/devel/git-base/patches/patch-ac
new file mode 100644
index 00000000000..661a235a724
--- /dev/null
+++ b/devel/git-base/patches/patch-ac
@@ -0,0 +1,17 @@
+$NetBSD: patch-ac,v 1.1 2013/09/09 13:54:44 wiz Exp $
+
+--- gitk-git/Makefile.orig	2008-08-17 16:43:06.000000000 -0400
++++ gitk-git/Makefile
+@@ -40,9 +40,9 @@ endif
+ all:: gitk-wish $(ALL_MSGFILES)
+ 
+ install:: all
+-	$(INSTALL) -m 755 gitk-wish '$(DESTDIR_SQ)$(bindir_SQ)'/gitk
+-	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(msgsdir_SQ)'
+-	$(foreach p,$(ALL_MSGFILES), $(INSTALL) -m 644 $p '$(DESTDIR_SQ)$(msgsdir_SQ)' &&) true
++	$(BSD_INSTALL_SCRIPT) gitk-wish '$(DESTDIR_SQ)$(bindir_SQ)'/gitk
++	$(BSD_INSTALL_DATA_DIR) '$(DESTDIR_SQ)$(msgsdir_SQ)'
++	$(foreach p,$(ALL_MSGFILES), $(BSD_INSTALL_DATA) $p '$(DESTDIR_SQ)$(msgsdir_SQ)' &&) true
+ 
+ uninstall::
+ 	$(foreach p,$(ALL_MSGFILES), $(RM) '$(DESTDIR_SQ)$(msgsdir_SQ)'/$(notdir $p) &&) true
diff --git a/devel/git-base/patches/patch-ae b/devel/git-base/patches/patch-ae
new file mode 100644
index 00000000000..79777c8d32e
--- /dev/null
+++ b/devel/git-base/patches/patch-ae
@@ -0,0 +1,16 @@
+$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.
+
+--- perl/Makefile.orig	2008-08-17 16:43:06.000000000 -0400
++++ perl/Makefile
+@@ -13,7 +13,7 @@ ifndef V
+ endif
+ 
+ all install instlibdir: $(makfile)
+-	$(QUIET)$(MAKE) -f $(makfile) $@
++	$(QUIET)$(MAKE) -f $(makfile) INSTALLDIRS=vendor $@
+ 
+ clean:
+ 	$(QUIET)test -f $(makfile) && $(MAKE) -f $(makfile) $@ || exit 0
diff --git a/devel/git-base/patches/patch-af b/devel/git-base/patches/patch-af
new file mode 100644
index 00000000000..859827504ca
--- /dev/null
+++ b/devel/git-base/patches/patch-af
@@ -0,0 +1,41 @@
+$NetBSD: patch-af,v 1.1 2013/09/09 13:54:44 wiz Exp $
+
+* Use BSR_INSTALL_*.
+* FIXME: Add "--skip-validation" to xmlto command.
+
+--- Documentation/Makefile.orig	2013-08-23 19:38:43.000000000 +0000
++++ Documentation/Makefile
+@@ -92,7 +92,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
+@@ -212,16 +212,16 @@ pdf: user-manual.pdf
+ install: install-man
+ 
+ install-man: man
+-	$(INSTALL) -d -m 755 $(DESTDIR)$(man1dir)
+-	$(INSTALL) -d -m 755 $(DESTDIR)$(man5dir)
+-	$(INSTALL) -d -m 755 $(DESTDIR)$(man7dir)
+-	$(INSTALL) -m 644 $(DOC_MAN1) $(DESTDIR)$(man1dir)
+-	$(INSTALL) -m 644 $(DOC_MAN5) $(DESTDIR)$(man5dir)
+-	$(INSTALL) -m 644 $(DOC_MAN7) $(DESTDIR)$(man7dir)
++	$(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(man1dir)
++	$(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(man5dir)
++	$(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(man7dir)
++	$(BSD_INSTALL_MAN) $(DOC_MAN1) $(DESTDIR)$(man1dir)
++	$(BSD_INSTALL_MAN) $(DOC_MAN5) $(DESTDIR)$(man5dir)
++	$(BSD_INSTALL_MAN) $(DOC_MAN7) $(DESTDIR)$(man7dir)
+ 
+ install-info: info
+-	$(INSTALL) -d -m 755 $(DESTDIR)$(infodir)
+-	$(INSTALL) -m 644 git.info gitman.info $(DESTDIR)$(infodir)
++	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(infodir)
++	$(BSD_INSTALL_DATA) git.info gitman.info $(DESTDIR)$(infodir)
+ 	if test -r $(DESTDIR)$(infodir)/dir; then \
+ 	  $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) git.info ;\
+ 	  $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) gitman.info ;\
diff --git a/devel/git-base/patches/patch-ag b/devel/git-base/patches/patch-ag
new file mode 100644
index 00000000000..991e9bc5cab
--- /dev/null
+++ b/devel/git-base/patches/patch-ag
@@ -0,0 +1,30 @@
+$NetBSD: patch-ag,v 1.1 2013/09/09 13:54:44 wiz Exp $
+
+--- templates/Makefile.orig	2010-10-22 03:49:16.000000000 +0000
++++ templates/Makefile
+@@ -8,7 +8,7 @@ INSTALL ?= install
+ TAR ?= tar
+ RM ?= rm -f
+ prefix ?= $(HOME)
+-template_instdir ?= $(prefix)/share/git-core/templates
++template_instdir = ${GIT_TEMPLATE_INSTDIR}
+ # DESTDIR=
+ 
+ ifndef SHELL_PATH
+@@ -39,7 +39,7 @@ boilerplates.made : $(bpsrc)
+ 		case "$$boilerplate" in *~) continue ;; esac && \
+ 		dst=`echo "$$boilerplate" | sed -e 's|^this|.|;s|--|/|g'` && \
+ 		dir=`expr "$$dst" : '\(.*\)/'` && \
+-		mkdir -p blt/$$dir && \
++		$(BSD_INSTALL_DATA_DIR) blt/$$dir && \
+ 		case "$$boilerplate" in \
+ 		*--) continue;; \
+ 		esac && \
+@@ -61,6 +61,6 @@ clean:
+ 	$(RM) -r blt boilerplates.made
+ 
+ install: all
+-	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(template_instdir_SQ)'
++	$(BSD_INSTALL_DATA_DIR) '$(DESTDIR_SQ)$(template_instdir_SQ)'
+ 	(cd blt && $(TAR) cf - .) | \
+ 	(cd '$(DESTDIR_SQ)$(template_instdir_SQ)' && umask 022 && $(TAR) xof -)
diff --git a/devel/git-base/patches/patch-ah b/devel/git-base/patches/patch-ah
new file mode 100644
index 00000000000..957b4e24f8e
--- /dev/null
+++ b/devel/git-base/patches/patch-ah
@@ -0,0 +1,43 @@
+$NetBSD: patch-ah,v 1.1 2013/09/09 13:54:44 wiz Exp $
+
+--- git-gui/Makefile.orig	2010-12-16 02:52:11.000000000 +0000
++++ git-gui/Makefile
+@@ -48,11 +48,11 @@ endif
+ RM_RF     ?= rm -rf
+ RMDIR     ?= rmdir
+ 
+-INSTALL_D0 = $(INSTALL) -d -m 755 # space is required here
++INSTALL_D0 = $(BSD_INSTALL_DATA_DIR) # space is required here
+ INSTALL_D1 =
+-INSTALL_R0 = $(INSTALL) -m 644 # space is required here
++INSTALL_R0 = $(BSD_INSTALL_DATA)  # space is required here
+ INSTALL_R1 =
+-INSTALL_X0 = $(INSTALL) -m 755 # space is required here
++INSTALL_X0 = $(BSD_INSTALL_SCRIPT) # space is required here
+ INSTALL_X1 =
+ INSTALL_A0 = find # space is required here
+ INSTALL_A1 = | cpio -pud
+@@ -76,11 +76,11 @@ ifndef V
+ 	QUIET_2DEVNULL = 2>/dev/null
+ 
+ 	INSTALL_D0 = dir=
+-	INSTALL_D1 = && echo ' ' DEST $$dir && $(INSTALL) -d -m 755 "$$dir"
++	INSTALL_D1 = && echo ' ' DEST $$dir && $(BSD_INSTALL_DATA_DIR) "$$dir"
+ 	INSTALL_R0 = src=
+-	INSTALL_R1 = && echo '   ' INSTALL 644 `basename $$src` && $(INSTALL) -m 644 $$src
++	INSTALL_R1 = && echo '   ' INSTALL 644 `basename $$src` && $(BSD_INSTALL_DATA) $$src
+ 	INSTALL_X0 = src=
+-	INSTALL_X1 = && echo '   ' INSTALL 755 `basename $$src` && $(INSTALL) -m 755 $$src
++	INSTALL_X1 = && echo '   ' INSTALL 755 `basename $$src` && $(BSD_INSTALL_SCRIPT) $$src
+ 	INSTALL_A0 = src=
+ 	INSTALL_A1 = && echo '   ' INSTALL '   ' `basename "$$src"` && find "$$src" | cpio -pud
+ 
+@@ -105,7 +105,7 @@ endif
+ 
+ ifeq ($(uname_S),Darwin)
+ 	TKFRAMEWORK = /Library/Frameworks/Tk.framework/Resources/Wish.app
+-	ifeq ($(shell echo "$(uname_R)" | awk -F. '{if ($$1 >= 9) print "y"}')_$(shell test -d $(TKFRAMEWORK) || echo n),y_n)
++	ifeq ($(shell echo "$(uname_R)" | awk -F. '{if ($$1 >= 8) print "y"}')_$(shell test -d $(TKFRAMEWORK) || echo n),y_n)
+ 		TKFRAMEWORK = /System/Library/Frameworks/Tk.framework/Resources/Wish.app
+ 		ifeq ($(shell test -d $(TKFRAMEWORK) || echo n),n)
+ 			TKFRAMEWORK = /System/Library/Frameworks/Tk.framework/Resources/Wish\ Shell.app
diff --git a/devel/git-base/patches/patch-ai b/devel/git-base/patches/patch-ai
new file mode 100644
index 00000000000..41498c791ed
--- /dev/null
+++ b/devel/git-base/patches/patch-ai
@@ -0,0 +1,17 @@
+$NetBSD: patch-ai,v 1.1 2013/09/09 13:54:44 wiz Exp $
+
+Beginnings of emacs support, not enabled yet.  We must use mk/emacs.mk.
+
+--- contrib/emacs/Makefile.orig	2008-08-17 16:43:06.000000000 -0400
++++ contrib/emacs/Makefile
+@@ -12,8 +12,8 @@ RM ?= rm -f
+ all: $(ELC)
+ 
+ install: all
+-	$(INSTALL) -d $(DESTDIR)$(emacsdir)
+-	$(INSTALL_ELC) $(ELC:.elc=.el) $(ELC) $(DESTDIR)$(emacsdir)
++	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(emacsdir)
++	${BSD_INSTALL_DATA} $(ELC:.elc=.el) $(ELC) $(DESTDIR)$(emacsdir)
+ 
+ %.elc: %.el
+ 	$(EMACS) -batch -f batch-byte-compile $<
diff --git a/devel/git-base/patches/patch-config.mak.uname b/devel/git-base/patches/patch-config.mak.uname
new file mode 100644
index 00000000000..f9b86ace20f
--- /dev/null
+++ b/devel/git-base/patches/patch-config.mak.uname
@@ -0,0 +1,23 @@
+$NetBSD: patch-config.mak.uname,v 1.1 2013/09/09 13:54:44 wiz Exp $
+
+
+--- config.mak.uname.orig	2013-03-14 04:15:22.000000000 +0900
++++ config.mak.uname	2013-04-08 19:11:58.000000000 +0900
+@@ -101,7 +101,7 @@
+ ifeq ($(uname_S),SunOS)
+ 	NEEDS_SOCKET = YesPlease
+ 	NEEDS_NSL = YesPlease
+-	SHELL_PATH = /bin/bash
++	SHELL_PATH = ${BASH}
+ 	SANE_TOOL_PATH = /usr/xpg6/bin:/usr/xpg4/bin
+ 	NO_STRCASESTR = YesPlease
+ 	NO_MEMMEM = YesPlease
+@@ -144,8 +144,6 @@
+ 		NO_STRTOUMAX = YesPlease
+ 		GIT_TEST_CMP = cmp
+ 	endif
+-	INSTALL = /usr/ucb/install
+-	TAR = gtar
+ 	BASIC_CFLAGS += -D__EXTENSIONS__ -D__sun__ -DHAVE_ALLOCA_H
+ endif
+ ifeq ($(uname_O),Cygwin)
diff --git a/devel/git-base/patches/patch-wrapper.c b/devel/git-base/patches/patch-wrapper.c
new file mode 100644
index 00000000000..4a083ffa07d
--- /dev/null
+++ b/devel/git-base/patches/patch-wrapper.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-wrapper.c,v 1.1 2013/09/09 13:54:44 wiz Exp $
+
+git's wrapper around mkstemp assumes that the libc function will not
+modify the argument when the call fails.  This causes one of git's
+tests to fail.  This patch is from Junio C. Hamano, and will likely be
+included in future versions of git.
+
+--- wrapper.c.orig	2012-11-26 03:18:01.000000000 +0000
++++ wrapper.c
+@@ -229,7 +229,7 @@ int xmkstemp(char *template)
+ 		int saved_errno = errno;
+ 		const char *nonrelative_template;
+ 
+-		if (!template[0])
++		if (strlen(template) != strlen(origtemplate))
+ 			template = origtemplate;
+ 
+ 		nonrelative_template = absolute_path(template);