1a58ff0abSXin LI$FreeBSD$ 2a58ff0abSXin LI 3a58ff0abSXin LI1. Export from OpenBSD's nc(1) into an empty directory (say "v-nc"). 4a58ff0abSXin LI2. while read pattern; do rm ${pattern} ; done < FREEBSD-Xlist 5a58ff0abSXin LI3. Checkout our contrib/netcat to another directory (say "f-nc"), 6a58ff0abSXin LI with -rOPENBSD, and usr.bin/nc to its ../../ 7a58ff0abSXin LI4. copy the files from v-nc to f-nc 8a58ff0abSXin LI5. do cvs up -A in f-nc 9a58ff0abSXin LI6. If there is conflicits, try to resolve them. 10a58ff0abSXin LI7. do build in f-nc/../../usr.bin/nc 11a58ff0abSXin LI8. If everything seems ok, do the actual import in v-nc: 12a58ff0abSXin LI cvs -n import src/contrib/netcat OPENBSD OPENBSD_<date> 13a58ff0abSXin LI Everything appears be Ok? Do: 14a58ff0abSXin LI cvs import src/contrib/netcat OPENBSD OPENBSD_<date> 15a58ff0abSXin LI9. Resolve the conflicits with the patchset obtained in step 6. 16a58ff0abSXin LI 17a58ff0abSXin LIdelphij@FreeBSD.org - 06 Feb 2005 18