release/3.2.0_cvs

12 files changed, 53 insertions, 12 deletions

diff --git a/gnu/usr.bin/patch/EXTERN.h b/gnu/usr.bin/patch/EXTERN.h
index bde49f4be63c5..a13e5842b182a 100644
--- a/gnu/usr.bin/patch/EXTERN.h
+++ b/gnu/usr.bin/patch/EXTERN.h
@@ -1,6 +1,9 @@
-/* $Header: /home/ncvs/src/gnu/usr.bin/patch/EXTERN.h,v 1.2 1995/05/30 05:02:26 rgrimes Exp $
+/* $Header: /home/ncvs/src/gnu/usr.bin/patch/EXTERN.h,v 1.4 1998/01/21 14:37:12 ache Exp $
  *
  * $Log: EXTERN.h,v $
+ * Revision 1.4  1998/01/21 14:37:12  ache
+ * Resurrect patch 2.1 without FreeBSD Index: hack
+ *
  * Revision 1.2  1995/05/30 05:02:26  rgrimes
  * Remove trailing whitespace.
  *
diff --git a/gnu/usr.bin/patch/INTERN.h b/gnu/usr.bin/patch/INTERN.h
index 5f3beab6236c3..5c5c331785298 100644
--- a/gnu/usr.bin/patch/INTERN.h
+++ b/gnu/usr.bin/patch/INTERN.h
@@ -1,6 +1,9 @@
-/* $Header: /home/ncvs/src/gnu/usr.bin/patch/INTERN.h,v 1.2 1995/05/30 05:02:27 rgrimes Exp $
+/* $Header: /home/ncvs/src/gnu/usr.bin/patch/INTERN.h,v 1.4 1998/01/21 14:37:12 ache Exp $
  *
  * $Log: INTERN.h,v $
+ * Revision 1.4  1998/01/21 14:37:12  ache
+ * Resurrect patch 2.1 without FreeBSD Index: hack
+ *
  * Revision 1.2  1995/05/30 05:02:27  rgrimes
  * Remove trailing whitespace.
  *
diff --git a/gnu/usr.bin/patch/common.h b/gnu/usr.bin/patch/common.h
index e58f3f2f2cb9b..ab0c1d3de5b1e 100644
--- a/gnu/usr.bin/patch/common.h
+++ b/gnu/usr.bin/patch/common.h
@@ -1,6 +1,9 @@
-/* $Header: /home/ncvs/src/gnu/usr.bin/patch/common.h,v 1.3 1995/05/30 05:02:30 rgrimes Exp $
+/* $Header: /home/ncvs/src/gnu/usr.bin/patch/common.h,v 1.5 1998/01/21 14:37:16 ache Exp $
  *
  * $Log: common.h,v $
+ * Revision 1.5  1998/01/21 14:37:16  ache
+ * Resurrect patch 2.1 without FreeBSD Index: hack
+ *
  * Revision 1.3  1995/05/30 05:02:30  rgrimes
  * Remove trailing whitespace.
  *
diff --git a/gnu/usr.bin/patch/inp.c b/gnu/usr.bin/patch/inp.c
index 50472cae5ebde..629ce41a60b38 100644
--- a/gnu/usr.bin/patch/inp.c
+++ b/gnu/usr.bin/patch/inp.c
@@ -1,6 +1,9 @@
-/* $Header: /home/ncvs/src/gnu/usr.bin/patch/inp.c,v 1.6 1997/10/23 02:44:21 ache Exp $
+/* $Header: /home/ncvs/src/gnu/usr.bin/patch/inp.c,v 1.8 1998/01/21 14:37:20 ache Exp $
  *
  * $Log: inp.c,v $
+ * Revision 1.8  1998/01/21 14:37:20  ache
+ * Resurrect patch 2.1 without FreeBSD Index: hack
+ *
  * Revision 1.6  1997/10/23 02:44:21  ache
  * Add (unsigned char) cast to ctype macros
  *
diff --git a/gnu/usr.bin/patch/inp.h b/gnu/usr.bin/patch/inp.h
index 40999d5c897c4..570f14be75d54 100644
--- a/gnu/usr.bin/patch/inp.h
+++ b/gnu/usr.bin/patch/inp.h
@@ -1,6 +1,9 @@
-/* $Header: /home/ncvs/src/gnu/usr.bin/patch/inp.h,v 1.2 1995/05/30 05:02:33 rgrimes Exp $
+/* $Header: /home/ncvs/src/gnu/usr.bin/patch/inp.h,v 1.4 1998/01/21 14:37:20 ache Exp $
  *
  * $Log: inp.h,v $
+ * Revision 1.4  1998/01/21 14:37:20  ache
+ * Resurrect patch 2.1 without FreeBSD Index: hack
+ *
  * Revision 1.2  1995/05/30 05:02:33  rgrimes
  * Remove trailing whitespace.
  *
diff --git a/gnu/usr.bin/patch/patch.1 b/gnu/usr.bin/patch/patch.1
index 51b3b09ce3539..a4702dcf7a125 100644
--- a/gnu/usr.bin/patch/patch.1
+++ b/gnu/usr.bin/patch/patch.1
@@ -1,8 +1,11 @@
 .\" -*- nroff -*-
 .rn '' }`
-'\" $Header: /home/ncvs/src/gnu/usr.bin/patch/patch.1,v 1.8 1998/01/21 15:10:13 ache Exp $
+'\" $Header: /home/ncvs/src/gnu/usr.bin/patch/patch.1,v 1.9 1998/01/22 07:44:03 ache Exp $
 '\" 
 '\" $Log: patch.1,v $
+'\" Revision 1.9  1998/01/22 07:44:03  ache
+'\" Add PATCH_INDEX_FIRST environment variable to do the same as -I option
+'\"
 '\" Revision 1.8  1998/01/21 15:10:13  ache
 '\" Add -I or --index-first option to take Index: precedence over context diff,
 '\" as it was in hacked FreeBSD version
diff --git a/gnu/usr.bin/patch/patch.c b/gnu/usr.bin/patch/patch.c
index e372ad356c05e..5b824cd442715 100644
--- a/gnu/usr.bin/patch/patch.c
+++ b/gnu/usr.bin/patch/patch.c
@@ -1,5 +1,5 @@
 char rcsid[] =
-	"$Header: /home/ncvs/src/gnu/usr.bin/patch/patch.c,v 1.13 1998/01/21 15:15:39 ache Exp $";
+	"$Header: /home/ncvs/src/gnu/usr.bin/patch/patch.c,v 1.14 1998/01/22 07:44:04 ache Exp $";
 
 /* patch - a program to apply diffs to original files
  *
@@ -9,6 +9,9 @@ char rcsid[] =
  * money off of it, or pretend that you wrote it.
  *
  * $Log: patch.c,v $
+ * Revision 1.14  1998/01/22 07:44:04  ache
+ * Add PATCH_INDEX_FIRST environment variable to do the same as -I option
+ *
  * Revision 1.13  1998/01/21 15:15:39  ache
  * Update usage line with new option
  *
diff --git a/gnu/usr.bin/patch/pch.c b/gnu/usr.bin/patch/pch.c
index 9021397f52ece..9bf2d507c9118 100644
--- a/gnu/usr.bin/patch/pch.c
+++ b/gnu/usr.bin/patch/pch.c
@@ -1,6 +1,10 @@
-/* $Header: /home/ncvs/src/gnu/usr.bin/patch/pch.c,v 1.13 1998/01/21 14:37:23 ache Exp $
+/* $Header: /home/ncvs/src/gnu/usr.bin/patch/pch.c,v 1.14 1998/01/21 15:10:14 ache Exp $
  *
  * $Log: pch.c,v $
+ * Revision 1.14  1998/01/21 15:10:14  ache
+ * Add -I or --index-first option to take Index: precedence over context diff,
+ * as it was in hacked FreeBSD version
+ *
  * Revision 1.13  1998/01/21 14:37:23  ache
  * Resurrect patch 2.1 without FreeBSD Index: hack
  *
@@ -32,6 +36,10 @@
  *
  * Revision 1.8  1996/04/12 11:37:32  markm
  * Attempt to break a $Log: pch.c,v $
+ * Attempt to break a Revision 1.14  1998/01/21 15:10:14  ache
+ * Attempt to break a Add -I or --index-first option to take Index: precedence over context diff,
+ * Attempt to break a as it was in hacked FreeBSD version
+ * Attempt to break a
  * Attempt to break a Revision 1.13  1998/01/21 14:37:23  ache
  * Attempt to break a Resurrect patch 2.1 without FreeBSD Index: hack
  * Attempt to break a
diff --git a/gnu/usr.bin/patch/pch.h b/gnu/usr.bin/patch/pch.h
index d7f40e1d177f6..07011e14f5a51 100644
--- a/gnu/usr.bin/patch/pch.h
+++ b/gnu/usr.bin/patch/pch.h
@@ -1,6 +1,9 @@
-/* $Header: /home/ncvs/src/gnu/usr.bin/patch/pch.h,v 1.2 1995/05/30 05:02:36 rgrimes Exp $
+/* $Header: /home/ncvs/src/gnu/usr.bin/patch/pch.h,v 1.4 1998/01/21 14:37:24 ache Exp $
  *
  * $Log: pch.h,v $
+ * Revision 1.4  1998/01/21 14:37:24  ache
+ * Resurrect patch 2.1 without FreeBSD Index: hack
+ *
  * Revision 1.2  1995/05/30 05:02:36  rgrimes
  * Remove trailing whitespace.
  *
diff --git a/gnu/usr.bin/patch/util.h b/gnu/usr.bin/patch/util.h
index 49f4246b83df8..59536fd746082 100644
--- a/gnu/usr.bin/patch/util.h
+++ b/gnu/usr.bin/patch/util.h
@@ -1,6 +1,9 @@
-/* $Header: /home/ncvs/src/gnu/usr.bin/patch/util.h,v 1.3 1997/02/13 21:10:45 jmg Exp $
+/* $Header: /home/ncvs/src/gnu/usr.bin/patch/util.h,v 1.5 1998/01/21 14:37:25 ache Exp $
  *
  * $Log: util.h,v $
+ * Revision 1.5  1998/01/21 14:37:25  ache
+ * Resurrect patch 2.1 without FreeBSD Index: hack
+ *
  * Revision 1.3  1997/02/13 21:10:45  jmg
  * Fix a problem with patch in that is will always default, even when the
  * controlling terminal is closed.  Now the function ask() will return 1 when th
diff --git a/gnu/usr.bin/patch/version.c b/gnu/usr.bin/patch/version.c
index 740b82d3404cf..b1675fef89adc 100644
--- a/gnu/usr.bin/patch/version.c
+++ b/gnu/usr.bin/patch/version.c
@@ -1,6 +1,9 @@
-/* $Header: /home/ncvs/src/gnu/usr.bin/patch/version.c,v 1.2 1995/05/30 05:02:39 rgrimes Exp $
+/* $Header: /home/ncvs/src/gnu/usr.bin/patch/version.c,v 1.4 1998/01/21 14:37:26 ache Exp $
  *
  * $Log: version.c,v $
+ * Revision 1.4  1998/01/21 14:37:26  ache
+ * Resurrect patch 2.1 without FreeBSD Index: hack
+ *
  * Revision 1.2  1995/05/30 05:02:39  rgrimes
  * Remove trailing whitespace.
  *
diff --git a/gnu/usr.bin/patch/version.h b/gnu/usr.bin/patch/version.h
index 5a57bc5890481..c3cbfd8d30d49 100644
--- a/gnu/usr.bin/patch/version.h
+++ b/gnu/usr.bin/patch/version.h
@@ -1,6 +1,9 @@
-/* $Header: /home/ncvs/src/gnu/usr.bin/patch/version.h,v 1.2 1995/05/30 05:02:40 rgrimes Exp $
+/* $Header: /home/ncvs/src/gnu/usr.bin/patch/version.h,v 1.4 1998/01/21 14:37:27 ache Exp $
  *
  * $Log: version.h,v $
+ * Revision 1.4  1998/01/21 14:37:27  ache
+ * Resurrect patch 2.1 without FreeBSD Index: hack
+ *
  * Revision 1.2  1995/05/30 05:02:40  rgrimes
  * Remove trailing whitespace.
  *