diff options
| -rw-r--r-- | devel/scmgit-base/Makefile | 3 | ||||
| -rw-r--r-- | devel/scmgit-base/PLIST | 19 | ||||
| -rw-r--r-- | devel/scmgit-base/distinfo | 8 | ||||
| -rw-r--r-- | devel/scmgit-docs/PLIST | 4 | ||||
| -rw-r--r-- | devel/scmgit/Makefile.common | 8 | ||||
| -rw-r--r-- | devel/scmgit/Makefile.version | 4 |
6 files changed, 29 insertions, 17 deletions
diff --git a/devel/scmgit-base/Makefile b/devel/scmgit-base/Makefile index dd1f2b1db19..5d95e0767d1 100644 --- a/devel/scmgit-base/Makefile +++ b/devel/scmgit-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2011/08/30 09:34:42 adam Exp $ +# $NetBSD: Makefile,v 1.36 2011/10/11 12:01:25 adam Exp $ .include "../../devel/scmgit/Makefile.common" @@ -39,7 +39,6 @@ GIT_TEMPLATEDIR= templates GIT_TEMPLATES= description info/exclude GIT_TEMPLATES+= hooks/applypatch-msg.sample hooks/commit-msg.sample -GIT_TEMPLATES+= hooks/post-commit.sample hooks/post-receive.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 diff --git a/devel/scmgit-base/PLIST b/devel/scmgit-base/PLIST index b1a62575f1e..1a490f53ed9 100644 --- a/devel/scmgit-base/PLIST +++ b/devel/scmgit-base/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.25 2011/07/08 11:14:43 adam Exp $ +@comment $NetBSD: PLIST,v 1.26 2011/10/11 12:01:25 adam Exp $ bin/git bin/git-cvsserver bin/git-receive-pack @@ -182,11 +182,24 @@ 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/defaults +libexec/git-core/mergetools/diffuse +libexec/git-core/mergetools/ecmerge +libexec/git-core/mergetools/emerge +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/vim +libexec/git-core/mergetools/xxdiff share/examples/scmgit/templates/description share/examples/scmgit/templates/hooks/applypatch-msg.sample share/examples/scmgit/templates/hooks/commit-msg.sample -share/examples/scmgit/templates/hooks/post-commit.sample -share/examples/scmgit/templates/hooks/post-receive.sample share/examples/scmgit/templates/hooks/post-update.sample share/examples/scmgit/templates/hooks/pre-applypatch.sample share/examples/scmgit/templates/hooks/pre-commit.sample diff --git a/devel/scmgit-base/distinfo b/devel/scmgit-base/distinfo index 5299c0dd796..a6cc0d2f1b1 100644 --- a/devel/scmgit-base/distinfo +++ b/devel/scmgit-base/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.42 2011/09/13 17:58:58 gdt Exp $ +$NetBSD: distinfo,v 1.43 2011/10/11 12:01:25 adam Exp $ -SHA1 (git-1.7.6.3.tar.gz) = 7264c0b0d97cb6a70447ba3b4b6fa488810d8115 -RMD160 (git-1.7.6.3.tar.gz) = 8b37b4f83ca2576634a69993060ca2f3993ab689 -Size (git-1.7.6.3.tar.gz) = 3397595 bytes +SHA1 (git-1.7.7.tar.gz) = bbf85bd767ca6b7e9caa1489bb4ba7ec64e0ab35 +RMD160 (git-1.7.7.tar.gz) = 54a185d66fb1f0e1607dc4514640c4b353d2cd1c +Size (git-1.7.7.tar.gz) = 3475448 bytes SHA1 (patch-aa) = f47ff9d8b9ba8592f7bbd21d4b0ab30394e8f9a0 SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091 SHA1 (patch-ae) = 06ea26658a986dc702c1c2c04c1a27f0a01e4dce diff --git a/devel/scmgit-docs/PLIST b/devel/scmgit-docs/PLIST index 2cb66f627c6..7856b879f56 100644 --- a/devel/scmgit-docs/PLIST +++ b/devel/scmgit-docs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2011/07/08 11:14:43 adam Exp $ +@comment $NetBSD: PLIST,v 1.11 2011/10/11 12:01:25 adam Exp $ man/man1/git-add.1 man/man1/git-am.1 man/man1/git-annotate.1 @@ -96,6 +96,7 @@ man/man1/git-relink.1 man/man1/git-remote-ext.1 man/man1/git-remote-fd.1 man/man1/git-remote-helpers.1 +man/man1/git-remote-testgit.1 man/man1/git-remote.1 man/man1/git-repack.1 man/man1/git-replace.1 @@ -152,6 +153,7 @@ man/man7/gitcore-tutorial.7 man/man7/gitcvs-migration.7 man/man7/gitdiffcore.7 man/man7/gitglossary.7 +man/man7/gitnamespaces.7 man/man7/gitrevisions.7 man/man7/gittutorial-2.7 man/man7/gittutorial.7 diff --git a/devel/scmgit/Makefile.common b/devel/scmgit/Makefile.common index 82521b24137..1b4697da433 100644 --- a/devel/scmgit/Makefile.common +++ b/devel/scmgit/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.20 2011/09/13 17:58:58 gdt Exp $ +# $NetBSD: Makefile.common,v 1.21 2011/10/11 12:01:24 adam Exp $ # # used by devel/scmgit-base/Makefile # used by devel/scmgit-docs/Makefile @@ -7,12 +7,10 @@ DISTNAME= git-${GIT_VERSION} CATEGORIES= devel scm -MASTER_SITES?= http://www.kernel.org/pub/software/scm/git/ http://git-core.googlecode.com/files/ -# Historically .tar.bz2 has been available, but 1.7.6.3 is only .tar.gz -#EXTRACT_SUFX= .tar.bz2 +MASTER_SITES?= http://git-core.googlecode.com/files/ MAINTAINER?= pkgsrc-users@NetBSD.org -HOMEPAGE?= http://git.or.cz/ +HOMEPAGE?= http://git-scm.com/ LICENSE= gnu-gpl-v2 PKG_DESTDIR_SUPPORT= user-destdir diff --git a/devel/scmgit/Makefile.version b/devel/scmgit/Makefile.version index 51e29c0ad6d..c3e90fb7ec1 100644 --- a/devel/scmgit/Makefile.version +++ b/devel/scmgit/Makefile.version @@ -1,3 +1,3 @@ -# $NetBSD: Makefile.version,v 1.28 2011/09/13 17:58:58 gdt Exp $ +# $NetBSD: Makefile.version,v 1.29 2011/10/11 12:01:24 adam Exp $ -GIT_VERSION= 1.7.6.3 +GIT_VERSION= 1.7.7 |