summaryrefslogtreecommitdiff
path: root/gnu/usr.bin/patch
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/usr.bin/patch')
-rw-r--r--gnu/usr.bin/patch/EXTERN.h5
-rw-r--r--gnu/usr.bin/patch/INTERN.h5
-rw-r--r--gnu/usr.bin/patch/common.h5
-rw-r--r--gnu/usr.bin/patch/inp.c2
-rw-r--r--gnu/usr.bin/patch/inp.h5
-rw-r--r--gnu/usr.bin/patch/patch.15
-rw-r--r--gnu/usr.bin/patch/patch.c5
-rw-r--r--gnu/usr.bin/patch/pch.c8
-rw-r--r--gnu/usr.bin/patch/pch.h5
-rw-r--r--gnu/usr.bin/patch/util.h2
-rw-r--r--gnu/usr.bin/patch/version.c5
-rw-r--r--gnu/usr.bin/patch/version.h5
12 files changed, 45 insertions, 12 deletions
diff --git a/gnu/usr.bin/patch/EXTERN.h b/gnu/usr.bin/patch/EXTERN.h
index 96dd888a933d1..bde49f4be63c5 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.1.1.1 1993/06/19 14:21:52 paul Exp $
+/* $Header: /home/ncvs/src/gnu/usr.bin/patch/EXTERN.h,v 1.2 1995/05/30 05:02:26 rgrimes Exp $
*
* $Log: EXTERN.h,v $
+ * Revision 1.2 1995/05/30 05:02:26 rgrimes
+ * Remove trailing whitespace.
+ *
* Revision 1.1.1.1 1993/06/19 14:21:52 paul
* b-maked patch-2.10
*
diff --git a/gnu/usr.bin/patch/INTERN.h b/gnu/usr.bin/patch/INTERN.h
index b718b1d4cc9f0..5f3beab6236c3 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.1.1.1 1993/06/19 14:21:52 paul Exp $
+/* $Header: /home/ncvs/src/gnu/usr.bin/patch/INTERN.h,v 1.2 1995/05/30 05:02:27 rgrimes Exp $
*
* $Log: INTERN.h,v $
+ * Revision 1.2 1995/05/30 05:02:27 rgrimes
+ * Remove trailing whitespace.
+ *
* Revision 1.1.1.1 1993/06/19 14:21:52 paul
* b-maked patch-2.10
*
diff --git a/gnu/usr.bin/patch/common.h b/gnu/usr.bin/patch/common.h
index 4bb99e0248196..e58f3f2f2cb9b 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.2 1993/09/22 16:51:03 rich Exp $
+/* $Header: /home/ncvs/src/gnu/usr.bin/patch/common.h,v 1.3 1995/05/30 05:02:30 rgrimes Exp $
*
* $Log: common.h,v $
+ * Revision 1.3 1995/05/30 05:02:30 rgrimes
+ * Remove trailing whitespace.
+ *
* Revision 1.2 1993/09/22 16:51:03 rich
* Increaed the fixed static buffer sizes and maximum hunk size that
* otherwise causes the XFree86 1.3 patch set to fail.
diff --git a/gnu/usr.bin/patch/inp.c b/gnu/usr.bin/patch/inp.c
index f1a7e7932fbdd..38f768418968e 100644
--- a/gnu/usr.bin/patch/inp.c
+++ b/gnu/usr.bin/patch/inp.c
@@ -1,4 +1,4 @@
-/* $Header: /home/ncvs/src/gnu/usr.bin/patch/inp.c,v 1.3.6.1 1997/03/17 22:32:26 jmg Exp $
+/* $Header: /home/ncvs/src/gnu/usr.bin/patch/inp.c,v 1.3.6.2 1998/03/03 07:13:40 jkh Exp $
*
* Log: inp.c,v
*
diff --git a/gnu/usr.bin/patch/inp.h b/gnu/usr.bin/patch/inp.h
index ea07ee89d8a18..40999d5c897c4 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.1.1.1 1993/06/19 14:21:52 paul Exp $
+/* $Header: /home/ncvs/src/gnu/usr.bin/patch/inp.h,v 1.2 1995/05/30 05:02:33 rgrimes Exp $
*
* $Log: inp.h,v $
+ * Revision 1.2 1995/05/30 05:02:33 rgrimes
+ * Remove trailing whitespace.
+ *
* Revision 1.1.1.1 1993/06/19 14:21:52 paul
* b-maked patch-2.10
*
diff --git a/gnu/usr.bin/patch/patch.1 b/gnu/usr.bin/patch/patch.1
index a4702dcf7a125..b66d50a6a42fc 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.9 1998/01/22 07:44:03 ache Exp $
+'\" $Header: /home/ncvs/src/gnu/usr.bin/patch/patch.1,v 1.5.2.3 1998/01/22 07:45:53 ache Exp $
'\"
'\" $Log: patch.1,v $
+'\" Revision 1.5.2.3 1998/01/22 07:45:53 ache
+'\" MFC: PATCH_INDEX_FIRST environment variable
+'\"
'\" Revision 1.9 1998/01/22 07:44:03 ache
'\" Add PATCH_INDEX_FIRST environment variable to do the same as -I option
'\"
diff --git a/gnu/usr.bin/patch/patch.c b/gnu/usr.bin/patch/patch.c
index 5b824cd442715..98dc464cda155 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.14 1998/01/22 07:44:04 ache Exp $";
+ "$Header: /home/ncvs/src/gnu/usr.bin/patch/patch.c,v 1.6.6.3 1998/01/22 07:45:54 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.6.6.3 1998/01/22 07:45:54 ache
+ * MFC: PATCH_INDEX_FIRST environment variable
+ *
* Revision 1.14 1998/01/22 07:44:04 ache
* Add PATCH_INDEX_FIRST environment variable to do the same as -I option
*
diff --git a/gnu/usr.bin/patch/pch.c b/gnu/usr.bin/patch/pch.c
index 9bf2d507c9118..0372b245605d5 100644
--- a/gnu/usr.bin/patch/pch.c
+++ b/gnu/usr.bin/patch/pch.c
@@ -1,6 +1,9 @@
-/* $Header: /home/ncvs/src/gnu/usr.bin/patch/pch.c,v 1.14 1998/01/21 15:10:14 ache Exp $
+/* $Header: /home/ncvs/src/gnu/usr.bin/patch/pch.c,v 1.8.2.3 1998/01/21 19:01:54 ache Exp $
*
* $Log: pch.c,v $
+ * Revision 1.8.2.3 1998/01/21 19:01:54 ache
+ * MFC: -I, --index-first option to emulate FreeBSD hack
+ *
* 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
@@ -36,6 +39,9 @@
*
* Revision 1.8 1996/04/12 11:37:32 markm
* Attempt to break a $Log: pch.c,v $
+ * Attempt to break a Revision 1.8.2.3 1998/01/21 19:01:54 ache
+ * Attempt to break a MFC: -I, --index-first option to emulate FreeBSD hack
+ * Attempt to break a
* 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
diff --git a/gnu/usr.bin/patch/pch.h b/gnu/usr.bin/patch/pch.h
index 49670816989fd..d7f40e1d177f6 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.1.1.1 1993/06/19 14:21:52 paul Exp $
+/* $Header: /home/ncvs/src/gnu/usr.bin/patch/pch.h,v 1.2 1995/05/30 05:02:36 rgrimes Exp $
*
* $Log: pch.h,v $
+ * Revision 1.2 1995/05/30 05:02:36 rgrimes
+ * Remove trailing whitespace.
+ *
* Revision 1.1.1.1 1993/06/19 14:21:52 paul
* b-maked patch-2.10
*
diff --git a/gnu/usr.bin/patch/util.h b/gnu/usr.bin/patch/util.h
index 5bb36105d53bc..d2e17a897903c 100644
--- a/gnu/usr.bin/patch/util.h
+++ b/gnu/usr.bin/patch/util.h
@@ -1,4 +1,4 @@
-/* $Header: /home/ncvs/src/gnu/usr.bin/patch/util.h,v 1.2 1995/05/30 05:02:38 rgrimes Exp $
+/* $Header: /home/ncvs/src/gnu/usr.bin/patch/util.h,v 1.2.6.1 1997/03/17 22:32:29 jmg Exp $
*
* Log: util.h,v
* Revision 2.0 86/09/17 15:40:06 lwall
diff --git a/gnu/usr.bin/patch/version.c b/gnu/usr.bin/patch/version.c
index dfd2e9a6bb860..740b82d3404cf 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.1.1.1 1993/06/19 14:21:52 paul Exp $
+/* $Header: /home/ncvs/src/gnu/usr.bin/patch/version.c,v 1.2 1995/05/30 05:02:39 rgrimes Exp $
*
* $Log: version.c,v $
+ * Revision 1.2 1995/05/30 05:02:39 rgrimes
+ * Remove trailing whitespace.
+ *
* Revision 1.1.1.1 1993/06/19 14:21:52 paul
* b-maked patch-2.10
*
diff --git a/gnu/usr.bin/patch/version.h b/gnu/usr.bin/patch/version.h
index f59ee261e6391..5a57bc5890481 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.1.1.1 1993/06/19 14:21:52 paul Exp $
+/* $Header: /home/ncvs/src/gnu/usr.bin/patch/version.h,v 1.2 1995/05/30 05:02:40 rgrimes Exp $
*
* $Log: version.h,v $
+ * Revision 1.2 1995/05/30 05:02:40 rgrimes
+ * Remove trailing whitespace.
+ *
* Revision 1.1.1.1 1993/06/19 14:21:52 paul
* b-maked patch-2.10
*