diff options
| -rw-r--r-- | devel/git/Makefile | 15 | ||||
| -rw-r--r-- | devel/git/distinfo | 14 | ||||
| -rw-r--r-- | devel/git/pkg-plist | 20 |
3 files changed, 20 insertions, 29 deletions
diff --git a/devel/git/Makefile b/devel/git/Makefile index 3b1a3546ad23..7e31d639a9d6 100644 --- a/devel/git/Makefile +++ b/devel/git/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= git -DISTVERSION= 2.28.0 +DISTVERSION= 2.29.2 CATEGORIES= devel MASTER_SITES= KERNEL_ORG/software/scm/git DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ @@ -12,12 +12,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} \ ${PORTNAME}-manpages-${DISTVERSION}${EXTRACT_SUFX} MAINTAINER= garga@FreeBSD.org -COMMENT= Distributed source code management tool -.if ${FLAVOR:U} == gui -COMMENT+= (GUI enabled flavor) -.elif ${FLAVOR:U} == lite -COMMENT+= (lite flavor) -.endif +COMMENT= Distributed source code management tool ${COMMENT_${FLAVOR}} LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING @@ -33,6 +28,9 @@ lite_PKGNAMESUFFIX= -lite USES= autoreconf gmake iconv shebangfix ssl tar:xz +COMMENT_gui= (GUI enabled flavor) +COMMENT_lite= (lite flavor) + USERS= git_daemon GROUPS= git_daemon @@ -57,7 +55,6 @@ SHEBANG_FILES= *.perl */*.perl */*/*.perl */*.pl */*/*.pl */*/*/*.pl \ contrib/remote-helpers/git-remote-hg \ contrib/credential/netrc/git-credential-netrc.perl \ contrib/buildsystems/generate contrib/contacts/git-contacts \ - contrib/svn-fe/svnrdump_sim.py \ templates/hooks--fsmonitor-watchman.sample TEST_TARGET= test @@ -77,6 +74,8 @@ OPTIONS_EXCLUDE= GUI SVN GITWEB CONTRIB P4 CVS PERL OPTIONS_SUB= yes +OPTIONS_FILE= ${PORT_DBDIR}/${OPTIONS_NAME}/${FLAVOR}-options + CONTRIB_DESC= Install contributed scripts CURL_DESC= Install curl support (provides HTTPS transport) CVS_DESC= Enable CVS support diff --git a/devel/git/distinfo b/devel/git/distinfo index 44c2a07c8485..11092729b068 100644 --- a/devel/git/distinfo +++ b/devel/git/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1596624620 -SHA256 (git-2.28.0.tar.xz) = dfa5d1a253aa451465478fe45c6a40ab8605b340fdb4c4e80b16d7f87708439d -SIZE (git-2.28.0.tar.xz) = 6117608 -SHA256 (git-manpages-2.28.0.tar.xz) = 665a7fa41f9a39248e48422dcf533e1a0133a4a6eddfc25ee55e28e42fc07cb7 -SIZE (git-manpages-2.28.0.tar.xz) = 472524 -SHA256 (git-htmldocs-2.28.0.tar.xz) = 24feed3b584e2121418de9bde9f2e23fdcf78e4f914279787f669d3dc375bfe6 -SIZE (git-htmldocs-2.28.0.tar.xz) = 1347596 +TIMESTAMP = 1604500205 +SHA256 (git-2.29.2.tar.xz) = f2fc436ebe657821a1360bcd1e5f4896049610082419143d60f6fa13c2f607c1 +SIZE (git-2.29.2.tar.xz) = 6187988 +SHA256 (git-manpages-2.29.2.tar.xz) = e2d44a2a30b9d43a770262f1328b77df2f532f16c2dcd235655e5c9bd39bd792 +SIZE (git-manpages-2.29.2.tar.xz) = 478516 +SHA256 (git-htmldocs-2.29.2.tar.xz) = f7c762cc5c8c5230885b76134cbc801f6149c29c812d3f276ff1914176a7dab8 +SIZE (git-htmldocs-2.29.2.tar.xz) = 1364856 diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist index 16da27bebdb5..9349af3ef708 100644 --- a/devel/git/pkg-plist +++ b/devel/git/pkg-plist @@ -149,7 +149,6 @@ libexec/git-core/git-remote-fd %%CURL%%libexec/git-core/git-remote-ftps %%CURL%%libexec/git-core/git-remote-http %%CURL%%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-request-pull @@ -200,7 +199,6 @@ libexec/git-core/git-worktree libexec/git-core/git-write-tree libexec/git-core/mergetools/araxis libexec/git-core/mergetools/bc -libexec/git-core/mergetools/bc3 libexec/git-core/mergetools/codecompare libexec/git-core/mergetools/deltawalker libexec/git-core/mergetools/diffmerge @@ -210,19 +208,16 @@ libexec/git-core/mergetools/emerge libexec/git-core/mergetools/examdiff libexec/git-core/mergetools/guiffy libexec/git-core/mergetools/gvimdiff -libexec/git-core/mergetools/gvimdiff2 -libexec/git-core/mergetools/gvimdiff3 libexec/git-core/mergetools/kdiff3 libexec/git-core/mergetools/kompare libexec/git-core/mergetools/meld +libexec/git-core/mergetools/nvimdiff libexec/git-core/mergetools/opendiff libexec/git-core/mergetools/p4merge libexec/git-core/mergetools/smerge libexec/git-core/mergetools/tkdiff libexec/git-core/mergetools/tortoisemerge libexec/git-core/mergetools/vimdiff -libexec/git-core/mergetools/vimdiff2 -libexec/git-core/mergetools/vimdiff3 libexec/git-core/mergetools/winmerge libexec/git-core/mergetools/xxdiff man/man1/git-add.1.gz @@ -299,6 +294,7 @@ man/man1/git-ls-remote.1.gz man/man1/git-ls-tree.1.gz man/man1/git-mailinfo.1.gz man/man1/git-mailsplit.1.gz +man/man1/git-maintenance.1.gz man/man1/git-merge-base.1.gz man/man1/git-merge-file.1.gz man/man1/git-merge-index.1.gz @@ -710,6 +706,9 @@ man/man7/gitworkflows.7.gz %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.26.2.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.27.0.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.28.0.txt +%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.29.0.txt +%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.29.1.txt +%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.29.2.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.0.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.1.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.2.txt @@ -1200,6 +1199,7 @@ share/emacs/site-lisp/git/git.el %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.css %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.js %%CONTRIB%%share/git-core/contrib/README +%%CONTRIB%%share/git-core/contrib/buildsystems/CMakeLists.txt %%CONTRIB%%share/git-core/contrib/buildsystems/Generators.pm %%CONTRIB%%share/git-core/contrib/buildsystems/Generators/QMake.pm %%CONTRIB%%share/git-core/contrib/buildsystems/Generators/Vcproj.pm @@ -1300,9 +1300,6 @@ share/emacs/site-lisp/git/git.el %%CONTRIB%%share/git-core/contrib/mw-to-git/t/Makefile %%CONTRIB%%share/git-core/contrib/mw-to-git/t/README %%CONTRIB%%share/git-core/contrib/mw-to-git/t/install-wiki.sh -%%CONTRIB%%share/git-core/contrib/mw-to-git/t/install-wiki/.gitignore -%%CONTRIB%%share/git-core/contrib/mw-to-git/t/install-wiki/LocalSettings.php -%%CONTRIB%%share/git-core/contrib/mw-to-git/t/install-wiki/db_install.php %%CONTRIB%%share/git-core/contrib/mw-to-git/t/push-pull-tests.sh %%CONTRIB%%share/git-core/contrib/mw-to-git/t/t9360-mw-to-git-clone.sh %%CONTRIB%%share/git-core/contrib/mw-to-git/t/t9361-mw-to-git-push-pull.sh @@ -1338,11 +1335,6 @@ share/emacs/site-lisp/git/git.el %%CONTRIB%%share/git-core/contrib/subtree/t/Makefile %%CONTRIB%%share/git-core/contrib/subtree/t/t7900-subtree.sh %%CONTRIB%%share/git-core/contrib/subtree/todo -%%CONTRIB%%share/git-core/contrib/svn-fe/.gitignore -%%CONTRIB%%share/git-core/contrib/svn-fe/Makefile -%%CONTRIB%%share/git-core/contrib/svn-fe/svn-fe.c -%%CONTRIB%%share/git-core/contrib/svn-fe/svn-fe.txt -%%CONTRIB%%share/git-core/contrib/svn-fe/svnrdump_sim.py %%CONTRIB%%share/git-core/contrib/thunderbird-patch-inline/README %%CONTRIB%%share/git-core/contrib/thunderbird-patch-inline/appp.sh %%CONTRIB%%share/git-core/contrib/update-unicode/README |