makoto@u  15:11:16/020226(/tmp)> tar zxf /a/j/distfiles/cvsweb-1.112.tar.gz 
makoto@u  15:11:28/020226(/tmp)> cd cvsweb/
makoto@u  15:11:31/020226(/tmp/cvsweb)> mv /a/j/tracking/cvsweb  /a/j/tracking/cvsweb-old
makoto@u  15:11:36/020226(/tmp/cvsweb)> cvs -d /a/j/tracking import -m 'cvsweb-1.112.tar.gz' cvsweb FENNER cvsweb-1.112
cvs [import aborted]: tag `cvsweb-1.112' must not contain the characters `$,.:;@'
makoto@u  15:12:19/020226(/tmp/cvsweb)> cvs -d /a/j/tracking import -m 'cvsweb-1.112.tar.gz' cvsweb FENNER cvsweb-1_112
N cvsweb/cvsweb.cgi
N cvsweb/INSTALL
N cvsweb/README
N cvsweb/TODO
N cvsweb/cvsweb.conf
cvs import: Importing /a/j/tracking/cvsweb/icons
N cvsweb/icons/back.gif
N cvsweb/icons/dir.gif
N cvsweb/icons/miniback.gif
N cvsweb/icons/minidir.gif
N cvsweb/icons/minitext.gif
N cvsweb/icons/text.gif

No conflicts created by this import

makoto@u  15:12:27/020226(/tmp/cvsweb)> patch -s < /export/pkgsrc/www/cvsweb/patches/patch-aa 
makoto@u  15:13:53/020226(/tmp/cvsweb)> cvs -d /a/j/tracking import -b 1.1.3 -m 'NetBSD/pkgsrc' cvsweb NetBSD patch-aa
C cvsweb/cvsweb.cgi
C cvsweb/INSTALL
C cvsweb/README
C cvsweb/TODO
C cvsweb/cvsweb.conf
I cvsweb/cvsweb.cgi.orig
cvs import: Importing /a/j/tracking/cvsweb/icons
C cvsweb/icons/back.gif
C cvsweb/icons/dir.gif
C cvsweb/icons/miniback.gif
C cvsweb/icons/minidir.gif
C cvsweb/icons/minitext.gif
C cvsweb/icons/text.gif

11 conflicts created by this import.
Use the following command to help the merge:

        cvs -d /a/j/tracking checkout -jNetBSD:yesterday -jNetBSD cvsweb

makoto@u  15:14:53/020226(/tmp/cvsweb)> patch -s < ~/public/diary/attach/2002/20020201-cvsweb.diff
/home/makoto/public/diary/attach/2002/20020201-cvsweb.diff: No such file or directory.
makoto@u  15:20:36/020226(/tmp/cvsweb)> patch -s < ~/public_html/diary/attach/2002/20020201-cvsweb.diff
makoto@u  15:20:50/020226(/tmp/cvsweb)> cvs -d /a/j/tracking import -b 1.1.3 -m 'NetBSD/pkgsrc' cvsweb NetBSD patch-aa
makoto@u  15:23:10/020226(/tmp/cvsweb)> cvs -d /a/j/tracking import -b 1.1.5 -m 'jcode.pl required' cvsweb JP jp-init
C cvsweb/cvsweb.cgi
C cvsweb/INSTALL
C cvsweb/README
C cvsweb/TODO
C cvsweb/cvsweb.conf
I cvsweb/cvsweb.cgi.orig
cvs import: Importing /a/j/tracking/cvsweb/icons
C cvsweb/icons/back.gif
C cvsweb/icons/dir.gif
C cvsweb/icons/miniback.gif
C cvsweb/icons/minidir.gif
C cvsweb/icons/minitext.gif
C cvsweb/icons/text.gif

11 conflicts created by this import.
Use the following command to help the merge:

        cvs -d /a/j/tracking checkout -jJP:yesterday -jJP cvsweb

makoto@u  15:24:42/020226(/tmp/cvsweb)> 
