summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--devel/scmgit/Makefile4
-rw-r--r--devel/scmgit/PLIST14
-rw-r--r--devel/scmgit/distinfo14
-rw-r--r--devel/scmgit/patches/patch-aa18
-rw-r--r--devel/scmgit/patches/patch-ab8
-rw-r--r--devel/scmgit/patches/patch-ae16
6 files changed, 37 insertions, 37 deletions
diff --git a/devel/scmgit/Makefile b/devel/scmgit/Makefile
index e4403837b1c..99b4ec98615 100644
--- a/devel/scmgit/Makefile
+++ b/devel/scmgit/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2007/03/18 21:18:36 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2007/04/15 21:46:41 wiz Exp $
#
-DISTNAME= git-1.5.0.3
+DISTNAME= git-1.5.1.1
PKGNAME= scm${DISTNAME}
CATEGORIES= devel
MASTER_SITES= http://www.kernel.org/pub/software/scm/git/
diff --git a/devel/scmgit/PLIST b/devel/scmgit/PLIST
index b00ef62fd3e..69b3948e13c 100644
--- a/devel/scmgit/PLIST
+++ b/devel/scmgit/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2007/02/18 22:38:43 rillig Exp $
+@comment $NetBSD: PLIST,v 1.6 2007/04/15 21:46:41 wiz Exp $
bin/git
bin/git-add
bin/git-add--interactive
@@ -12,6 +12,7 @@ bin/git-archive
bin/git-bisect
bin/git-blame
bin/git-branch
+bin/git-bundle
bin/git-cat-file
bin/git-check-ref-format
bin/git-checkout
@@ -34,10 +35,10 @@ bin/git-describe
bin/git-diff
bin/git-diff-files
bin/git-diff-index
-bin/git-diff-stages
bin/git-diff-tree
bin/git-fast-import
bin/git-fetch
+bin/git-fetch--tool
bin/git-fetch-pack
bin/git-fmt-merge-msg
bin/git-for-each-ref
@@ -75,6 +76,7 @@ bin/git-merge-recursive
bin/git-merge-resolve
bin/git-merge-stupid
bin/git-merge-tree
+bin/git-mergetool
bin/git-mktag
bin/git-mktree
bin/git-mv
@@ -101,7 +103,6 @@ bin/git-repo-config
bin/git-request-pull
bin/git-rerere
bin/git-reset
-bin/git-resolve
bin/git-rev-list
bin/git-rev-parse
bin/git-revert
@@ -151,6 +152,7 @@ man/man1/git-archive.1
man/man1/git-bisect.1
man/man1/git-blame.1
man/man1/git-branch.1
+man/man1/git-bundle.1
man/man1/git-cat-file.1
man/man1/git-check-ref-format.1
man/man1/git-checkout-index.1
@@ -171,7 +173,6 @@ man/man1/git-daemon.1
man/man1/git-describe.1
man/man1/git-diff-files.1
man/man1/git-diff-index.1
-man/man1/git-diff-stages.1
man/man1/git-diff-tree.1
man/man1/git-diff.1
man/man1/git-fast-import.1
@@ -207,6 +208,7 @@ man/man1/git-merge-index.1
man/man1/git-merge-one-file.1
man/man1/git-merge-tree.1
man/man1/git-merge.1
+man/man1/git-mergetool.1
man/man1/git-mktag.1
man/man1/git-mktree.1
man/man1/git-mv.1
@@ -234,7 +236,6 @@ man/man1/git-repo-config.1
man/man1/git-request-pull.1
man/man1/git-rerere.1
man/man1/git-reset.1
-man/man1/git-resolve.1
man/man1/git-rev-list.1
man/man1/git-rev-parse.1
man/man1/git-revert.1
@@ -276,14 +277,13 @@ share/git-core/templates/description
share/git-core/templates/hooks/applypatch-msg
share/git-core/templates/hooks/commit-msg
share/git-core/templates/hooks/post-commit
+share/git-core/templates/hooks/post-receive
share/git-core/templates/hooks/post-update
share/git-core/templates/hooks/pre-applypatch
share/git-core/templates/hooks/pre-commit
share/git-core/templates/hooks/pre-rebase
share/git-core/templates/hooks/update
share/git-core/templates/info/exclude
-@exec ${MKDIR} %D/share/git-core/templates/remotes
-@dirrm share/git-core/templates/remotes
@dirrm share/git-core/templates/info
@dirrm share/git-core/templates/hooks
@exec ${MKDIR} %D/share/git-core/templates/branches
diff --git a/devel/scmgit/distinfo b/devel/scmgit/distinfo
index c12ab5ddbbf..acc6108e3f4 100644
--- a/devel/scmgit/distinfo
+++ b/devel/scmgit/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.7 2007/03/18 21:18:36 wiz Exp $
+$NetBSD: distinfo,v 1.8 2007/04/15 21:46:41 wiz Exp $
-SHA1 (git-1.5.0.3.tar.gz) = a5efd2cd36daad60718ed9b1f5a4f0de1eade25c
-RMD160 (git-1.5.0.3.tar.gz) = 2af313d5414770abad82babd0b4aee9b7e0bbc5b
-Size (git-1.5.0.3.tar.gz) = 1245187 bytes
-SHA1 (patch-aa) = ea9c34ec5390e626e13ed7e499c10adc9011d4d6
-SHA1 (patch-ab) = 89872ba1d182230359582c8c2c35424c045ee381
+SHA1 (git-1.5.1.1.tar.gz) = 6d0607e125e8466e85af411fde894ee7ef96098d
+RMD160 (git-1.5.1.1.tar.gz) = efbc8e5b49831561915f2b674efca5a6c5ffc6a2
+Size (git-1.5.1.1.tar.gz) = 1322959 bytes
+SHA1 (patch-aa) = 88f6e964616d45c3141c1afb5b465e40afc927f8
+SHA1 (patch-ab) = 59aaf91ef1f0d5a9ded006157467d8bd12d7b87b
SHA1 (patch-ac) = 5c86dfda134040f6eeafe4f18a742d99a5b003cc
-SHA1 (patch-ae) = 54ed9a535c13b9d5e33763d53a14fb81152f6970
+SHA1 (patch-ae) = d267e41f5f883bde801728328c67fd733d3bd351
diff --git a/devel/scmgit/patches/patch-aa b/devel/scmgit/patches/patch-aa
index fa3891d9568..42164c4db3d 100644
--- a/devel/scmgit/patches/patch-aa
+++ b/devel/scmgit/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.5 2007/02/18 22:38:43 rillig Exp $
+$NetBSD: patch-aa,v 1.6 2007/04/15 21:46:41 wiz Exp $
NetBSD 3.0 needs -liconv, too.
CFLAGS, LDFLAGS and LIBS should be taken from the environment.
---- Makefile.orig 2007-02-14 03:46:46.000000000 +0100
-+++ Makefile 2007-02-18 22:54:11.000000000 +0100
-@@ -114,8 +114,6 @@ uname_P := $(shell sh -c 'uname -p 2>/de
+--- Makefile.orig 2007-04-12 01:41:44.000000000 +0000
++++ Makefile
+@@ -123,8 +123,6 @@ uname_P := $(shell sh -c 'uname -p 2>/de
# CFLAGS and LDFLAGS are for the users to override from the command line.
@@ -15,7 +15,7 @@ CFLAGS, LDFLAGS and LIBS should be taken from the environment.
ALL_CFLAGS = $(CFLAGS)
ALL_LDFLAGS = $(LDFLAGS)
STRIP ?= strip
-@@ -344,6 +342,7 @@ ifeq ($(uname_S),Darwin)
+@@ -360,6 +358,7 @@ ifeq ($(uname_S),Darwin)
NO_STRLCPY = YesPlease
endif
ifeq ($(uname_S),SunOS)
@@ -23,7 +23,7 @@ CFLAGS, LDFLAGS and LIBS should be taken from the environment.
NEEDS_SOCKET = YesPlease
NEEDS_NSL = YesPlease
SHELL_PATH = /bin/bash
-@@ -391,9 +390,7 @@ ifeq ($(uname_S),OpenBSD)
+@@ -408,9 +407,7 @@ ifeq ($(uname_S),OpenBSD)
BASIC_LDFLAGS += -L/usr/local/lib
endif
ifeq ($(uname_S),NetBSD)
@@ -34,12 +34,12 @@ CFLAGS, LDFLAGS and LIBS should be taken from the environment.
BASIC_CFLAGS += -I/usr/pkg/include
BASIC_LDFLAGS += -L/usr/pkg/lib
ALL_LDFLAGS += -Wl,-rpath,/usr/pkg/lib
-@@ -594,7 +591,7 @@ prefix_SQ = $(subst ','\'',$(prefix))
+@@ -648,7 +645,7 @@ prefix_SQ = $(subst ','\'',$(prefix))
SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
-LIBS = $(GITLIBS) $(EXTLIBS)
+LIBS += $(GITLIBS) $(EXTLIBS)
- BASIC_CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER_SQ)' $(COMPAT_CFLAGS)
- LIB_OBJS += $(COMPAT_OBJS)
+ BASIC_CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER_SQ)' \
+ -DETC_GITCONFIG='"$(ETC_GITCONFIG_SQ)"' $(COMPAT_CFLAGS)
diff --git a/devel/scmgit/patches/patch-ab b/devel/scmgit/patches/patch-ab
index e690c4411c4..4ef9702ff06 100644
--- a/devel/scmgit/patches/patch-ab
+++ b/devel/scmgit/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2007/01/22 14:33:31 rillig Exp $
+$NetBSD: patch-ab,v 1.2 2007/04/15 21:46:41 wiz Exp $
---- git-compat-util.h.orig 2006-07-02 08:23:24.000000000 +0200
-+++ git-compat-util.h 2006-09-16 14:44:18.951236060 +0200
-@@ -4,6 +4,8 @@
+--- git-compat-util.h.orig 2007-04-12 01:41:44.000000000 +0000
++++ git-compat-util.h
+@@ -6,6 +6,8 @@
#ifndef FLEX_ARRAY
#if defined(__GNUC__) && (__GNUC__ < 3)
#define FLEX_ARRAY 0
diff --git a/devel/scmgit/patches/patch-ae b/devel/scmgit/patches/patch-ae
index b1c71849a70..3491c823818 100644
--- a/devel/scmgit/patches/patch-ae
+++ b/devel/scmgit/patches/patch-ae
@@ -1,16 +1,16 @@
-$NetBSD: patch-ae,v 1.2 2007/02/19 17:27:50 rillig Exp $
+$NetBSD: patch-ae,v 1.3 2007/04/15 21:46:41 wiz Exp $
In pkgsrc, all Perl modules are installed into vendor_perl, not
site_perl.
---- perl/Makefile.orig 2007-02-14 03:46:46.000000000 +0100
-+++ perl/Makefile 2007-02-18 23:25:33.000000000 +0100
-@@ -7,7 +7,7 @@
- prefix_SQ = $(subst ','\'',$(prefix))
+--- perl/Makefile.orig 2007-04-12 01:41:44.000000000 +0000
++++ perl/Makefile
+@@ -11,7 +11,7 @@ ifndef V
+ endif
all install instlibdir: $(makfile)
-- $(MAKE) -f $(makfile) $@
-+ $(MAKE) -f $(makfile) INSTALLDIRS=vendor $@
+- $(QUIET)$(MAKE) -f $(makfile) $@
++ $(QUIET)$(MAKE) -f $(makfile) INSTALLDIRS=vendor $@
clean:
- test -f $(makfile) && $(MAKE) -f $(makfile) $@ || exit 0
+ $(QUIET)test -f $(makfile) && $(MAKE) -f $(makfile) $@ || exit 0
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-29 01:15:46 +0000