summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--devel/scmgit-base/PLIST6
-rw-r--r--devel/scmgit-base/distinfo14
-rw-r--r--devel/scmgit-base/patches/patch-aa18
-rw-r--r--devel/scmgit-base/patches/patch-ae4
-rw-r--r--devel/scmgit-base/patches/patch-af4
-rw-r--r--devel/scmgit-docs/PLIST3
-rw-r--r--devel/scmgit/Makefile.version4
7 files changed, 29 insertions, 24 deletions
diff --git a/devel/scmgit-base/PLIST b/devel/scmgit-base/PLIST
index 5c29b15dd31..8967a86482c 100644
--- a/devel/scmgit-base/PLIST
+++ b/devel/scmgit-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.32 2012/05/06 18:08:59 adam Exp $
+@comment $NetBSD: PLIST,v 1.33 2012/07/09 14:30:49 adam Exp $
bin/git
bin/git-cvsserver
bin/git-receive-pack
@@ -47,6 +47,7 @@ libexec/git-core/git-cherry-pick
${PLIST.gui}libexec/git-core/git-citool
libexec/git-core/git-clean
libexec/git-core/git-clone
+libexec/git-core/git-column
libexec/git-core/git-commit
libexec/git-core/git-commit-tree
libexec/git-core/git-config
@@ -115,6 +116,7 @@ libexec/git-core/git-mktree
libexec/git-core/git-mv
libexec/git-core/git-name-rev
libexec/git-core/git-notes
+libexec/git-core/git-p4
libexec/git-core/git-pack-objects
libexec/git-core/git-pack-redundant
libexec/git-core/git-pack-refs
@@ -283,7 +285,9 @@ ${PLIST.gui}share/gitk/lib/msgs/sv.msg
share/locale/da/LC_MESSAGES/git.mo
share/locale/de/LC_MESSAGES/git.mo
share/locale/is/LC_MESSAGES/git.mo
+share/locale/it/LC_MESSAGES/git.mo
share/locale/nl/LC_MESSAGES/git.mo
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
diff --git a/devel/scmgit-base/distinfo b/devel/scmgit-base/distinfo
index 2d04851b0ca..6c7f95b8bbe 100644
--- a/devel/scmgit-base/distinfo
+++ b/devel/scmgit-base/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.56 2012/06/18 17:36:55 gdt Exp $
+$NetBSD: distinfo,v 1.57 2012/07/09 14:30:49 adam Exp $
-SHA1 (git-1.7.10.5.tar.gz) = 9d0767ef195d3971a891efaf11996158cb341499
-RMD160 (git-1.7.10.5.tar.gz) = 870fc615575828abb14f418387fb316948fe022e
-Size (git-1.7.10.5.tar.gz) = 3813587 bytes
-SHA1 (patch-aa) = ce4ba3241b44e81f9a39986008fbb361062f8470
+SHA1 (git-1.7.11.1.tar.gz) = d09664978931d215e43241689eb09371b509c7ce
+RMD160 (git-1.7.11.1.tar.gz) = bbe8156888a43256012cc0d1d5f44b430921b107
+Size (git-1.7.11.1.tar.gz) = 4000383 bytes
+SHA1 (patch-aa) = e4c1d5a723b97056e06f966e1dbb44d330678ff1
SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091
-SHA1 (patch-ae) = d420c0a1db0de77bd9713d066434981b20bd4299
-SHA1 (patch-af) = d6c942f7d8a0fe0074ea3edb7e6d858354c85232
+SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca
+SHA1 (patch-af) = a47756e1d78c07cf745040f1ba962f80fbb7b69e
SHA1 (patch-ag) = 4f0b9a5745203ea7ef369c8272b3ea7c644762f0
SHA1 (patch-ah) = f22a2160631fb624e9e20616c68ad1a4aa2bebc7
SHA1 (patch-ai) = 56b63d4790a11f5eb128186ad5efdd1bcf102f2e
diff --git a/devel/scmgit-base/patches/patch-aa b/devel/scmgit-base/patches/patch-aa
index 31bd095b8eb..e69e7d080cc 100644
--- a/devel/scmgit-base/patches/patch-aa
+++ b/devel/scmgit-base/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.16 2012/03/09 17:02:14 adam Exp $
+$NetBSD: patch-aa,v 1.17 2012/07/09 14:30:50 adam Exp $
---- Makefile.orig 2012-03-05 22:42:15.000000000 +0000
+--- Makefile.orig 2012-06-21 21:55:43.000000000 +0000
+++ Makefile
-@@ -307,8 +307,6 @@ endif
+@@ -318,8 +318,6 @@ endif
CFLAGS = -g -O2 -Wall
LDFLAGS =
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.16 2012/03/09 17:02:14 adam Exp $
STRIP ?= strip
# Among the variables below, these:
-@@ -343,13 +341,9 @@ pathsep = :
+@@ -354,13 +352,9 @@ pathsep = :
export prefix bindir sharedir sysconfdir gitwebdir localedir
@@ -25,7 +25,7 @@ $NetBSD: patch-aa,v 1.16 2012/03/09 17:02:14 adam Exp $
RPMBUILD = rpmbuild
TCL_PATH = tclsh
TCLTK_PATH = wish
-@@ -936,9 +929,10 @@ ifeq ($(uname_S),Darwin)
+@@ -992,9 +986,10 @@ ifeq ($(uname_S),Darwin)
HAVE_DEV_TTY = YesPlease
endif
ifeq ($(uname_S),SunOS)
@@ -37,7 +37,7 @@ $NetBSD: patch-aa,v 1.16 2012/03/09 17:02:14 adam Exp $
SANE_TOOL_PATH = /usr/xpg6/bin:/usr/xpg4/bin
NO_STRCASESTR = YesPlease
NO_MEMMEM = YesPlease
-@@ -980,8 +974,6 @@ ifeq ($(uname_S),SunOS)
+@@ -1036,8 +1031,6 @@ ifeq ($(uname_S),SunOS)
NO_STRTOUMAX = YesPlease
GIT_TEST_CMP = cmp
endif
@@ -46,8 +46,8 @@ $NetBSD: patch-aa,v 1.16 2012/03/09 17:02:14 adam Exp $
BASIC_CFLAGS += -D__EXTENSIONS__ -D__sun__ -DHAVE_ALLOCA_H
endif
ifeq ($(uname_O),Cygwin)
-@@ -1843,8 +1835,8 @@ DEFAULT_PAGER_CQ_SQ = $(subst ','\'',$(D
- BASIC_CFLAGS += -DDEFAULT_PAGER='$(DEFAULT_PAGER_CQ_SQ)'
+@@ -1915,8 +1908,8 @@ SHELL_PATH_CQ_SQ = $(subst ','\'',$(SHEL
+ BASIC_CFLAGS += -DSHELL_PATH='$(SHELL_PATH_CQ_SQ)'
endif
-ALL_CFLAGS += $(BASIC_CFLAGS)
@@ -57,7 +57,7 @@ $NetBSD: patch-aa,v 1.16 2012/03/09 17:02:14 adam Exp $
export DIFF TAR INSTALL DESTDIR SHELL_PATH
-@@ -2464,7 +2456,6 @@ ifndef NO_GETTEXT
+@@ -2563,7 +2556,6 @@ ifndef NO_GETTEXT
endif
ifndef NO_PERL
$(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
diff --git a/devel/scmgit-base/patches/patch-ae b/devel/scmgit-base/patches/patch-ae
index f8e9be68124..079c6da220c 100644
--- a/devel/scmgit-base/patches/patch-ae
+++ b/devel/scmgit-base/patches/patch-ae
@@ -1,11 +1,11 @@
-$NetBSD: patch-ae,v 1.4 2012/02/06 13:11:35 adam Exp $
+$NetBSD: patch-ae,v 1.5 2012/07/09 14:30:50 adam Exp $
In pkgsrc, all Perl modules are installed into vendor_perl, not
site_perl.
--- perl/Makefile.orig 2008-08-17 16:43:06.000000000 -0400
+++ perl/Makefile
-@@ -12,7 +12,7 @@ ifndef V
+@@ -13,7 +13,7 @@ ifndef V
endif
all install instlibdir: $(makfile)
diff --git a/devel/scmgit-base/patches/patch-af b/devel/scmgit-base/patches/patch-af
index 74ea071ecd6..938021384d1 100644
--- a/devel/scmgit-base/patches/patch-af
+++ b/devel/scmgit-base/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.6 2012/02/06 13:11:35 adam Exp $
+$NetBSD: patch-af,v 1.7 2012/07/09 14:30:50 adam Exp $
--- Documentation/Makefile.orig 2010-10-22 03:49:16.000000000 +0000
+++ Documentation/Makefile
-@@ -177,16 +177,16 @@ pdf: user-manual.pdf
+@@ -187,16 +187,16 @@ pdf: user-manual.pdf
install: install-man
install-man: man
diff --git a/devel/scmgit-docs/PLIST b/devel/scmgit-docs/PLIST
index 74326f4d4b0..faf860cf61d 100644
--- a/devel/scmgit-docs/PLIST
+++ b/devel/scmgit-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2012/02/06 13:11:35 adam Exp $
+@comment $NetBSD: PLIST,v 1.14 2012/07/09 14:30:50 adam Exp $
man/man1/git-add.1
man/man1/git-am.1
man/man1/git-annotate.1
@@ -19,6 +19,7 @@ man/man1/git-cherry.1
man/man1/git-citool.1
man/man1/git-clean.1
man/man1/git-clone.1
+man/man1/git-column.1
man/man1/git-commit-tree.1
man/man1/git-commit.1
man/man1/git-config.1
diff --git a/devel/scmgit/Makefile.version b/devel/scmgit/Makefile.version
index 15aa3f8c0c0..3574580c479 100644
--- a/devel/scmgit/Makefile.version
+++ b/devel/scmgit/Makefile.version
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.version,v 1.43 2012/06/18 17:36:55 gdt Exp $
+# $NetBSD: Makefile.version,v 1.44 2012/07/09 14:30:49 adam Exp $
#
# used by devel/scmgit/Makefile.common
# used by www/gitweb/Makefile
-GIT_VERSION= 1.7.10.5
+GIT_VERSION= 1.7.11.1
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-13 20:14:47 +0000