diff options
| -rw-r--r-- | devel/git-base/PLIST | 4 | ||||
| -rw-r--r-- | devel/git-base/distinfo | 8 | ||||
| -rw-r--r-- | devel/git-docs/PLIST | 3 | ||||
| -rw-r--r-- | devel/git/Makefile.version | 4 | ||||
| -rw-r--r-- | www/gitweb/Makefile | 3 |
5 files changed, 12 insertions, 10 deletions
diff --git a/devel/git-base/PLIST b/devel/git-base/PLIST index d2f71c1eac5..f3380e408e4 100644 --- a/devel/git-base/PLIST +++ b/devel/git-base/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2015/05/18 12:51:37 adam Exp $ +@comment $NetBSD: PLIST,v 1.10 2015/07/31 12:57:23 adam Exp $ bin/git bin/git-cvsserver bin/git-receive-pack @@ -165,6 +165,7 @@ 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-worktree libexec/git-core/git-write-tree libexec/git-core/mergetools/araxis libexec/git-core/mergetools/bc @@ -188,6 +189,7 @@ 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 share/examples/git/git-completion.bash share/examples/git/git-prompt.sh diff --git a/devel/git-base/distinfo b/devel/git-base/distinfo index e4fc4467ff5..a5bbd3deccd 100644 --- a/devel/git-base/distinfo +++ b/devel/git-base/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.31 2015/07/17 11:24:27 adam Exp $ +$NetBSD: distinfo,v 1.32 2015/07/31 12:57:23 adam Exp $ -SHA1 (git-2.4.6.tar.xz) = 72681005c096d4dbb7b1f6ea4dabfc887522fb00 -RMD160 (git-2.4.6.tar.xz) = 9389d648c7f875b98d2b5aad946dc4b9df89bfaa -Size (git-2.4.6.tar.xz) = 3690432 bytes +SHA1 (git-2.5.0.tar.xz) = c5fbfa92adbb0b0841095c2ada3ccd569ae6700d +RMD160 (git-2.5.0.tar.xz) = 7f4932a9af26f9e10c3cffc1d2a4b962b45054a3 +Size (git-2.5.0.tar.xz) = 3740620 bytes SHA1 (patch-aa) = 8c1096065d26b93a6e10bc6926d3fc3686f711f2 SHA1 (patch-ac) = 376cdd1c58b143c820ff6395987a8a77cf9b52ba SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca diff --git a/devel/git-docs/PLIST b/devel/git-docs/PLIST index 0b3aaf4d4a2..4782b72034f 100644 --- a/devel/git-docs/PLIST +++ b/devel/git-docs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2014/11/30 18:43:42 adam Exp $ +@comment $NetBSD: PLIST,v 1.5 2015/07/31 12:57:23 adam Exp $ man/man1/git-add.1 man/man1/git-am.1 man/man1/git-annotate.1 @@ -145,6 +145,7 @@ man/man1/git-verify-pack.1 man/man1/git-verify-tag.1 man/man1/git-web--browse.1 man/man1/git-whatchanged.1 +man/man1/git-worktree.1 man/man1/git-write-tree.1 man/man1/git.1 man/man1/gitk.1 diff --git a/devel/git/Makefile.version b/devel/git/Makefile.version index eab211a743a..6d670c26fdb 100644 --- a/devel/git/Makefile.version +++ b/devel/git/Makefile.version @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.version,v 1.27 2015/07/17 11:24:27 adam Exp $ +# $NetBSD: Makefile.version,v 1.28 2015/07/31 12:57:23 adam Exp $ # # used by devel/git/Makefile.common # used by devel/git-svn/Makefile -GIT_VERSION= 2.4.6 +GIT_VERSION= 2.5.0 diff --git a/www/gitweb/Makefile b/www/gitweb/Makefile index 35110b1d840..06c40048636 100644 --- a/www/gitweb/Makefile +++ b/www/gitweb/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.29 2015/07/19 21:29:44 wiz Exp $ +# $NetBSD: Makefile,v 1.30 2015/07/31 12:57:23 adam Exp $ .include "../../devel/git/Makefile.common" PKGNAME= ${DISTNAME:S/git/gitweb/} -PKGREVISION= 1 CATEGORIES= www COMMENT= Web interface for GIT repositories |