WARNING: type
cvs -z9 import pkgsrc/sysutils/ apcupsd TNF pkgsrc-base
instead of
cvs -z9 import pkgsrc/sysutils/apcupsd TNF pkgsrc-base

and cvs will not complain about the extra arg, it will DTWT :(

I cleaned up the repository manualy (removing files and removing rev 1.1.1.2
from Makefile,v and pkg/COMMENT,v); I don't think I breaked things (cvs log,
up and diff still work ...)
In case it's needed I've backup of Makefile,v and pkg/COMMENT,v in ~bouyer
on cvs.netbsd.org ...

Sorry for the mess


On Fri, Jan 21, 2000 at 11:06:53AM -0800, Manuel BOUYER wrote:
> 
> Module Name:	pkgsrc
> Committed By:	bouyer
> Date:		Fri Jan 21 19:06:53 UTC 2000
> 
> Update of /cvsroot/pkgsrc/sysutils/
> In directory nb00:/tmp/cvs-serv8318
> 
> Log Message:
> apcupsd, a daemon to monitor and manage APC UPSes.
> 
> Status:
> 
> Vendor Tag:	apcupsd
> Release Tags:	TNF
> 		pkgsrc-base
> 		
> C pkgsrc/sysutils//Makefile
> N pkgsrc/sysutils//pkg/PLIST
> U pkgsrc/sysutils//pkg/COMMENT
> N pkgsrc/sysutils//pkg/DESCR
> N pkgsrc/sysutils//files/md5
> N pkgsrc/sysutils//patches/patch-aa
> N pkgsrc/sysutils//patches/patch-ab
> N pkgsrc/sysutils//patches/patch-ac
> N pkgsrc/sysutils//patches/patch-ad
> N pkgsrc/sysutils//patches/patch-ae
> N pkgsrc/sysutils//patches/patch-af
> N pkgsrc/sysutils//patches/patch-ag
> N pkgsrc/sysutils//patches/patch-ah
> N pkgsrc/sysutils//patches/patch-ai
> N pkgsrc/sysutils//patches/patch-aj
> 
> 1 conflicts created by this import.
> Use the following command to help the merge:
> 
> 	cvs checkout -japcupsd:yesterday -japcupsd pkgsrc/sysutils/
--
Manuel Bouyer, LIP6, Universite Paris VI.           Manuel.Bouyer@lip6.fr
     {Net,Free}BSD: 22 ans d'experience feront toujours la difference
--