diff options
| -rw-r--r-- | devel/scmgit-base/PLIST | 37 | ||||
| -rw-r--r-- | devel/scmgit-base/distinfo | 11 | ||||
| -rw-r--r-- | devel/scmgit-base/patches/patch-aa | 23 | ||||
| -rw-r--r-- | devel/scmgit-base/patches/patch-config.mak.uname | 23 | ||||
| -rw-r--r-- | devel/scmgit-docs/PLIST | 5 | ||||
| -rw-r--r-- | devel/scmgit/Makefile.version | 4 |
6 files changed, 66 insertions, 37 deletions
diff --git a/devel/scmgit-base/PLIST b/devel/scmgit-base/PLIST index 275ff9cca49..52eb5c77605 100644 --- a/devel/scmgit-base/PLIST +++ b/devel/scmgit-base/PLIST @@ -1,12 +1,33 @@ -@comment $NetBSD: PLIST,v 1.39 2013/01/04 08:22:59 adam Exp $ +@comment $NetBSD: PLIST,v 1.40 2013/04/08 14:12:25 mef Exp $ bin/git bin/git-cvsserver bin/git-receive-pack bin/git-shell bin/git-upload-archive bin/git-upload-pack +${PERL5_SUB_INSTALLARCHLIB}/perllocal.pod ${PERL5_SUB_INSTALLVENDORLIB}/Git.pm -lib/perl5/vendor_perl/${PKGMANDIR}/man3/Git.3 +${PERL5_SUB_INSTALLVENDORLIB}/Git/I18N.pm +${PERL5_SUB_INSTALLVENDORLIB}/Git/IndexInfo.pm +${PERL5_SUB_INSTALLVENDORLIB}/Git/SVN.pm +${PERL5_SUB_INSTALLVENDORLIB}/Git/SVN/Editor.pm +${PERL5_SUB_INSTALLVENDORLIB}/Git/SVN/Fetcher.pm +${PERL5_SUB_INSTALLVENDORLIB}/Git/SVN/GlobSpec.pm +${PERL5_SUB_INSTALLVENDORLIB}/Git/SVN/Log.pm +${PERL5_SUB_INSTALLVENDORLIB}/Git/SVN/Memoize/YAML.pm +${PERL5_SUB_INSTALLVENDORLIB}/Git/SVN/Migration.pm +${PERL5_SUB_INSTALLVENDORLIB}/Git/SVN/Prompt.pm +${PERL5_SUB_INSTALLVENDORLIB}/Git/SVN/Ra.pm +${PERL5_SUB_INSTALLVENDORLIB}/Git/SVN/Utils.pm +${PERL5_SUB_INSTALLVENDORARCH}/auto/Git/.packlist +${PERL5_SUB_INSTALLVENDORMAN3DIR}/Git.3 +${PERL5_SUB_INSTALLVENDORMAN3DIR}/Git::I18N.3 +${PERL5_SUB_INSTALLVENDORMAN3DIR}/Git::SVN::Editor.3 +${PERL5_SUB_INSTALLVENDORMAN3DIR}/Git::SVN::Fetcher.3 +${PERL5_SUB_INSTALLVENDORMAN3DIR}/Git::SVN::Memoize::YAML.3 +${PERL5_SUB_INSTALLVENDORMAN3DIR}/Git::SVN::Prompt.3 +${PERL5_SUB_INSTALLVENDORMAN3DIR}/Git::SVN::Ra.3 +${PERL5_SUB_INSTALLVENDORMAN3DIR}/Git::SVN::Utils.3 ${PLIST.python}${PYSITELIB}/git_remote_helpers/__init__.py ${PLIST.python}${PYSITELIB}/git_remote_helpers/__init__.pyc ${PLIST.python}${PYSITELIB}/git_remote_helpers/git/__init__.py @@ -38,6 +59,7 @@ libexec/git-core/git-branch libexec/git-core/git-bundle libexec/git-core/git-cat-file libexec/git-core/git-check-attr +libexec/git-core/git-check-ignore libexec/git-core/git-check-ref-format libexec/git-core/git-checkout libexec/git-core/git-checkout-index @@ -140,7 +162,7 @@ libexec/git-core/git-remote-ftp libexec/git-core/git-remote-ftps libexec/git-core/git-remote-http libexec/git-core/git-remote-https -libexec/git-core/git-remote-testgit +libexec/git-core/git-remote-testpy libexec/git-core/git-remote-testsvn libexec/git-core/git-repack libexec/git-core/git-replace @@ -188,11 +210,12 @@ libexec/git-core/git-write-tree libexec/git-core/mergetools/araxis libexec/git-core/mergetools/bc3 libexec/git-core/mergetools/codecompare -libexec/git-core/mergetools/defaults libexec/git-core/mergetools/deltawalker libexec/git-core/mergetools/diffuse libexec/git-core/mergetools/ecmerge libexec/git-core/mergetools/emerge +libexec/git-core/mergetools/gvimdiff +libexec/git-core/mergetools/gvimdiff2 libexec/git-core/mergetools/kdiff3 libexec/git-core/mergetools/kompare libexec/git-core/mergetools/meld @@ -200,7 +223,8 @@ 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/vimdiff +libexec/git-core/mergetools/vimdiff2 libexec/git-core/mergetools/xxdiff share/examples/scmgit/git-completion.bash share/examples/scmgit/templates/description @@ -209,11 +233,11 @@ share/examples/scmgit/templates/hooks/commit-msg.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 +share/examples/scmgit/templates/hooks/pre-push.sample share/examples/scmgit/templates/hooks/pre-rebase.sample share/examples/scmgit/templates/hooks/prepare-commit-msg.sample share/examples/scmgit/templates/hooks/update.sample share/examples/scmgit/templates/info/exclude -@pkgdir share/examples/scmgit/templates/branches share/locale/da/LC_MESSAGES/git.mo share/locale/de/LC_MESSAGES/git.mo share/locale/is/LC_MESSAGES/git.mo @@ -223,3 +247,4 @@ share/locale/pt_PT/LC_MESSAGES/git.mo share/locale/sv/LC_MESSAGES/git.mo share/locale/vi/LC_MESSAGES/git.mo share/locale/zh_CN/LC_MESSAGES/git.mo +@pkgdir share/examples/scmgit/templates/branches diff --git a/devel/scmgit-base/distinfo b/devel/scmgit-base/distinfo index 8ff79dfd723..422feb63eac 100644 --- a/devel/scmgit-base/distinfo +++ b/devel/scmgit-base/distinfo @@ -1,12 +1,13 @@ -$NetBSD: distinfo,v 1.68 2013/03/23 19:00:30 spz Exp $ +$NetBSD: distinfo,v 1.69 2013/04/08 14:12:25 mef Exp $ -SHA1 (git-1.8.1.5.tar.gz) = 3349a15de7c5501715bda9b68301d0406272f8e0 -RMD160 (git-1.8.1.5.tar.gz) = 791dfe5853a753edfc69e6da251233cc7ffe50fb -Size (git-1.8.1.5.tar.gz) = 4306780 bytes -SHA1 (patch-aa) = b1a8a325a62013438324ec001bbe48eaebd56f5a +SHA1 (git-1.8.2.tar.gz) = 42960ec7c2d8404af3d3f6d21f32f1e97e6e0a96 +RMD160 (git-1.8.2.tar.gz) = 5bf37fa0f85b8b73691add594671f60b1a884fb6 +Size (git-1.8.2.tar.gz) = 4389957 bytes +SHA1 (patch-aa) = 47e743aedffe231477d82d1190787af64faaa4b4 SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091 SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca SHA1 (patch-af) = bdabf7e3b24171cbdc2117735e83765e6e23648c SHA1 (patch-ag) = 4f0b9a5745203ea7ef369c8272b3ea7c644762f0 SHA1 (patch-ah) = f22a2160631fb624e9e20616c68ad1a4aa2bebc7 SHA1 (patch-ai) = 56b63d4790a11f5eb128186ad5efdd1bcf102f2e +SHA1 (patch-config.mak.uname) = e7fa7a91d4d9dd6793d752b1833f97fcaea236b1 diff --git a/devel/scmgit-base/patches/patch-aa b/devel/scmgit-base/patches/patch-aa index c14a509d3c8..83ffb58ea63 100644 --- a/devel/scmgit-base/patches/patch-aa +++ b/devel/scmgit-base/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.19 2012/11/16 21:18:39 adam Exp $ +$NetBSD: patch-aa,v 1.20 2013/04/08 14:12:25 mef Exp $ --- Makefile.orig 2012-10-21 21:32:15.000000000 +0000 +++ Makefile @@ -25,27 +25,6 @@ $NetBSD: patch-aa,v 1.19 2012/11/16 21:18:39 adam Exp $ RPMBUILD = rpmbuild TCL_PATH = tclsh TCLTK_PATH = wish -@@ -1023,9 +1017,10 @@ ifeq ($(uname_S),Darwin) - BASIC_CFLAGS += -DPRECOMPOSE_UNICODE - endif - ifeq ($(uname_S),SunOS) -+ NEED_LIBICONV = YesPlease - NEEDS_SOCKET = YesPlease - NEEDS_NSL = YesPlease -- SHELL_PATH = /bin/bash -+ SHELL_PATH = ${BASH} - SANE_TOOL_PATH = /usr/xpg6/bin:/usr/xpg4/bin - NO_STRCASESTR = YesPlease - NO_MEMMEM = YesPlease -@@ -1068,8 +1063,6 @@ ifeq ($(uname_S),SunOS) - NO_STRTOUMAX = YesPlease - GIT_TEST_CMP = cmp - endif -- INSTALL = /usr/ucb/install -- TAR = gtar - BASIC_CFLAGS += -D__EXTENSIONS__ -D__sun__ -DHAVE_ALLOCA_H - endif - ifeq ($(uname_O),Cygwin) @@ -2038,8 +2031,8 @@ ifdef DEFAULT_HELP_FORMAT BASIC_CFLAGS += -DDEFAULT_HELP_FORMAT='"$(DEFAULT_HELP_FORMAT)"' endif diff --git a/devel/scmgit-base/patches/patch-config.mak.uname b/devel/scmgit-base/patches/patch-config.mak.uname new file mode 100644 index 00000000000..b3bb7623298 --- /dev/null +++ b/devel/scmgit-base/patches/patch-config.mak.uname @@ -0,0 +1,23 @@ +$NetBSD: patch-config.mak.uname,v 1.1 2013/04/08 14:12:25 mef Exp $ + + +--- config.mak.uname.orig 2013-03-14 04:15:22.000000000 +0900 ++++ config.mak.uname 2013-04-08 19:11:58.000000000 +0900 +@@ -101,7 +101,7 @@ + ifeq ($(uname_S),SunOS) + NEEDS_SOCKET = YesPlease + NEEDS_NSL = YesPlease +- SHELL_PATH = /bin/bash ++ SHELL_PATH = ${BASH} + SANE_TOOL_PATH = /usr/xpg6/bin:/usr/xpg4/bin + NO_STRCASESTR = YesPlease + NO_MEMMEM = YesPlease +@@ -144,8 +144,6 @@ + NO_STRTOUMAX = YesPlease + GIT_TEST_CMP = cmp + endif +- INSTALL = /usr/ucb/install +- TAR = gtar + BASIC_CFLAGS += -D__EXTENSIONS__ -D__sun__ -DHAVE_ALLOCA_H + endif + ifeq ($(uname_O),Cygwin) diff --git a/devel/scmgit-docs/PLIST b/devel/scmgit-docs/PLIST index 3411191ab4d..4ffaba7164a 100644 --- a/devel/scmgit-docs/PLIST +++ b/devel/scmgit-docs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.16 2013/03/23 19:00:31 spz Exp $ +@comment $NetBSD: PLIST,v 1.17 2013/04/08 14:12:25 mef Exp $ man/man1/git-add.1 man/man1/git-am.1 man/man1/git-annotate.1 @@ -11,6 +11,7 @@ man/man1/git-branch.1 man/man1/git-bundle.1 man/man1/git-cat-file.1 man/man1/git-check-attr.1 +man/man1/git-check-ignore.1 man/man1/git-check-ref-format.1 man/man1/git-checkout-index.1 man/man1/git-checkout.1 @@ -101,7 +102,6 @@ man/man1/git-reflog.1 man/man1/git-relink.1 man/man1/git-remote-ext.1 man/man1/git-remote-fd.1 -man/man1/gitremote-helpers.1 man/man1/git-remote-testgit.1 man/man1/git-remote.1 man/man1/git-repack.1 @@ -149,6 +149,7 @@ man/man1/git-whatchanged.1 man/man1/git-write-tree.1 man/man1/git.1 man/man1/gitk.1 +man/man1/gitremote-helpers.1 man/man1/gitweb.1 man/man5/gitattributes.5 man/man5/githooks.5 diff --git a/devel/scmgit/Makefile.version b/devel/scmgit/Makefile.version index 0b1b2f0c550..ecfaaff4c27 100644 --- a/devel/scmgit/Makefile.version +++ b/devel/scmgit/Makefile.version @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.version,v 1.54 2013/03/23 19:00:30 spz Exp $ +# $NetBSD: Makefile.version,v 1.55 2013/04/08 14:12:25 mef Exp $ # # used by devel/scmgit/Makefile.common # used by www/gitweb/Makefile -GIT_VERSION= 1.8.1.5 +GIT_VERSION= 1.8.2 |