summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorreed <reed>2006-01-31 20:29:40 +0000
committerreed <reed>2006-01-31 20:29:40 +0000
commit24a2040200076d0ae81bd98563cf7094e7bae863 (patch)
tree3daa2940d8933c92447c0126acb48e9d67ce05dc /misc
parent5778f3c2c98ee8a360068dc95b59cd559252e430 (diff)
downloadpkgsrc-24a2040200076d0ae81bd98563cf7094e7bae863.tar.gz
Forgot to commit this last week; from my update to git-4.3.20:
Update patch-ac -- for location of html document. (Now only installs one.) Update patch-ab -- to add .gitrc.cons25 (distinfo was already committed.)
Diffstat (limited to 'misc')
-rw-r--r--misc/git/patches/patch-ab23
-rw-r--r--misc/git/patches/patch-ac29
2 files changed, 23 insertions, 29 deletions
diff --git a/misc/git/patches/patch-ab b/misc/git/patches/patch-ab
index 3abfd37ac85..0ad8fe63999 100644
--- a/misc/git/patches/patch-ab
+++ b/misc/git/patches/patch-ab
@@ -1,13 +1,16 @@
-$NetBSD: patch-ab,v 1.4 1998/08/07 11:10:21 agc Exp $
+$NetBSD: patch-ab,v 1.5 2006/01/31 20:29:40 reed Exp $
---- term/Makefile.in.orig Mon Mar 16 09:16:27 1998
-+++ term/Makefile.in Mon Mar 16 09:16:46 1998
-@@ -46,7 +46,7 @@
- GIT_TERMS = .gitrc.thix .gitrc.linux .gitrc.vt100 .gitrc.vt102\
- .gitrc.xterm .gitrc.hpterm .gitrc.ansi .gitrc.generic\
- .gitrc.minix .gitrc.aixterm .gitrc.hft .gitrc.mach\
-- .gitrc.xterm-color
-+ .gitrc.xterm-color .gitrc.cons25
+--- 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@
- GIT_GENERICS = .gitrc.sun .gitrc.sun-cmd .gitrc.eterm .gitrc.pc3
+-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 = .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
diff --git a/misc/git/patches/patch-ac b/misc/git/patches/patch-ac
index a4da3795df3..43ed32010c4 100644
--- a/misc/git/patches/patch-ac
+++ b/misc/git/patches/patch-ac
@@ -1,22 +1,13 @@
-$NetBSD: patch-ac,v 1.1 2003/08/03 00:12:31 seb Exp $
+$NetBSD: patch-ac,v 1.2 2006/01/31 20:29:40 reed Exp $
---- html/Makefile.in.orig 1998-03-14 21:31:20.000000000 +0000
-+++ html/Makefile.in
-@@ -32,7 +32,7 @@ srcdir = @srcdir@
- VPATH = @srcdir@
+--- 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 @@
- prefix = @prefix@
--htmldir = $(prefix)/lib/git/html
-+htmldir = $(prefix)/share/doc/html/git
+ 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
- SHELL = /bin/sh
- TEXI2HTML = @TEXI2HTML@
-@@ -55,7 +55,7 @@ git_toc.html: $(srcdir)/../info/git.texi
-
- install-strip: install
-
--install: all install-only
-+install: all install-dirs install-only
-
- install-only:
- for i in git_*.html;\