diff options
| -rw-r--r-- | devel/git-base/Makefile | 3 | ||||
| -rw-r--r-- | devel/git-base/PLIST | 7 | ||||
| -rw-r--r-- | devel/git-base/distinfo | 10 | ||||
| -rw-r--r-- | devel/git-docs/Makefile | 3 | ||||
| -rw-r--r-- | devel/git-docs/PLIST | 4 | ||||
| -rw-r--r-- | devel/git-gitk/PLIST | 6 | ||||
| -rw-r--r-- | devel/git/Makefile | 3 | ||||
| -rw-r--r-- | devel/git/Makefile.version | 4 | ||||
| -rw-r--r-- | www/gitweb/Makefile | 3 |
9 files changed, 19 insertions, 24 deletions
diff --git a/devel/git-base/Makefile b/devel/git-base/Makefile index b8eaaa8c3d2..f8bbb9921ee 100644 --- a/devel/git-base/Makefile +++ b/devel/git-base/Makefile @@ -1,6 +1,5 @@ -# $NetBSD: Makefile,v 1.66 2019/08/11 13:18:43 wiz Exp $ +# $NetBSD: Makefile,v 1.67 2019/08/20 13:00:02 adam Exp $ -PKGREVISION= 3 .include "../../devel/git/Makefile.common" PKGNAME= git-base-${GIT_VERSION} diff --git a/devel/git-base/PLIST b/devel/git-base/PLIST index d18fa3e6772..c252c6e30f1 100644 --- a/devel/git-base/PLIST +++ b/devel/git-base/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.25 2019/06/09 16:15:32 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.26 2019/08/20 13:00:02 adam Exp $ bin/git bin/git-cvsserver bin/git-receive-pack @@ -69,6 +69,7 @@ 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-env--helper libexec/git-core/git-fast-export libexec/git-core/git-fast-import libexec/git-core/git-fetch @@ -132,8 +133,6 @@ libexec/git-core/git-quiltimport libexec/git-core/git-range-diff libexec/git-core/git-read-tree libexec/git-core/git-rebase -libexec/git-core/git-rebase--am -libexec/git-core/git-rebase--common libexec/git-core/git-rebase--preserve-merges libexec/git-core/git-receive-pack libexec/git-core/git-reflog @@ -150,6 +149,7 @@ libexec/git-core/git-replace libexec/git-core/git-request-pull libexec/git-core/git-rerere libexec/git-core/git-reset +libexec/git-core/git-restore libexec/git-core/git-rev-list libexec/git-core/git-rev-parse libexec/git-core/git-revert @@ -172,6 +172,7 @@ libexec/git-core/git-stripspace libexec/git-core/git-submodule libexec/git-core/git-submodule--helper libexec/git-core/git-svn +libexec/git-core/git-switch libexec/git-core/git-symbolic-ref libexec/git-core/git-tag libexec/git-core/git-unpack-file diff --git a/devel/git-base/distinfo b/devel/git-base/distinfo index e80f3eacfc5..2154e6ba3ca 100644 --- a/devel/git-base/distinfo +++ b/devel/git-base/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.89 2019/06/09 16:15:32 ryoon Exp $ +$NetBSD: distinfo,v 1.90 2019/08/20 13:00:02 adam Exp $ -SHA1 (git-2.22.0.tar.xz) = 4984f9f7d32e7f967cee15dce4973c231b2308a1 -RMD160 (git-2.22.0.tar.xz) = a427f61cbc0bc40de23570f1f35fa082221e5c90 -SHA512 (git-2.22.0.tar.xz) = 75b3dcac36f80281effcd099944de34050a35f3599ce42f86ce60455b6c952039fb0f6438d296e0cc9c0651d4a17f467780dc475669227d3c98ddefe91723d42 -Size (git-2.22.0.tar.xz) = 5609772 bytes +SHA1 (git-2.23.0.tar.xz) = fc627f8cb994c60ae6c4580ca514af2a18c464d7 +RMD160 (git-2.23.0.tar.xz) = fc260e2f2e762f0156ba0639853d8708cffe5b38 +SHA512 (git-2.23.0.tar.xz) = c0bb29b3689ec2e157f90df849599ca149a08fc0c69f6a68b1f3219b6335d521983e6ed58cd364b86398e4dcf9e84892fb9eded79a1c97b74150edca299cf671 +Size (git-2.23.0.tar.xz) = 5707148 bytes SHA1 (patch-Makefile) = 73741b9d9a1b32bb47db48a7c546c4ff10fb41d6 SHA1 (patch-ac) = e5d2112d158fe493a89b244a10d2e4b998a23d98 SHA1 (patch-af) = 06460f220b4703a1ff98809006ec1aed5017bb23 diff --git a/devel/git-docs/Makefile b/devel/git-docs/Makefile index 4ecd06b484a..61c09436931 100644 --- a/devel/git-docs/Makefile +++ b/devel/git-docs/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.13 2019/08/11 13:18:43 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2019/08/20 13:00:02 adam Exp $ PKGNAME= git-docs-${GIT_VERSION} -PKGREVISION= 1 COMMENT= GIT Tree History Storage Tool (documentation) CONFLICTS+= scmgit-docs-[0-9]* diff --git a/devel/git-docs/PLIST b/devel/git-docs/PLIST index f62bf895a58..9290cb05f07 100644 --- a/devel/git-docs/PLIST +++ b/devel/git-docs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.12 2019/06/09 16:15:33 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.13 2019/08/20 13:00:02 adam Exp $ man/man1/git-add.1 man/man1/git-am.1 man/man1/git-annotate.1 @@ -110,6 +110,7 @@ man/man1/git-replace.1 man/man1/git-request-pull.1 man/man1/git-rerere.1 man/man1/git-reset.1 +man/man1/git-restore.1 man/man1/git-rev-list.1 man/man1/git-rev-parse.1 man/man1/git-revert.1 @@ -131,6 +132,7 @@ man/man1/git-status.1 man/man1/git-stripspace.1 man/man1/git-submodule.1 man/man1/git-svn.1 +man/man1/git-switch.1 man/man1/git-symbolic-ref.1 man/man1/git-tag.1 man/man1/git-unpack-file.1 diff --git a/devel/git-gitk/PLIST b/devel/git-gitk/PLIST index 1325ad2cd43..4b24a8ea34c 100644 --- a/devel/git-gitk/PLIST +++ b/devel/git-gitk/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2017/02/25 08:32:57 adam Exp $ +@comment $NetBSD: PLIST,v 1.7 2019/08/20 13:00:02 adam Exp $ bin/gitk libexec/git-core/git-citool libexec/git-core/git-gui @@ -23,10 +23,6 @@ share/git-gui/lib/date.tcl share/git-gui/lib/diff.tcl share/git-gui/lib/encoding.tcl share/git-gui/lib/error.tcl -${PLIST.macosx}share/git-gui/lib/Git Gui.app/Contents/Info.plist -${PLIST.macosx}share/git-gui/lib/Git Gui.app/Contents/MacOS/${WISH_APP} -${PLIST.macosx}share/git-gui/lib/Git Gui.app/Contents/Resources/Scripts/AppMain.tcl -${PLIST.macosx}share/git-gui/lib/Git Gui.app/Contents/Resources/git-gui.icns share/git-gui/lib/git-gui.ico ${PLIST.macosx}share/git-gui/lib/git-gui.tcl share/git-gui/lib/index.tcl diff --git a/devel/git/Makefile b/devel/git/Makefile index d9f7088ea47..7501317cd24 100644 --- a/devel/git/Makefile +++ b/devel/git/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.5 2019/07/17 14:33:28 gdt Exp $ +# $NetBSD: Makefile,v 1.6 2019/08/20 13:00:02 adam Exp $ .include "../../devel/git/Makefile.version" DISTNAME= # empty PKGNAME= git-${GIT_VERSION} -PKGREVISION= 1 CATEGORIES+= meta-pkgs devel DISTFILES= # empty MASTER_SITES= http://www.kernel.org/pub/software/scm/git/ diff --git a/devel/git/Makefile.version b/devel/git/Makefile.version index 7c71b5b81a7..7500f1ab8d9 100644 --- a/devel/git/Makefile.version +++ b/devel/git/Makefile.version @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.version,v 1.79 2019/06/09 16:15:32 ryoon Exp $ +# $NetBSD: Makefile.version,v 1.80 2019/08/20 13:00:02 adam Exp $ # # used by devel/git/Makefile.common # used by devel/git-cvs/Makefile # used by devel/git-svn/Makefile -GIT_VERSION= 2.22.0 +GIT_VERSION= 2.23.0 diff --git a/www/gitweb/Makefile b/www/gitweb/Makefile index 4a70a4a68f7..5ce3f648820 100644 --- a/www/gitweb/Makefile +++ b/www/gitweb/Makefile @@ -1,6 +1,5 @@ -# $NetBSD: Makefile,v 1.38 2019/08/11 13:24:19 wiz Exp $ +# $NetBSD: Makefile,v 1.39 2019/08/20 13:00:02 adam Exp $ -PKGREVISION= 1 .include "../../devel/git/Makefile.common" PKGNAME= ${DISTNAME:S/git/gitweb/} |