SecBSD's official ports repository

2023-08-16 22:26:55 +00:00 · 2023-08-16 22:26:55 +00:00 · 2c0afcbbf3
commit 2c0afcbbf3
64331 changed files with 5339189 additions and 0 deletions
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@ -0,0 +1,145 @@
+COMMENT-main =	distributed version control system
+COMMENT-svn =	subversion interoperability tools
+COMMENT-x11 =	graphical tools
+
+V =		2.41.0
+DISTNAME =	git-${V}
+CATEGORIES =	devel
+
+HOMEPAGE =	https://git-scm.com/
+
+MAINTAINER =	Benoit Lecocq <benoit@openbsd.org>, \
+		Klemens Nanni <kn@openbsd.org>
+
+# GPLv2 only
+PERMIT_PACKAGE =	Yes
+
+DOC_DISTFILE =		git-manpages-${V}${EXTRACT_SUFX}
+DISTFILES =		${DISTNAME}${EXTRACT_SUFX} ${DOC_DISTFILE}
+EXTRACT_ONLY =		${DISTNAME}${EXTRACT_SUFX}
+
+MASTER_SITES =		https://www.kernel.org/pub/software/scm/git/
+
+MODULES =		perl \
+			x11/tk
+
+MODTK_VERSION =		8.6
+
+COMPILER =		base-clang ports-gcc
+COMPILER_LANGS =	c
+
+BUILD_DEPENDS =		devel/gettext,-tools \
+			devel/p5-Error \
+			textproc/asciidoc \
+			textproc/xmlto
+
+MULTI_PACKAGES =	-main -svn -x11
+
+WANTLIB-main =		c crypto curl expat iconv intl pthread ssl z
+# for curl
+WANTLIB-main +=		nghttp2
+
+
+RUN_DEPENDS-main =	devel/cvsps \
+			devel/got,-gitwrapper \
+			devel/p5-Error \
+			mail/p5-Mail-Tools
+
+LIB_DEPENDS-main =	devel/gettext,-runtime \
+			net/curl
+
+RUN_DEPENDS-svn =	${BASE_PKGPATH} \
+			devel/subversion,-perl \
+			www/p5-URI \
+			www/p5-libwww
+LIB_DEPENDS-svn =
+WANTLIB-svn =
+PKG_ARCH-svn =		*
+
+RUN_DEPENDS-x11 =	${BASE_PKGPATH},-main \
+			${MODTK_RUN_DEPENDS}
+LIB_DEPENDS-x11 =
+WANTLIB-x11 =
+PKG_ARCH-x11 =		*
+
+MAKE_FLAGS =		V=1 \
+			gitexecdir=${TRUEPREFIX}/libexec/git \
+			perllibdir=${TRUEPREFIX}/${P5SITE} \
+			NO_PERL_CPAN_FALLBACKS=1 \
+			TCLTK_PATH=${MODTK_BIN} \
+			TCL_PATH=${MODTCL_BIN}
+
+CONFIGURE_STYLE =	gnu
+CONFIGURE_ARGS =	--sysconfdir=${SYSCONFDIR} \
+			--mandir=${PREFIX}/man \
+			--with-curl=${LOCALBASE} \
+			--with-iconv=${LOCALBASE} \
+			--with-tcltk=${MODTK_BIN} \
+			--with-python=no
+CONFIGURE_ENV =		CPPFLAGS="-I${WRKSRC} -I${LOCALBASE}/include" \
+			LDFLAGS="-L${LOCALBASE}/lib" \
+			DIFF=diff TAR=tar
+
+DEBUG_PACKAGES =	-main
+
+USE_GMAKE =		Yes
+
+TEST_DEPENDS =		archivers/unzip \
+			archivers/zip \
+			devel/cvsps \
+			devel/subversion,-perl
+
+# see ${WRKSRC}/t/README for test documentation (GIT_TEST_*, etc.)
+
+# "test" is too verbose and parallel jobs print out of order; allow for
+# `make GIT_TEST_TARGET=prove test' to use prove(1) with better output
+GIT_TEST_TARGET ?=	test
+
+GIT_TEST_OPTS =		--root=${WRKDIR}/t/ \
+			--immediate
+
+GIT_PROVE_OPTS =	-j${MAKE_JOBS} \
+			--nocolor \
+			--norc \
+			-W
+
+GIT_SKIP_TESTS ?=	# empty
+
+TEST_ENV =		GIT_TEST_OPTS=${GIT_TEST_OPTS:Q} \
+			GIT_PROVE_OPTS=${GIT_PROVE_OPTS:Q} \
+			GIT_SKIP_TESTS=${GIT_SKIP_TESTS:Q} \
+			DEFAULT_TEST_TARGET=${GIT_TEST_TARGET}
+
+# one expensive test needs explicit enabling
+TEST_ENV +=		GIT_TEST_CLONE_2GB=true
+
+# ${WRKSRC}/t/t4256/1/mailinfo.c.orig
+PATCHORIG =		.pat.orig
+
+post-extract:
+	@mkdir -p ${WRKSRC}/doc
+	${TAR} -C ${WRKSRC}/doc -xzf ${FULLDISTDIR}/${DOC_DISTFILE}
+	@cd ${WRKSRC} && perl -pi -e "s|/usr/share/git|${TRUEPREFIX}/share/git|g" \
+		doc/man1/git-clone.1 doc/man1/git-init.1 doc/man1/gitweb.1
+
+post-install:
+	${INSTALL_DATA} ${WRKBUILD}/libgit.a ${PREFIX}/lib
+	${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp
+	${INSTALL_DATA} ${WRKBUILD}/contrib/emacs/*.el \
+		${PREFIX}/share/emacs/site-lisp
+	cd ${WRKBUILD}/doc && \
+		pax -rw . ${PREFIX}/man
+	${INSTALL_DATA} ${WRKBUILD}/contrib/hooks/post-receive-email \
+		${PREFIX}/share/git-core/templates/hooks/post-receive-email.sample
+	${INSTALL_DATA} ${WRKBUILD}/contrib/hooks/setgitperms.perl \
+		${PREFIX}/share/git-core/templates/hooks/setgitperms.perl
+	chown -R ${BINOWN}:${BINGRP} ${PREFIX}/libexec/git
+	${MAKE_ENV} ${MAKE_PROGRAM} -C ${WRKBUILD}/contrib/subtree \
+		${MAKE_FLAGS} install install-man
+	perl -pi -e "s|${WRKINST}||g" ${PREFIX}/share/gitweb/gitweb.cgi
+	${INSTALL_DATA} ${WRKBUILD}/gitweb/README ${PREFIX}/share/gitweb
+	${MODTCL_WISH_ADJ} ${PREFIX}/libexec/git/git-gui--askpass
+	rm ${PREFIX}/bin/git-receive-pack	# handled by gitwrapper
+	rm ${PREFIX}/bin/git-upload-pack	# handled by gitwrapper
+
+.include <bsd.port.mk>
--- a/devel/git/distinfo
+++ b/devel/git/distinfo
@ -0,0 +1,4 @@
+SHA256 (git-2.41.0.tar.gz) = xKaj3RgniVqAy9gk4U2UgReWrlQDdUng2pP3uEy0W58=
+SHA256 (git-manpages-2.41.0.tar.gz) = e3fGRrNtM8XA9iZ3oUcUIBEJMnDW/WKMo4xC1TAfOIg=
+SIZE (git-2.41.0.tar.gz) = 10791798
+SIZE (git-manpages-2.41.0.tar.gz) = 941258
--- a/devel/git/patches/patch-builtin_gc_c
+++ b/devel/git/patches/patch-builtin_gc_c
@ -0,0 +1,32 @@
+Replace sysctl HW_PHYSMEM/MEMSIZE/whatever madness with sysconf.
+
+Index: builtin/gc.c
+--- builtin/gc.c.orig
+++ builtin/gc.c
+@@ -258,20 +258,13 @@ static uint64_t total_ram(void)
+ 
+ 	if (!sysinfo(&si))
+ 		return si.totalram;
+-#elif defined(HAVE_BSD_SYSCTL) && (defined(HW_MEMSIZE) || defined(HW_PHYSMEM))
+-	int64_t physical_memory;
+-	int mib[2];
+-	size_t length;
+#elif defined(_SC_PHYS_PAGES) && defined(_SC_PAGESIZE)
+	long phys_pages, pagesize;
+ 
+-	mib[0] = CTL_HW;
+-# if defined(HW_MEMSIZE)
+-	mib[1] = HW_MEMSIZE;
+-# else
+-	mib[1] = HW_PHYSMEM;
+-# endif
+-	length = sizeof(int64_t);
+-	if (!sysctl(mib, 2, &physical_memory, &length, NULL, 0))
+-		return physical_memory;
+	phys_pages = sysconf(_SC_PHYS_PAGES);
+	pagesize = sysconf(_SC_PAGESIZE);
+	if (phys_pages != -1 && pagesize != -1)
+		return (uint64_t)phys_pages * (uint64_t)pagesize;
+ #elif defined(GIT_WINDOWS_NATIVE)
+ 	MEMORYSTATUSEX memInfo;
+ 
--- a/devel/git/patches/patch-config_mak_uname
+++ b/devel/git/patches/patch-config_mak_uname
@ -0,0 +1,15 @@
+OpenBSD wants DIR_HAS_BSD_GROUP_SEMANTICS, just like FreeBSD
+
+Index: config.mak.uname
+--- config.mak.uname.orig
+++ config.mak.uname
+@@ -280,8 +280,7 @@ ifeq ($(uname_S),FreeBSD)
+ 	FILENO_IS_A_MACRO = UnfortunatelyYes
+ endif
+ ifeq ($(uname_S),OpenBSD)
+-	NO_STRCASESTR = YesPlease
+-	NO_MEMMEM = YesPlease
+	DIR_HAS_BSD_GROUP_SEMANTICS = YesPlease
+ 	USE_ST_TIMESPEC = YesPlease
+ 	NEEDS_LIBICONV = YesPlease
+ 	BASIC_CFLAGS += -I/usr/local/include
--- a/devel/git/patches/patch-gitweb_gitweb_perl
+++ b/devel/git/patches/patch-gitweb_gitweb_perl
@ -0,0 +1,23 @@
+This prevents the following error: '-T and -B not implemented on filehandles'
+
+Index: gitweb/gitweb.perl
+--- gitweb/gitweb.perl.orig
+++ gitweb/gitweb.perl
+@@ -7056,7 +7056,7 @@ sub git_blob_plain {
+ 		$expires = "+1d";
+ 	}
+ 
+-	open my $fd, "-|", git_cmd(), "cat-file", "blob", $hash
+	open my $fd, "-|:raw:perlio", git_cmd(), "cat-file", "blob", $hash
+ 		or die_error(500, "Open git-cat-file blob '$hash' failed");
+ 
+ 	# content-type (can include charset)
+@@ -7119,7 +7119,7 @@ sub git_blob {
+ 	}
+ 
+ 	my $have_blame = gitweb_check_feature('blame');
+-	open my $fd, "-|", git_cmd(), "cat-file", "blob", $hash
+	open my $fd, "-|:raw:perlio", git_cmd(), "cat-file", "blob", $hash
+ 		or die_error(500, "Couldn't cat $file_name, $hash");
+ 	my $mimetype = blob_mimetype($fd, $file_name);
+ 	# use 'blob_plain' (aka 'raw') view for files that cannot be displayed
--- a/devel/git/patches/patch-thread-utils_c
+++ b/devel/git/patches/patch-thread-utils_c
@ -0,0 +1,30 @@
+Use sysconf(_SC_NPROCESSORS_ONLN) to properly omit disabled smt cores.
+
+Index: thread-utils.c
+--- thread-utils.c.orig
+++ thread-utils.c
+@@ -25,9 +25,10 @@ int online_cpus(void)
+ #else
+ #ifdef _SC_NPROCESSORS_ONLN
+ 	long ncpus;
+-#endif
+ 
+-#ifdef GIT_WINDOWS_NATIVE
+	if ((ncpus = (long)sysconf(_SC_NPROCESSORS_ONLN)) > 0)
+		return (int)ncpus;
+#elif defined(GIT_WINDOWS_NATIVE)
+ 	SYSTEM_INFO info;
+ 	GetSystemInfo(&info);
+ 
+@@ -55,11 +56,6 @@ int online_cpus(void)
+ 	if (!sysctl(mib, 2, &cpucount, &len, NULL, 0))
+ 		return cpucount;
+ #endif /* defined(HAVE_BSD_SYSCTL) && defined(HW_NCPU) */
+-
+-#ifdef _SC_NPROCESSORS_ONLN
+-	if ((ncpus = (long)sysconf(_SC_NPROCESSORS_ONLN)) > 0)
+-		return (int)ncpus;
+-#endif
+ 
+ 	return 1;
+ #endif
--- a/devel/git/pkg/DESCR-main
+++ b/devel/git/pkg/DESCR-main
@ -0,0 +1,7 @@
+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.
--- a/devel/git/pkg/DESCR-svn
+++ b/devel/git/pkg/DESCR-svn
@ -0,0 +1,2 @@
+This package provides tools for importing and working with subversion
+repositories.
--- a/devel/git/pkg/DESCR-x11
+++ b/devel/git/pkg/DESCR-x11
@ -0,0 +1 @@
+GUI tools for committing (git-gui) and browsing (gitk),
--- a/devel/git/pkg/PLIST-main
+++ b/devel/git/pkg/PLIST-main
@ -0,0 +1,467 @@
+@conflict git-x11-<2.33.1p0
+@pkgpath devel/git
+@newgroup _gitdaemon:778
+@newuser _gitdaemon:778:_gitdaemon::Git Daemon:/nonexistent:/sbin/nologin
+@rcscript ${RCDIR}/gitdaemon
+@bin bin/git
+bin/git-cvsserver
+@shell bin/git-shell
+@bin bin/git-upload-archive
+@bin bin/scalar
+@static-lib lib/libgit.a
+${P5SITE}/Git/
+${P5SITE}/Git.pm
+${P5SITE}/Git/I18N.pm
+${P5SITE}/Git/IndexInfo.pm
+${P5SITE}/Git/LoadCPAN/
+${P5SITE}/Git/LoadCPAN.pm
+${P5SITE}/Git/LoadCPAN/Error.pm
+${P5SITE}/Git/LoadCPAN/Mail/
+${P5SITE}/Git/LoadCPAN/Mail/Address.pm
+${P5SITE}/Git/Packet.pm
+libexec/git/
+@bin libexec/git/git
+@bin libexec/git/git-add
+@bin libexec/git/git-am
+@bin libexec/git/git-annotate
+@bin libexec/git/git-apply
+libexec/git/git-archimport
+@bin libexec/git/git-archive
+@bin libexec/git/git-bisect
+@bin libexec/git/git-blame
+@bin libexec/git/git-branch
+@bin libexec/git/git-bugreport
+@bin libexec/git/git-bundle
+@bin libexec/git/git-cat-file
+@bin libexec/git/git-check-attr
+@bin libexec/git/git-check-ignore
+@bin libexec/git/git-check-mailmap
+@bin libexec/git/git-check-ref-format
+@bin libexec/git/git-checkout
+@bin libexec/git/git-checkout--worker
+@bin libexec/git/git-checkout-index
+@bin libexec/git/git-cherry
+@bin libexec/git/git-cherry-pick
+@bin libexec/git/git-clean
+@bin libexec/git/git-clone
+@bin libexec/git/git-column
+@bin libexec/git/git-commit
+@bin libexec/git/git-commit-graph
+@bin libexec/git/git-commit-tree
+@bin libexec/git/git-config
+@bin libexec/git/git-count-objects
+@bin libexec/git/git-credential
+@bin libexec/git/git-credential-cache
+@bin libexec/git/git-credential-cache--daemon
+@bin libexec/git/git-credential-store
+libexec/git/git-cvsexportcommit
+libexec/git/git-cvsimport
+libexec/git/git-cvsserver
+@bin libexec/git/git-daemon
+@bin libexec/git/git-describe
+@bin libexec/git/git-diagnose
+@bin libexec/git/git-diff
+@bin libexec/git/git-diff-files
+@bin libexec/git/git-diff-index
+@bin libexec/git/git-diff-tree
+@bin libexec/git/git-difftool
+libexec/git/git-difftool--helper
+@bin libexec/git/git-fast-export
+@bin libexec/git/git-fast-import
+@bin libexec/git/git-fetch
+@bin libexec/git/git-fetch-pack
+libexec/git/git-filter-branch
+@bin libexec/git/git-fmt-merge-msg
+@bin libexec/git/git-for-each-ref
+@bin libexec/git/git-for-each-repo
+@bin libexec/git/git-format-patch
+@bin libexec/git/git-fsck
+@bin libexec/git/git-fsck-objects
+@bin libexec/git/git-fsmonitor--daemon
+@bin libexec/git/git-gc
+@bin libexec/git/git-get-tar-commit-id
+@bin libexec/git/git-grep
+@bin libexec/git/git-hash-object
+@bin libexec/git/git-help
+@bin libexec/git/git-hook
+@bin libexec/git/git-http-backend
+@bin libexec/git/git-http-fetch
+@bin libexec/git/git-http-push
+@bin libexec/git/git-imap-send
+@bin libexec/git/git-index-pack
+@bin libexec/git/git-init
+@bin libexec/git/git-init-db
+libexec/git/git-instaweb
+@bin libexec/git/git-interpret-trailers
+@bin libexec/git/git-log
+@bin libexec/git/git-ls-files
+@bin libexec/git/git-ls-remote
+@bin libexec/git/git-ls-tree
+@bin libexec/git/git-mailinfo
+@bin libexec/git/git-mailsplit
+@bin libexec/git/git-maintenance
+@bin libexec/git/git-merge
+@bin libexec/git/git-merge-base
+@bin libexec/git/git-merge-file
+@bin libexec/git/git-merge-index
+libexec/git/git-merge-octopus
+libexec/git/git-merge-one-file
+@bin libexec/git/git-merge-ours
+@bin libexec/git/git-merge-recursive
+libexec/git/git-merge-resolve
+@bin libexec/git/git-merge-subtree
+@bin libexec/git/git-merge-tree
+libexec/git/git-mergetool
+libexec/git/git-mergetool--lib
+@bin libexec/git/git-mktag
+@bin libexec/git/git-mktree
+@bin libexec/git/git-multi-pack-index
+@bin libexec/git/git-mv
+@bin libexec/git/git-name-rev
+@bin libexec/git/git-notes
+libexec/git/git-p4
+@bin libexec/git/git-pack-objects
+@bin libexec/git/git-pack-redundant
+@bin libexec/git/git-pack-refs
+@bin libexec/git/git-patch-id
+@bin libexec/git/git-prune
+@bin libexec/git/git-prune-packed
+@bin libexec/git/git-pull
+@bin libexec/git/git-push
+libexec/git/git-quiltimport
+@bin libexec/git/git-range-diff
+@bin libexec/git/git-read-tree
+@bin libexec/git/git-rebase
+@bin libexec/git/git-receive-pack
+@bin libexec/git/git-reflog
+@bin libexec/git/git-remote
+@bin libexec/git/git-remote-ext
+@bin libexec/git/git-remote-fd
+@bin libexec/git/git-remote-ftp
+@bin libexec/git/git-remote-ftps
+@bin libexec/git/git-remote-http
+@bin libexec/git/git-remote-https
+@bin libexec/git/git-repack
+@bin libexec/git/git-replace
+libexec/git/git-request-pull
+@bin libexec/git/git-rerere
+@bin libexec/git/git-reset
+@bin libexec/git/git-restore
+@bin libexec/git/git-rev-list
+@bin libexec/git/git-rev-parse
+@bin libexec/git/git-revert
+@bin libexec/git/git-rm
+libexec/git/git-send-email
+@bin libexec/git/git-send-pack
+libexec/git/git-sh-i18n
+@bin libexec/git/git-sh-i18n--envsubst
+libexec/git/git-sh-setup
+@bin libexec/git/git-shell
+@bin libexec/git/git-shortlog
+@bin libexec/git/git-show
+@bin libexec/git/git-show-branch
+@bin libexec/git/git-show-index
+@bin libexec/git/git-show-ref
+@bin libexec/git/git-sparse-checkout
+@bin libexec/git/git-stage
+@bin libexec/git/git-stash
+@bin libexec/git/git-status
+@bin libexec/git/git-stripspace
+libexec/git/git-submodule
+@bin libexec/git/git-submodule--helper
+libexec/git/git-subtree
+@bin libexec/git/git-switch
+@bin libexec/git/git-symbolic-ref
+@bin libexec/git/git-tag
+@bin libexec/git/git-unpack-file
+@bin libexec/git/git-unpack-objects
+@bin libexec/git/git-update-index
+@bin libexec/git/git-update-ref
+@bin libexec/git/git-update-server-info
+@bin libexec/git/git-upload-archive
+@bin libexec/git/git-upload-pack
+@bin libexec/git/git-var
+@bin libexec/git/git-verify-commit
+@bin libexec/git/git-verify-pack
+@bin libexec/git/git-verify-tag
+@bin libexec/git/git-version
+libexec/git/git-web--browse
+@bin libexec/git/git-whatchanged
+@bin libexec/git/git-worktree
+@bin libexec/git/git-write-tree
+libexec/git/mergetools/
+libexec/git/mergetools/araxis
+libexec/git/mergetools/bc
+libexec/git/mergetools/codecompare
+libexec/git/mergetools/deltawalker
+libexec/git/mergetools/diffmerge
+libexec/git/mergetools/diffuse
+libexec/git/mergetools/ecmerge
+libexec/git/mergetools/emerge
+libexec/git/mergetools/examdiff
+libexec/git/mergetools/guiffy
+libexec/git/mergetools/gvimdiff
+libexec/git/mergetools/kdiff3
+libexec/git/mergetools/kompare
+libexec/git/mergetools/meld
+libexec/git/mergetools/nvimdiff
+libexec/git/mergetools/opendiff
+libexec/git/mergetools/p4merge
+libexec/git/mergetools/smerge
+libexec/git/mergetools/tkdiff
+libexec/git/mergetools/tortoisemerge
+libexec/git/mergetools/vimdiff
+libexec/git/mergetools/winmerge
+libexec/git/mergetools/xxdiff
+@bin libexec/git/scalar
+@man man/man1/git-add.1
+@man man/man1/git-am.1
+@man man/man1/git-annotate.1
+@man man/man1/git-apply.1
+@man man/man1/git-archimport.1
+@man man/man1/git-archive.1
+@man man/man1/git-bisect.1
+@man man/man1/git-blame.1
+@man man/man1/git-branch.1
+@man man/man1/git-bugreport.1
+@man man/man1/git-bundle.1
+@man man/man1/git-cat-file.1
+@man man/man1/git-check-attr.1
+@man man/man1/git-check-ignore.1
+@man man/man1/git-check-mailmap.1
+@man man/man1/git-check-ref-format.1
+@man man/man1/git-checkout-index.1
+@man man/man1/git-checkout.1
+@man man/man1/git-cherry-pick.1
+@man man/man1/git-cherry.1
+@man man/man1/git-clean.1
+@man man/man1/git-clone.1
+@man man/man1/git-column.1
+@man man/man1/git-commit-graph.1
+@man man/man1/git-commit-tree.1
+@man man/man1/git-commit.1
+@man man/man1/git-config.1
+@man man/man1/git-count-objects.1
+@man man/man1/git-credential-cache--daemon.1
+@man man/man1/git-credential-cache.1
+@man man/man1/git-credential-store.1
+@man man/man1/git-credential.1
+@man man/man1/git-cvsexportcommit.1
+@man man/man1/git-cvsimport.1
+@man man/man1/git-cvsserver.1
+@man man/man1/git-daemon.1
+@man man/man1/git-describe.1
+@man man/man1/git-diagnose.1
+@man man/man1/git-diff-files.1
+@man man/man1/git-diff-index.1
+@man man/man1/git-diff-tree.1
+@man man/man1/git-diff.1
+@man man/man1/git-difftool.1
+@man man/man1/git-fast-export.1
+@man man/man1/git-fast-import.1
+@man man/man1/git-fetch-pack.1
+@man man/man1/git-fetch.1
+@man man/man1/git-filter-branch.1
+@man man/man1/git-fmt-merge-msg.1
+@man man/man1/git-for-each-ref.1
+@man man/man1/git-for-each-repo.1
+@man man/man1/git-format-patch.1
+@man man/man1/git-fsck-objects.1
+@man man/man1/git-fsck.1
+@man man/man1/git-fsmonitor--daemon.1
+@man man/man1/git-gc.1
+@man man/man1/git-get-tar-commit-id.1
+@man man/man1/git-grep.1
+@man man/man1/git-hash-object.1
+@man man/man1/git-help.1
+@man man/man1/git-hook.1
+@man man/man1/git-http-backend.1
+@man man/man1/git-http-fetch.1
+@man man/man1/git-http-push.1
+@man man/man1/git-imap-send.1
+@man man/man1/git-index-pack.1
+@man man/man1/git-init-db.1
+@man man/man1/git-init.1
+@man man/man1/git-instaweb.1
+@man man/man1/git-interpret-trailers.1
+@man man/man1/git-log.1
+@man man/man1/git-ls-files.1
+@man man/man1/git-ls-remote.1
+@man man/man1/git-ls-tree.1
+@man man/man1/git-mailinfo.1
+@man man/man1/git-mailsplit.1
+@man man/man1/git-maintenance.1
+@man man/man1/git-merge-base.1
+@man man/man1/git-merge-file.1
+@man man/man1/git-merge-index.1
+@man man/man1/git-merge-one-file.1
+@man man/man1/git-merge-tree.1
+@man man/man1/git-merge.1
+@man man/man1/git-mergetool--lib.1
+@man man/man1/git-mergetool.1
+@man man/man1/git-mktag.1
+@man man/man1/git-mktree.1
+@man man/man1/git-multi-pack-index.1
+@man man/man1/git-mv.1
+@man man/man1/git-name-rev.1
+@man man/man1/git-notes.1
+@man man/man1/git-p4.1
+@man man/man1/git-pack-objects.1
+@man man/man1/git-pack-redundant.1
+@man man/man1/git-pack-refs.1
+@man man/man1/git-patch-id.1
+@man man/man1/git-prune-packed.1
+@man man/man1/git-prune.1
+@man man/man1/git-pull.1
+@man man/man1/git-push.1
+@man man/man1/git-quiltimport.1
+@man man/man1/git-range-diff.1
+@man man/man1/git-read-tree.1
+@man man/man1/git-rebase.1
+@man man/man1/git-receive-pack.1
+@man man/man1/git-reflog.1
+@man man/man1/git-remote-ext.1
+@man man/man1/git-remote-fd.1
+@man man/man1/git-remote.1
+@man man/man1/git-repack.1
+@man man/man1/git-replace.1
+@man man/man1/git-request-pull.1
+@man man/man1/git-rerere.1
+@man man/man1/git-reset.1
+@man man/man1/git-restore.1
+@man man/man1/git-rev-list.1
+@man man/man1/git-rev-parse.1
+@man man/man1/git-revert.1
+@man man/man1/git-rm.1
+@man man/man1/git-send-email.1
+@man man/man1/git-send-pack.1
+@man man/man1/git-sh-i18n--envsubst.1
+@man man/man1/git-sh-i18n.1
+@man man/man1/git-sh-setup.1
+@man man/man1/git-shell.1
+@man man/man1/git-shortlog.1
+@man man/man1/git-show-branch.1
+@man man/man1/git-show-index.1
+@man man/man1/git-show-ref.1
+@man man/man1/git-show.1
+@man man/man1/git-sparse-checkout.1
+@man man/man1/git-stage.1
+@man man/man1/git-stash.1
+@man man/man1/git-status.1
+@man man/man1/git-stripspace.1
+@man man/man1/git-submodule.1
+@man man/man1/git-subtree.1
+@man man/man1/git-switch.1
+@man man/man1/git-symbolic-ref.1
+@man man/man1/git-tag.1
+@man man/man1/git-unpack-file.1
+@man man/man1/git-unpack-objects.1
+@man man/man1/git-update-index.1
+@man man/man1/git-update-ref.1
+@man man/man1/git-update-server-info.1
+@man man/man1/git-upload-archive.1
+@man man/man1/git-upload-pack.1
+@man man/man1/git-var.1
+@man man/man1/git-verify-commit.1
+@man man/man1/git-verify-pack.1
+@man man/man1/git-verify-tag.1
+@man man/man1/git-version.1
+@man man/man1/git-web--browse.1
+@man man/man1/git-whatchanged.1
+@man man/man1/git-worktree.1
+@man man/man1/git-write-tree.1
+@man man/man1/git.1
+@man man/man1/gitweb.1
+@man man/man1/scalar.1
+@man man/man5/gitattributes.5
+@man man/man5/gitformat-bundle.5
+@man man/man5/gitformat-chunk.5
+@man man/man5/gitformat-commit-graph.5
+@man man/man5/gitformat-index.5
+@man man/man5/gitformat-pack.5
+@man man/man5/gitformat-signature.5
+@man man/man5/githooks.5
+@man man/man5/gitignore.5
+@man man/man5/gitmailmap.5
+@man man/man5/gitmodules.5
+@man man/man5/gitprotocol-capabilities.5
+@man man/man5/gitprotocol-common.5
+@man man/man5/gitprotocol-http.5
+@man man/man5/gitprotocol-pack.5
+@man man/man5/gitprotocol-v2.5
+@man man/man5/gitrepository-layout.5
+@man man/man5/gitweb.conf.5
+@man man/man7/gitcli.7
+@man man/man7/gitcore-tutorial.7
+@man man/man7/gitcredentials.7
+@man man/man7/gitcvs-migration.7
+@man man/man7/gitdiffcore.7
+@man man/man7/giteveryday.7
+@man man/man7/gitfaq.7
+@man man/man7/gitglossary.7
+@man man/man7/gitnamespaces.7
+@man man/man7/gitremote-helpers.7
+@man man/man7/gitrevisions.7
+@man man/man7/gitsubmodules.7
+@man man/man7/gittutorial-2.7
+@man man/man7/gittutorial.7
+@man man/man7/gitworkflows.7
+share/doc/pkg-readmes/${PKGSTEM}
+share/emacs/
+share/emacs/site-lisp/
+share/emacs/site-lisp/git-blame.el
+share/emacs/site-lisp/git.el
+share/git-core/
+share/git-core/templates/
+share/git-core/templates/branches/
+share/git-core/templates/description
+share/git-core/templates/hooks/
+share/git-core/templates/hooks/applypatch-msg.sample
+share/git-core/templates/hooks/commit-msg.sample
+share/git-core/templates/hooks/fsmonitor-watchman.sample
+share/git-core/templates/hooks/post-receive-email.sample
+share/git-core/templates/hooks/post-update.sample
+share/git-core/templates/hooks/pre-applypatch.sample
+share/git-core/templates/hooks/pre-commit.sample
+share/git-core/templates/hooks/pre-merge-commit.sample
+share/git-core/templates/hooks/pre-push.sample
+share/git-core/templates/hooks/pre-rebase.sample
+share/git-core/templates/hooks/pre-receive.sample
+share/git-core/templates/hooks/prepare-commit-msg.sample
+share/git-core/templates/hooks/push-to-checkout.sample
+share/git-core/templates/hooks/sendemail-validate.sample
+share/git-core/templates/hooks/setgitperms.perl
+share/git-core/templates/hooks/update.sample
+share/git-core/templates/info/
+share/git-core/templates/info/exclude
+share/gitweb/
+share/gitweb/README
+share/gitweb/gitweb.cgi
+share/gitweb/static/
+share/gitweb/static/git-favicon.png
+share/gitweb/static/git-logo.png
+share/gitweb/static/gitweb.css
+share/gitweb/static/gitweb.js
+share/locale/bg/LC_MESSAGES/git.mo
+share/locale/ca/LC_MESSAGES/git.mo
+share/locale/de/LC_MESSAGES/git.mo
+share/locale/el/LC_MESSAGES/git.mo
+share/locale/es/LC_MESSAGES/git.mo
+share/locale/fr/LC_MESSAGES/git.mo
+share/locale/id/LC_MESSAGES/git.mo
+share/locale/is/
+share/locale/is/LC_MESSAGES/
+share/locale/is/LC_MESSAGES/git.mo
+share/locale/it/LC_MESSAGES/git.mo
+share/locale/ko/LC_MESSAGES/git.mo
+share/locale/pl/LC_MESSAGES/git.mo
+share/locale/pt_PT/
+share/locale/pt_PT/LC_MESSAGES/
+share/locale/pt_PT/LC_MESSAGES/git.mo
+share/locale/ru/LC_MESSAGES/git.mo
+share/locale/sv/LC_MESSAGES/git.mo
+share/locale/tr/LC_MESSAGES/git.mo
+share/locale/uk/LC_MESSAGES/git.mo
+share/locale/vi/LC_MESSAGES/git.mo
+share/locale/zh_CN/LC_MESSAGES/git.mo
+share/locale/zh_TW/LC_MESSAGES/git.mo
--- a/devel/git/pkg/PLIST-svn
+++ b/devel/git/pkg/PLIST-svn
@ -0,0 +1,14 @@
+${P5SITE}/Git/SVN/
+${P5SITE}/Git/SVN.pm
+${P5SITE}/Git/SVN/Editor.pm
+${P5SITE}/Git/SVN/Fetcher.pm
+${P5SITE}/Git/SVN/GlobSpec.pm
+${P5SITE}/Git/SVN/Log.pm
+${P5SITE}/Git/SVN/Memoize/
+${P5SITE}/Git/SVN/Memoize/YAML.pm
+${P5SITE}/Git/SVN/Migration.pm
+${P5SITE}/Git/SVN/Prompt.pm
+${P5SITE}/Git/SVN/Ra.pm
+${P5SITE}/Git/SVN/Utils.pm
+libexec/git/git-svn
+@man man/man1/git-svn.1
--- a/devel/git/pkg/PLIST-x11
+++ b/devel/git/pkg/PLIST-x11
@ -0,0 +1,85 @@
+@conflict git-<2.33.1p0
+bin/gitk
+libexec/git/git-citool
+libexec/git/git-gui
+libexec/git/git-gui--askpass
+@man man/man1/git-citool.1
+@man man/man1/git-gui.1
+@man man/man1/gitk.1
+share/git-gui/
+share/git-gui/lib/
+share/git-gui/lib/about.tcl
+share/git-gui/lib/blame.tcl
+share/git-gui/lib/branch.tcl
+share/git-gui/lib/branch_checkout.tcl
+share/git-gui/lib/branch_create.tcl
+share/git-gui/lib/branch_delete.tcl
+share/git-gui/lib/branch_rename.tcl
+share/git-gui/lib/browser.tcl
+share/git-gui/lib/checkout_op.tcl
+share/git-gui/lib/choose_font.tcl
+share/git-gui/lib/choose_repository.tcl
+share/git-gui/lib/choose_rev.tcl
+share/git-gui/lib/chord.tcl
+share/git-gui/lib/class.tcl
+share/git-gui/lib/commit.tcl
+share/git-gui/lib/console.tcl
+share/git-gui/lib/database.tcl
+share/git-gui/lib/date.tcl
+share/git-gui/lib/diff.tcl
+share/git-gui/lib/encoding.tcl
+share/git-gui/lib/error.tcl
+share/git-gui/lib/git-gui.ico
+share/git-gui/lib/index.tcl
+share/git-gui/lib/line.tcl
+share/git-gui/lib/logo.tcl
+share/git-gui/lib/merge.tcl
+share/git-gui/lib/mergetool.tcl
+share/git-gui/lib/msgs/
+share/git-gui/lib/msgs/bg.msg
+share/git-gui/lib/msgs/de.msg
+share/git-gui/lib/msgs/el.msg
+share/git-gui/lib/msgs/fr.msg
+share/git-gui/lib/msgs/hu.msg
+share/git-gui/lib/msgs/it.msg
+share/git-gui/lib/msgs/ja.msg
+share/git-gui/lib/msgs/nb.msg
+share/git-gui/lib/msgs/pt_br.msg
+share/git-gui/lib/msgs/pt_pt.msg
+share/git-gui/lib/msgs/ru.msg
+share/git-gui/lib/msgs/sv.msg
+share/git-gui/lib/msgs/vi.msg
+share/git-gui/lib/msgs/zh_cn.msg
+share/git-gui/lib/option.tcl
+share/git-gui/lib/remote.tcl
+share/git-gui/lib/remote_add.tcl
+share/git-gui/lib/remote_branch_delete.tcl
+share/git-gui/lib/search.tcl
+share/git-gui/lib/shortcut.tcl
+share/git-gui/lib/spellcheck.tcl
+share/git-gui/lib/sshkey.tcl
+share/git-gui/lib/status_bar.tcl
+share/git-gui/lib/tclIndex
+share/git-gui/lib/themed.tcl
+share/git-gui/lib/tools.tcl
+share/git-gui/lib/tools_dlg.tcl
+share/git-gui/lib/transport.tcl
+share/git-gui/lib/win32.tcl
+share/git-gui/lib/win32_shortcut.js
+share/gitk/
+share/gitk/lib/
+share/gitk/lib/msgs/
+share/gitk/lib/msgs/bg.msg
+share/gitk/lib/msgs/ca.msg
+share/gitk/lib/msgs/de.msg
+share/gitk/lib/msgs/es.msg
+share/gitk/lib/msgs/fr.msg
+share/gitk/lib/msgs/hu.msg
+share/gitk/lib/msgs/it.msg
+share/gitk/lib/msgs/ja.msg
+share/gitk/lib/msgs/pt_br.msg
+share/gitk/lib/msgs/pt_pt.msg
+share/gitk/lib/msgs/ru.msg
+share/gitk/lib/msgs/sv.msg
+share/gitk/lib/msgs/vi.msg
+share/gitk/lib/msgs/zh_cn.msg
--- a/devel/git/pkg/README-main
+++ b/devel/git/pkg/README-main
@ -0,0 +1,12 @@
+
+-----------------------------------------------------------------------
+| Running ${PKGSTEM} on OpenBSD
+-----------------------------------------------------------------------
+
+git send-email
+==============
+To make it work with SSL/TLS and SMTP auth you have to install
+the following additional packages.
+
+	p5-Net-SMTP-SSL
+	p5-Authen-SASL
--- a/devel/git/pkg/gitdaemon.rc
+++ b/devel/git/pkg/gitdaemon.rc
@ -0,0 +1,12 @@
+#!/bin/ksh
+#
+
+daemon="${TRUEPREFIX}/bin/git daemon --detach"
+daemon_user="_gitdaemon"
+
+. /etc/rc.d/rc.subr
+
+pexp="${TRUEPREFIX}/libexec/git/git-daemon --detach${daemon_flags:+ ${daemon_flags}}"
+rc_reload=NO
+
+rc_cmd $1
				`@ -0,0 +1 @@`
				`GUI tools for committing (git-gui) and browsing (gitk),`