summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
Diffstat (limited to 'devel')
-rw-r--r--devel/scmgit-base/Makefile5
-rw-r--r--devel/scmgit-base/PLIST9
-rw-r--r--devel/scmgit-base/distinfo13
-rw-r--r--devel/scmgit-base/patches/patch-aa20
-rw-r--r--devel/scmgit-base/patches/patch-ab13
-rw-r--r--devel/scmgit-base/patches/patch-ag6
-rw-r--r--devel/scmgit-docs/PLIST8
-rw-r--r--devel/scmgit/Makefile.common3
-rw-r--r--devel/scmgit/Makefile.version4
9 files changed, 37 insertions, 44 deletions
diff --git a/devel/scmgit-base/Makefile b/devel/scmgit-base/Makefile
index 58902425697..4ad2f9eae02 100644
--- a/devel/scmgit-base/Makefile
+++ b/devel/scmgit-base/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2010/01/12 14:19:55 fhajny Exp $
+# $NetBSD: Makefile,v 1.20 2010/01/15 10:36:41 wiz Exp $
#
.include "../../devel/scmgit/Makefile.common"
PKGNAME= scmgit-base-${GIT_VERSION}
-PKGREVISION= 2
COMMENT= GIT Tree History Storage Tool (base package)
PKG_DESTDIR_SUPPORT= user-destdir
@@ -81,8 +80,6 @@ SUBST_VARS.fix-paths= PREFIX
.if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS" || ${OPSYS} == "OSF1" || ${OPSYS} == "HPUX" || ${OPSYS} == "QNX" || ${OPSYS} == "UnixWare"
SUBST_CLASSES+= fix-cd-P
SUBST_FILES.fix-cd-P= git-sh-setup.sh
-SUBST_FILES.fix-cd-P+= t/t0000-basic.sh
-SUBST_FILES.fix-cd-P+= t/t5522-pull-symlink.sh
SUBST_FILES.fix-cd-P+= t/test-lib.sh
SUBST_MESSAGE.fix-cd-P= Fixing cd arguments.
SUBST_STAGE.fix-cd-P= pre-build
diff --git a/devel/scmgit-base/PLIST b/devel/scmgit-base/PLIST
index 3f18e214a74..8ff04f5708e 100644
--- a/devel/scmgit-base/PLIST
+++ b/devel/scmgit-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2009/08/07 02:39:51 minskim Exp $
+@comment $NetBSD: PLIST,v 1.16 2010/01/15 10:36:41 wiz Exp $
bin/git
bin/git-cvsserver
bin/git-receive-pack
@@ -47,7 +47,6 @@ libexec/git-core/git-difftool--helper
libexec/git-core/git-fast-export
libexec/git-core/git-fast-import
libexec/git-core/git-fetch
-libexec/git-core/git-fetch--tool
libexec/git-core/git-fetch-pack
libexec/git-core/git-filter-branch
libexec/git-core/git-fmt-merge-msg
@@ -62,6 +61,7 @@ ${PLIST.gui}libexec/git-core/git-gui
${PLIST.gui}libexec/git-core/git-gui--askpass
libexec/git-core/git-hash-object
libexec/git-core/git-help
+libexec/git-core/git-http-backend
libexec/git-core/git-http-fetch
libexec/git-core/git-http-push
libexec/git-core/git-imap-send
@@ -93,6 +93,7 @@ libexec/git-core/git-mktag
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-pack-objects
libexec/git-core/git-pack-redundant
libexec/git-core/git-pack-refs
@@ -111,7 +112,9 @@ libexec/git-core/git-receive-pack
libexec/git-core/git-reflog
libexec/git-core/git-relink
libexec/git-core/git-remote
+libexec/git-core/git-remote-curl
libexec/git-core/git-repack
+libexec/git-core/git-replace
libexec/git-core/git-repo-config
libexec/git-core/git-request-pull
libexec/git-core/git-rerere
@@ -194,6 +197,7 @@ ${PLIST.gui}share/git-gui/lib/logo.tcl
${PLIST.gui}share/git-gui/lib/merge.tcl
${PLIST.gui}share/git-gui/lib/mergetool.tcl
${PLIST.gui}share/git-gui/lib/msgs/de.msg
+${PLIST.gui}share/git-gui/lib/msgs/el.msg
${PLIST.gui}share/git-gui/lib/msgs/fr.msg
${PLIST.gui}share/git-gui/lib/msgs/hu.msg
${PLIST.gui}share/git-gui/lib/msgs/it.msg
@@ -220,6 +224,7 @@ ${PLIST.gui}share/git-gui/lib/win32_shortcut.js
${PLIST.gui}share/gitk/lib/msgs/de.msg
${PLIST.gui}share/gitk/lib/msgs/es.msg
${PLIST.gui}share/gitk/lib/msgs/it.msg
+${PLIST.gui}share/gitk/lib/msgs/ja.msg
${PLIST.gui}share/gitk/lib/msgs/ru.msg
${PLIST.gui}share/gitk/lib/msgs/sv.msg
@pkgdir share/examples/scmgit/templates/branches
diff --git a/devel/scmgit-base/distinfo b/devel/scmgit-base/distinfo
index fe3c299a91a..5a32a21a0cb 100644
--- a/devel/scmgit-base/distinfo
+++ b/devel/scmgit-base/distinfo
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.20 2009/08/07 02:39:51 minskim Exp $
+$NetBSD: distinfo,v 1.21 2010/01/15 10:36:41 wiz Exp $
-SHA1 (git-1.6.4.tar.gz) = 1c40571d4fd09b76f9ce3435e866fe3338df4bb3
-RMD160 (git-1.6.4.tar.gz) = b660e0db359146d51bf0ea8cae000c9688f3254e
-Size (git-1.6.4.tar.gz) = 2621645 bytes
-SHA1 (patch-aa) = 406ec1d5a5101b63982fdb3aaa64aed380f48918
-SHA1 (patch-ab) = 7d8bc92b7f36cf42368111334a6ec5b501d06f8d
+SHA1 (git-1.6.6.tar.gz) = 3e8c410cb98916373a241b10f6b4c922f9396379
+RMD160 (git-1.6.6.tar.gz) = ee565e599c21477044bc8cf825288b4aea92e6cd
+Size (git-1.6.6.tar.gz) = 2835546 bytes
+SHA1 (patch-aa) = be3164a456d548bb722456ce97e8ba8bbb5620e2
SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091
SHA1 (patch-ae) = 06ea26658a986dc702c1c2c04c1a27f0a01e4dce
SHA1 (patch-af) = ea0ac503103429f32d26bd42c37a9ed563ff17b8
-SHA1 (patch-ag) = a6c586cdfbad923a3497fa4ab0c73840dc035737
+SHA1 (patch-ag) = 048d9449048e417fab01c3e0e8e6e81d9df3bfac
SHA1 (patch-ah) = d60b5304109f64f70146a222f6eb1deeb58dd6ac
SHA1 (patch-ai) = 56b63d4790a11f5eb128186ad5efdd1bcf102f2e
diff --git a/devel/scmgit-base/patches/patch-aa b/devel/scmgit-base/patches/patch-aa
index dc3ec1d6647..d31143d21b7 100644
--- a/devel/scmgit-base/patches/patch-aa
+++ b/devel/scmgit-base/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.10 2009/08/07 02:39:51 minskim Exp $
+$NetBSD: patch-aa,v 1.11 2010/01/15 10:36:41 wiz Exp $
---- Makefile.orig 2009-07-29 01:18:18.000000000 -0700
+--- Makefile.orig 2009-12-24 00:00:22.000000000 +0000
+++ Makefile
-@@ -270,12 +270,8 @@ GITWEB_SITE_FOOTER =
+@@ -305,12 +305,8 @@ GITWEB_SITE_FOOTER =
export prefix bindir sharedir sysconfdir
@@ -15,7 +15,7 @@ $NetBSD: patch-aa,v 1.10 2009/08/07 02:39:51 minskim Exp $
RPMBUILD = rpmbuild
TCL_PATH = tclsh
TCLTK_PATH = wish
-@@ -719,9 +715,10 @@ ifeq ($(uname_S),Darwin)
+@@ -768,9 +764,10 @@ ifeq ($(uname_S),Darwin)
USE_ST_TIMESPEC = YesPlease
endif
ifeq ($(uname_S),SunOS)
@@ -27,16 +27,16 @@ $NetBSD: patch-aa,v 1.10 2009/08/07 02:39:51 minskim Exp $
SANE_TOOL_PATH = /usr/xpg6/bin:/usr/xpg4/bin
NO_STRCASESTR = YesPlease
NO_MEMMEM = YesPlease
-@@ -754,8 +751,6 @@ ifeq ($(uname_S),SunOS)
- ifdef NO_IPV6
- NEEDS_RESOLV = YesPlease
+@@ -801,8 +798,6 @@ ifeq ($(uname_S),SunOS)
+ NO_C99_FORMAT = YesPlease
+ NO_STRTOUMAX = YesPlease
endif
- INSTALL = /usr/ucb/install
- TAR = gtar
BASIC_CFLAGS += -D__EXTENSIONS__ -D__sun__ -DHAVE_ALLOCA_H
endif
ifeq ($(uname_O),Cygwin)
-@@ -800,15 +795,20 @@ ifeq ($(uname_S),OpenBSD)
+@@ -850,15 +845,20 @@ ifeq ($(uname_S),OpenBSD)
THREADED_DELTA_SEARCH = YesPlease
endif
ifeq ($(uname_S),NetBSD)
@@ -60,7 +60,7 @@ $NetBSD: patch-aa,v 1.10 2009/08/07 02:39:51 minskim Exp $
ifeq ($(uname_S),AIX)
NO_STRCASESTR=YesPlease
NO_MEMMEM = YesPlease
-@@ -1289,7 +1289,7 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_P
+@@ -1395,7 +1395,7 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_P
PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
@@ -69,7 +69,7 @@ $NetBSD: patch-aa,v 1.10 2009/08/07 02:39:51 minskim Exp $
BASIC_CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER_SQ)' \
$(COMPAT_CFLAGS)
-@@ -1643,10 +1643,10 @@ gitexec_instdir_SQ = $(subst ','\'',$(gi
+@@ -1788,10 +1788,10 @@ gitexec_instdir_SQ = $(subst ','\'',$(gi
export gitexec_instdir
install: all
diff --git a/devel/scmgit-base/patches/patch-ab b/devel/scmgit-base/patches/patch-ab
deleted file mode 100644
index 55aae0d2e14..00000000000
--- a/devel/scmgit-base/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2009/08/07 02:39:51 minskim Exp $
-
---- git-compat-util.h.orig 2009-07-29 01:18:18.000000000 -0700
-+++ git-compat-util.h
-@@ -55,7 +55,7 @@
- # else
- # define _XOPEN_SOURCE 500
- # endif
--#elif !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__USLC__) && !defined(_M_UNIX) && !defined(sgi)
-+#elif !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__USLC__) && !defined(_M_UNIX) && !defined(sgi) && !defined(__sun)
- #define _XOPEN_SOURCE 600 /* glibc2 and AIX 5.3L need 500, OpenBSD needs 600 for S_ISLNK() */
- #ifndef __sun__
- #define _XOPEN_SOURCE_EXTENDED 1 /* AIX 5.3L needs this */
diff --git a/devel/scmgit-base/patches/patch-ag b/devel/scmgit-base/patches/patch-ag
index 5723089500b..59f451da52d 100644
--- a/devel/scmgit-base/patches/patch-ag
+++ b/devel/scmgit-base/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.6 2009/01/09 13:42:15 tonnerre Exp $
+$NetBSD: patch-ag,v 1.7 2010/01/15 10:36:41 wiz Exp $
---- templates/Makefile.orig 2008-12-20 06:54:30.000000000 +0100
+--- templates/Makefile.orig 2009-12-24 00:00:22.000000000 +0000
+++ templates/Makefile
@@ -8,7 +8,7 @@ INSTALL ?= install
TAR ?= tar
@@ -27,4 +27,4 @@ $NetBSD: patch-ag,v 1.6 2009/01/09 13:42:15 tonnerre Exp $
- $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(template_instdir_SQ)'
+ $(BSD_INSTALL_DATA_DIR) '$(DESTDIR_SQ)$(template_instdir_SQ)'
(cd blt && $(TAR) cf - .) | \
- (cd '$(DESTDIR_SQ)$(template_instdir_SQ)' && umask 022 && $(TAR) xfo -)
+ (cd '$(DESTDIR_SQ)$(template_instdir_SQ)' && umask 022 && $(TAR) xof -)
diff --git a/devel/scmgit-docs/PLIST b/devel/scmgit-docs/PLIST
index 8d9f0ceb2ec..005e144adea 100644
--- a/devel/scmgit-docs/PLIST
+++ b/devel/scmgit-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2009/07/19 01:29:33 minskim Exp $
+@comment $NetBSD: PLIST,v 1.7 2010/01/15 10:36:41 wiz Exp $
man/man1/git-add.1
man/man1/git-am.1
man/man1/git-annotate.1
@@ -49,6 +49,7 @@ man/man1/git-grep.1
man/man1/git-gui.1
man/man1/git-hash-object.1
man/man1/git-help.1
+man/man1/git-http-backend.1
man/man1/git-http-fetch.1
man/man1/git-http-push.1
man/man1/git-imap-send.1
@@ -69,12 +70,13 @@ 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-mergetool--lib.1
+man/man1/git-mergetool.1
man/man1/git-mktag.1
man/man1/git-mktree.1
man/man1/git-mv.1
man/man1/git-name-rev.1
+man/man1/git-notes.1
man/man1/git-pack-objects.1
man/man1/git-pack-redundant.1
man/man1/git-pack-refs.1
@@ -91,8 +93,10 @@ man/man1/git-rebase.1
man/man1/git-receive-pack.1
man/man1/git-reflog.1
man/man1/git-relink.1
+man/man1/git-remote-helpers.1
man/man1/git-remote.1
man/man1/git-repack.1
+man/man1/git-replace.1
man/man1/git-repo-config.1
man/man1/git-request-pull.1
man/man1/git-rerere.1
diff --git a/devel/scmgit/Makefile.common b/devel/scmgit/Makefile.common
index 2fc58993788..11036e6567f 100644
--- a/devel/scmgit/Makefile.common
+++ b/devel/scmgit/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2009/06/13 06:46:48 rillig Exp $
+# $NetBSD: Makefile.common,v 1.14 2010/01/15 10:36:41 wiz Exp $
#
# used by devel/scmgit-base/Makefile
# used by devel/scmgit-docs/Makefile
@@ -11,6 +11,7 @@ MASTER_SITES?= http://www.kernel.org/pub/software/scm/git/
MAINTAINER?= bjs@NetBSD.org
HOMEPAGE?= http://git.or.cz/
+LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/devel/scmgit/Makefile.version b/devel/scmgit/Makefile.version
index 44155fe2ab7..1352f97f5bb 100644
--- a/devel/scmgit/Makefile.version
+++ b/devel/scmgit/Makefile.version
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.version,v 1.10 2009/08/07 02:39:51 minskim Exp $
+# $NetBSD: Makefile.version,v 1.11 2010/01/15 10:36:41 wiz Exp $
#
-GIT_VERSION= 1.6.4
+GIT_VERSION= 1.6.6
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-28 06:16:53 +0000