pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/misc/git/patches Forgot to commit this last week; from...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/9f191627bf60
branches:  trunk
changeset: 507366:9f191627bf60
user:      reed <reed%pkgsrc.org@localhost>
date:      Tue Jan 31 20:29:40 2006 +0000

description:
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:

 misc/git/patches/patch-ab |  23 +++++++++++++----------
 misc/git/patches/patch-ac |  29 ++++++++++-------------------
 2 files changed, 23 insertions(+), 29 deletions(-)

diffs (66 lines):

diff -r 71b94d7bd053 -r 9f191627bf60 misc/git/patches/patch-ab
--- a/misc/git/patches/patch-ab Tue Jan 31 20:14:26 2006 +0000
+++ b/misc/git/patches/patch-ab Tue Jan 31 20:29:40 2006 +0000
@@ -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 -r 71b94d7bd053 -r 9f191627bf60 misc/git/patches/patch-ac
--- a/misc/git/patches/patch-ac Tue Jan 31 20:14:26 2006 +0000
+++ b/misc/git/patches/patch-ac Tue Jan 31 20:29:40 2006 +0000
@@ -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@
- 
- prefix                = @prefix@
--htmldir               = $(prefix)/lib/git/html
-+htmldir               = $(prefix)/share/doc/html/git
+--- 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 @@
  
- SHELL         = /bin/sh
- TEXI2HTML     = @TEXI2HTML@
-@@ -55,7 +55,7 @@ git_toc.html: $(srcdir)/../info/git.texi
- 
- install-strip: install
+ 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
  
--install: all install-only
-+install: all install-dirs install-only
- 
- install-only:
-       for i in git_*.html;\



Home | Main Index | Thread Index | Old Index