2005-02-06 15:26:44 +00:00
|
|
|
$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:
|
2008-04-21 18:37:08 +00:00
|
|
|
cvs -n import src/contrib/netcat OPENBSD OPENBSD_<release>
|
2005-02-06 15:26:44 +00:00
|
|
|
Everything appears be Ok? Do:
|
2008-04-21 18:37:08 +00:00
|
|
|
cvs import src/contrib/netcat OPENBSD OPENBSD_<release>
|
|
|
|
|
(note: recently we import from OpenBSD's release branches
|
|
|
|
|
rather than importing -HEAD snapshots)
|
2005-02-06 15:26:44 +00:00
|
|
|
9. Resolve the conflicits with the patchset obtained in step 6.
|
|
|
|
|
|
2008-04-21 18:37:08 +00:00
|
|
|
delphij@FreeBSD.org - 21 Apr 2008
|
