From a58ff0abbb58d5584ab8abc249cc84647ebd2de9 Mon Sep 17 00:00:00 2001
From: Xin LI <delphij@FreeBSD.org>
Date: Sun, 6 Feb 2005 15:26:44 +0000
Subject: [PATCH] Add instructions about upgrading netcat(1).

---
 contrib/netcat/FREEBSD-Xlist   |  3 +++
 contrib/netcat/FREEBSD-upgrade | 17 +++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 contrib/netcat/FREEBSD-Xlist
 create mode 100644 contrib/netcat/FREEBSD-upgrade

diff --git a/contrib/netcat/FREEBSD-Xlist b/contrib/netcat/FREEBSD-Xlist
new file mode 100644
index 000000000000..b69f5e4de371
--- /dev/null
+++ b/contrib/netcat/FREEBSD-Xlist
@@ -0,0 +1,3 @@
+$FreeBSD$
+
+Makefile
diff --git a/contrib/netcat/FREEBSD-upgrade b/contrib/netcat/FREEBSD-upgrade
new file mode 100644
index 000000000000..5cba52bd65b2
--- /dev/null
+++ b/contrib/netcat/FREEBSD-upgrade
@@ -0,0 +1,17 @@
+$FreeBSD$
+
+1. Export from OpenBSD's nc(1) into an empty directory (say "v-nc").
+2. while read pattern; do rm ${pattern} ; done < FREEBSD-Xlist
+3. Checkout our contrib/netcat to another directory (say "f-nc"),
+   with -rOPENBSD, and usr.bin/nc to its ../../
+4. copy the files from v-nc to f-nc
+5. do cvs up -A in f-nc
+6. If there is conflicits, try to resolve them.
+7. do build in f-nc/../../usr.bin/nc
+8. If everything seems ok, do the actual import in v-nc:
+	cvs -n import src/contrib/netcat OPENBSD OPENBSD_<date>
+   Everything appears be Ok? Do:
+	cvs import src/contrib/netcat OPENBSD OPENBSD_<date>
+9. Resolve the conflicits with the patchset obtained in step 6.
+
+delphij@FreeBSD.org - 06 Feb 2005