summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorsteve <steve@FreeBSD.org>1997-06-29 07:20:16 +0000
committersteve <steve@FreeBSD.org>1997-06-29 07:20:16 +0000
commit228a54d30b6f56472e54168dc4fdca762e62a270 (patch)
treea52e49e7eaa7c534e282f8d23cc3bc1fa0fb6dab /contrib
parentb78c76a781524ac6e6ad7859d082ef28ae010dae (diff)
downloadFreeBSD-src-228a54d30b6f56472e54168dc4fdca762e62a270.zip
FreeBSD-src-228a54d30b6f56472e54168dc4fdca762e62a270.tar.gz
Add a blurb on how to import newer versions of patch(1) so
that others don't make the same bone-headed mistakes that I just did. Obtained from: Peter Wemm's version of this file in contrib_cvs
Diffstat (limited to 'contrib')
-rw-r--r--contrib/patch/FREEBSD-upgrade37
1 files changed, 37 insertions, 0 deletions
diff --git a/contrib/patch/FREEBSD-upgrade b/contrib/patch/FREEBSD-upgrade
new file mode 100644
index 0000000..c2ce7e8
--- /dev/null
+++ b/contrib/patch/FREEBSD-upgrade
@@ -0,0 +1,37 @@
+This directory contains the virgin patch source on the vendor branch. Do
+not under any circumstances commit new versions onto the mainline, new
+versions or official-patch versions must be imported.
+
+To prepare a new patch dist for import, extract it into a fresh directory
+and remove the following files (and any others that are non-FreeBSD
+specific):
+
+Makefile.in
+config.hin
+configure
+configure.in
+install-sh
+mkinstalldirs
+pc/*
+
+The only other change that was made to the original tarball was to
+rename patch.man to patch.1.
+
+patch has RCS Id, Name and Header tags. It needs to be imported with -ko.
+
+It is imported from it's top level directory something like this:
+ cvs -n import -ko src/contrib/patch FSF patch_<version>
+
+The -n option is "don't do anything" so you can see what is about to happen
+first. Remove it when it looks ok.
+
+The initial import was done with:
+ cvs import -ko src/contrib/patch FSF patch_2_4
+
+When new versions are imported, cvs will give instructions on how to merge
+the local and vendor changes when/if conflicts arise..
+
+steve@freebsd.org - 29 June 1997
+
+Current local changes:
+ - Make patch(1) compile -Wall clean.
OpenPOWER on IntegriCloud