Module Name:	pkgsrc
Committed By:	jlam
Date:		Wed Aug  7 05:42:23 UTC 2002

Modified Files:
	pkgsrc/security: Makefile
	pkgsrc/security/uvscan: Makefile PLIST
Added Files:
	pkgsrc/security/uvscan: DEINSTALL MESSAGE
	pkgsrc/security/uvscan/files: update_dat.sh
Removed Files:
	pkgsrc/security/uvscan-dat: DEINSTALL DESCR MESSAGE Makefile PLIST
	    distinfo
	pkgsrc/security/uvscan-dat/files: update_dat

Log Message:
Merge security/uvscan-dat into security/uvscan.  The uvscan-dat package is
out-of-date very frequently, and it's sole purpose seems to be to provide
the uvscan package with the update_dat script so that uvscan can keep
up-to-date with the latest virus definitions.

A MESSAGE file has been added to security/uvscan that recommends running
"update_dat" to update the virus definitions database to the most recent
version after installation.  The update_dat script has also been rewritten
to allow the new syntax "update -f <DATFILE>" to update from an already-
downloaded DATFILE, so users will still be able to do bulk downloads to
removable media on a machine with a fat connection and be able to compile
and install a usable uvscan package on another machine.

Bump the PKGREVISION on uvscan to 1 and mark the CONFLICT with the obsolete
uvscan-dat packages.


To generate a diff of this commit:
cvs rdiff -r1.114 -r1.115 pkgsrc/security/Makefile
cvs rdiff -r0 -r1.1 pkgsrc/security/uvscan/DEINSTALL \
    pkgsrc/security/uvscan/MESSAGE
cvs rdiff -r1.13 -r1.14 pkgsrc/security/uvscan/Makefile
cvs rdiff -r1.2 -r1.3 pkgsrc/security/uvscan/PLIST
cvs rdiff -r1.2 -r0 pkgsrc/security/uvscan-dat/DEINSTALL
cvs rdiff -r1.1 -r0 pkgsrc/security/uvscan-dat/DESCR \
    pkgsrc/security/uvscan-dat/MESSAGE pkgsrc/security/uvscan-dat/PLIST
cvs rdiff -r1.37 -r0 pkgsrc/security/uvscan-dat/Makefile
cvs rdiff -r1.24 -r0 pkgsrc/security/uvscan-dat/distinfo
cvs rdiff -r1.4 -r0 pkgsrc/security/uvscan-dat/files/update_dat
cvs rdiff -r0 -r1.1 pkgsrc/security/uvscan/files/update_dat.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.