update to 4.9.5

This commit is contained in:
christos 2010-01-18 02:23:52 +00:00
parent 537ab13a76
commit 37e148d99a
6 changed files with 109 additions and 80 deletions

View file

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.29 2006/04/05 23:01:16 jlam Exp $
DISTNAME= git-4.3.20
# $NetBSD: Makefile,v 1.30 2010/01/18 02:23:52 christos Exp $
PKGNAME= git-4.9.5
DISTNAME= gnuit-4.9.5
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_GNU:=git/}
@ -9,9 +9,10 @@ HOMEPAGE= http://hulubei.net/tudor/git/
COMMENT= GNU Interactive Tools - a file system browser for UNIX systems
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --htmldir=${PREFIX}/share/doc/gnuit
INFO_FILES= # PLIST
post-extract:
${CP} ${WRKSRC}/term/.gitrc.ansi ${WRKSRC}/term/.gitrc.cons25
${CP} ${WRKSRC}/term/gnuitrc.ansi.in ${WRKSRC}/term/gnuitrc.cons25.in
.include "../../mk/bsd.pkg.mk"

View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.8 2009/06/14 18:07:21 joerg Exp $
@comment $NetBSD: PLIST,v 1.9 2010/01/18 02:23:52 christos Exp $
bin/.gitaction
bin/git
bin/gitaction
@ -12,48 +12,48 @@ bin/gitview
bin/gitwhich
bin/gitwipe
bin/gitxgrep
info/git.info
info/gnuit.info
man/man1/git.1
man/man1/gitaction.1
man/man1/gitkeys.1
man/man1/gitmount.1
man/man1/gitrgrep.1
man/man1/gitunpack.1
share/doc/git/git.html
share/git/.gitrc.aixterm
share/git/.gitrc.ansi
share/git/.gitrc.common
share/git/.gitrc.cons25
share/git/.gitrc.console
share/git/.gitrc.dtterm
share/git/.gitrc.eterm
share/git/.gitrc.generic
share/git/.gitrc.hft
share/git/.gitrc.hp
share/git/.gitrc.hpterm
share/git/.gitrc.iris-ansi
share/git/.gitrc.iris-ansi-net
share/git/.gitrc.linux
share/git/.gitrc.mach
share/git/.gitrc.minix
share/git/.gitrc.pc3
share/git/.gitrc.rxvt
share/git/.gitrc.screen
share/git/.gitrc.sun
share/git/.gitrc.sun-cmd
share/git/.gitrc.thix
share/git/.gitrc.vt100
share/git/.gitrc.vt102
share/git/.gitrc.vt125
share/git/.gitrc.vt200
share/git/.gitrc.vt201
share/git/.gitrc.vt220
share/git/.gitrc.vt240
share/git/.gitrc.vt300
share/git/.gitrc.vt320
share/git/.gitrc.vt400
share/git/.gitrc.vt420
share/git/.gitrc.xterm
share/git/.gitrc.xterm-color
share/git/.gitrc.xterm-debian
share/git/.gitrc.xterms
share/doc/gnuit/gnuit.html
share/gnuit/gnuitrc.aixterm
share/gnuit/gnuitrc.ansi
share/gnuit/gnuitrc.common
share/gnuit/gnuitrc.cons25
share/gnuit/gnuitrc.console
share/gnuit/gnuitrc.dtterm
share/gnuit/gnuitrc.eterm
share/gnuit/gnuitrc.generic
share/gnuit/gnuitrc.hft
share/gnuit/gnuitrc.hp
share/gnuit/gnuitrc.hpterm
share/gnuit/gnuitrc.iris-ansi
share/gnuit/gnuitrc.iris-ansi-net
share/gnuit/gnuitrc.linux
share/gnuit/gnuitrc.mach
share/gnuit/gnuitrc.minix
share/gnuit/gnuitrc.pc3
share/gnuit/gnuitrc.rxvt
share/gnuit/gnuitrc.screen
share/gnuit/gnuitrc.sun
share/gnuit/gnuitrc.sun-cmd
share/gnuit/gnuitrc.thix
share/gnuit/gnuitrc.vt100
share/gnuit/gnuitrc.vt102
share/gnuit/gnuitrc.vt125
share/gnuit/gnuitrc.vt200
share/gnuit/gnuitrc.vt201
share/gnuit/gnuitrc.vt220
share/gnuit/gnuitrc.vt240
share/gnuit/gnuitrc.vt300
share/gnuit/gnuitrc.vt320
share/gnuit/gnuitrc.vt400
share/gnuit/gnuitrc.vt420
share/gnuit/gnuitrc.xterm
share/gnuit/gnuitrc.xterm-color
share/gnuit/gnuitrc.xterm-debian
share/gnuit/gnuitrc.xterms

View file

@ -1,8 +1,8 @@
$NetBSD: distinfo,v 1.5 2006/01/26 17:58:18 reed Exp $
$NetBSD: distinfo,v 1.6 2010/01/18 02:23:52 christos Exp $
SHA1 (git-4.3.20.tar.gz) = 2e761c033f3547d64f9deb72311146d683a4ad20
RMD160 (git-4.3.20.tar.gz) = 1ca2ad64a8cbf0ef368e7fdbc7d65df395029ecd
Size (git-4.3.20.tar.gz) = 426648 bytes
SHA1 (patch-ab) = fae1f8bfb38f8187ff6d3d0116428f7563041912
SHA1 (patch-ac) = e7143273cd3c7735688d03591dbba6ce0cf6df34
SHA1 (patch-ad) = 5bb1addd7738b507e41bdb4670c029a3a79c6592
SHA1 (gnuit-4.9.5.tar.gz) = 9ee138ca9dd08d3b97d066b2e4c9d2281e49bd0e
RMD160 (gnuit-4.9.5.tar.gz) = e6d5201ab82c0a7ede7f379b61e65c85ef4b5b81
Size (gnuit-4.9.5.tar.gz) = 894362 bytes
SHA1 (patch-ab) = c100730e50684d62f8d5a56d51713b0ae92db5d3
SHA1 (patch-ac) = 27d6a846f1f82394a52cfe7a62b3cf9e9c1a871f
SHA1 (patch-ad) = 46b72534415988da0c9524f09f8cd669e3e1477f

View file

@ -1,16 +1,45 @@
$NetBSD: patch-ab,v 1.5 2006/01/31 20:29:40 reed Exp $
$NetBSD: patch-ab,v 1.6 2010/01/18 02:23:52 christos Exp $
--- term/Makefile.in.orig 2006-01-26 09:20:04.000000000 -0800
+++ term/Makefile.in 2006-01-26 09:22:36.000000000 -0800
@@ -79,9 +79,9 @@
PRODUCT = @PRODUCT@
VERSION = @VERSION@
--- term/Makefile.in.orig 2009-02-17 21:31:26.000000000 -0500
+++ term/Makefile.in 2010-01-09 17:20:37.000000000 -0500
@@ -105,7 +105,7 @@
CONFIG_CLEAN_FILES = gnuitrc.aixterm gnuitrc.ansi gnuitrc.generic \
gnuitrc.hft gnuitrc.hpterm gnuitrc.linux gnuitrc.linux-m \
gnuitrc.mach gnuitrc.minix gnuitrc.thix gnuitrc.vt100 \
- gnuitrc.vt102 gnuitrc.xterm gnuitrc.xterm-color
+ gnuitrc.vt102 gnuitrc.xterm gnuitrc.xterm-color gnuitrc.cons25
SOURCES =
DIST_SOURCES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -545,18 +545,19 @@
EXTRA_DIST = gnuitrc.aixterm.in gnuitrc.ansi.in gnuitrc.common.IN\
gnuitrc.generic.in gnuitrc.hft.in gnuitrc.hpterm.in gnuitrc.linux.in\
gnuitrc.mach.in gnuitrc.minix.in gnuitrc.thix.in gnuitrc.vt100.in\
- gnuitrc.vt102.in gnuitrc.xterm.in gnuitrc.xterm-color.in gnuitrc.linux-m.in
+ gnuitrc.vt102.in gnuitrc.xterm.in gnuitrc.xterm-color.in gnuitrc.linux-m.in gnuitrc.cons25.in
-EXTRA_DIST = .gitrc.aixterm .gitrc.ansi .gitrc.common.in .gitrc.generic .gitrc.hft .gitrc.hpterm .gitrc.linux .gitrc.mach .gitrc.minix .gitrc.thix .gitrc.vt100 .gitrc.vt102 .gitrc.xterm .gitrc.xterm-color
+EXTRA_DIST = .gitrc.aixterm .gitrc.ansi .gitrc.common.in .gitrc.generic .gitrc.hft .gitrc.hpterm .gitrc.linux .gitrc.mach .gitrc.minix .gitrc.thix .gitrc.vt100 .gitrc.vt102 .gitrc.xterm .gitrc.xterm-color .gitrc.cons25
pkgdata_DATA = gnuitrc.aixterm gnuitrc.ansi gnuitrc.common\
gnuitrc.generic gnuitrc.hft gnuitrc.hpterm gnuitrc.linux\
gnuitrc.mach gnuitrc.minix gnuitrc.thix gnuitrc.vt100\
- gnuitrc.vt102 gnuitrc.xterm gnuitrc.xterm-color gnuitrc.linux-m
+ gnuitrc.vt102 gnuitrc.xterm gnuitrc.xterm-color gnuitrc.linux-m\
+ gnuitrc.cons25
-pkgdata_DATA = .gitrc.aixterm .gitrc.ansi .gitrc.common .gitrc.generic .gitrc.hft .gitrc.hpterm .gitrc.linux .gitrc.mach .gitrc.minix .gitrc.thix .gitrc.vt100 .gitrc.vt102 .gitrc.xterm .gitrc.xterm-color
+pkgdata_DATA = .gitrc.aixterm .gitrc.ansi .gitrc.common .gitrc.generic .gitrc.hft .gitrc.hpterm .gitrc.linux .gitrc.mach .gitrc.minix .gitrc.thix .gitrc.vt100 .gitrc.vt102 .gitrc.xterm .gitrc.xterm-color .gitrc.cons25
GIT_GENERICS = .gitrc.sun .gitrc.sun-cmd .gitrc.eterm .gitrc.pc3
GIT_GENERICS = gnuitrc.sun gnuitrc.sun-cmd gnuitrc.eterm gnuitrc.pc3
GIT_XTERMS = gnuitrc.xterms
GIT_ANSIS = gnuitrc.iris-ansi gnuitrc.iris-ansi-net gnuitrc.cygwin
GIT_COLOR_XTERMS = gnuitrc.dtterm gnuitrc.rxvt gnuitrc.xterm-debian gnuitrc.Eterm gnuitrc.rxvt-unicode
-GIT_LINUXS = gnuitrc.console
+GIT_LINUXS = gnuitrc.console gnuitrc.cons25
GIT_HPTERMS = gnuitrc.hp
GIT_VT100S = gnuitrc.vt125 gnuitrc.vt200 gnuitrc.vt201 gnuitrc.vt220\
gnuitrc.vt240 gnuitrc.vt300 gnuitrc.vt320 gnuitrc.vt400\
@@ -596,6 +597,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
gnuitrc.aixterm: $(top_builddir)/config.status $(srcdir)/gnuitrc.aixterm.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+gnuitrc.cons25: $(top_builddir)/config.status $(srcdir)/gnuitrc.cons25.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
gnuitrc.ansi: $(top_builddir)/config.status $(srcdir)/gnuitrc.ansi.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
gnuitrc.generic: $(top_builddir)/config.status $(srcdir)/gnuitrc.generic.in

View file

@ -1,13 +1,12 @@
$NetBSD: patch-ac,v 1.2 2006/01/31 20:29:40 reed Exp $
$NetBSD: patch-ac,v 1.3 2010/01/18 02:23:52 christos Exp $
--- doc/Makefile.in.orig 2006-01-26 09:24:53.000000000 -0800
+++ doc/Makefile.in 2006-01-26 09:25:44.000000000 -0800
@@ -81,7 +81,7 @@
info_TEXINFOS = git.texinfo
man_MANS = git.1 gitaction.1 gitkeys.1 gitmount.1 gitrgrep.1 gitunpack.1
-htmldir = $(prefix)/doc/git-$(VERSION)
+htmldir = $(prefix)/share/doc/git
html_DATA = git.html
EXTRA_DIST = git.1 gitaction.1 gitkeys.1 gitmount.1 gitrgrep.1 gitunpack.1 git.html
--- configure.orig 2010-01-09 17:34:34.000000000 -0500
+++ configure 2010-01-09 17:37:54.000000000 -0500
@@ -31259,6 +31259,7 @@
"term/gnuitrc.vt100") CONFIG_FILES="$CONFIG_FILES term/gnuitrc.vt100" ;;
"term/gnuitrc.vt102") CONFIG_FILES="$CONFIG_FILES term/gnuitrc.vt102" ;;
"term/gnuitrc.xterm") CONFIG_FILES="$CONFIG_FILES term/gnuitrc.xterm" ;;
+ "term/gnuitrc.cons25") CONFIG_FILES="$CONFIG_FILES term/gnuitrc.cons25" ;;
"term/gnuitrc.xterm-color") CONFIG_FILES="$CONFIG_FILES term/gnuitrc.xterm-color" ;;
"doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
"lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;

View file

@ -1,8 +1,8 @@
$NetBSD: patch-ad,v 1.1 2006/01/26 17:58:18 reed Exp $
$NetBSD: patch-ad,v 1.2 2010/01/18 02:23:52 christos Exp $
--- term/.gitrc.cons25.orig 2006-01-26 09:32:11.000000000 -0800
+++ term/.gitrc.cons25 2006-01-26 09:33:17.000000000 -0800
@@ -24,7 +24,7 @@
--- term/gnuitrc.cons25.in.orig 2010-01-08 23:43:40.000000000 -0500
+++ term/gnuitrc.cons25.in 2010-01-09 17:27:03.000000000 -0500
@@ -38,7 +38,7 @@
[Setup]
AnsiColors = ON # empty means OFF