16 files changed, 166 insertions, 154 deletions

diff --git a/MOVED b/MOVED
index 70712cafadf1..fbff513c04bf 100644
--- a/MOVED
+++ b/MOVED
@@ -4207,3 +4207,4 @@ sysutils/rsyslog-mysql||2009-11-19|Has expired: Use sysutils/rsyslog3 or sysutil
 sysutils/rsyslog-pgsql||2009-11-19|Has expired: Use sysutils/rsyslog3 or sysutils/rsyslog4 instead
 misc/kde4-l10n-ta||2009-11-19|Has expired: unfetchable and unmaintained upstream
 misc/kde4-l10n-eo||2009-11-19|Has expired: unfetchable and unmaintained upstream
+security/f-prot-sig||2009-11-20|No longer needed with security/f-prot update
diff --git a/UPDATING b/UPDATING
index 2bab2bd62953..5ef86017a526 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,19 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20091120:
+  AFFECTS: users of security/f-prot
+  AUTHOR: Tim Bishop <tdb@FreeBSD.org>
+
+  The main f-prot command is now named fpscan. Virus definitions are
+  updated using the fpupdate command. fpupdate will automatically run
+  from periodic every day. To disable set the following option in
+  /etc/periodic.conf:
+
+  fpupdate_enable="NO"
+
+  The f-prot port now only works on i386.
+
 20091118:
   AFFECTS: users of java/jboss5
   AUTHOR: Jonathan Chen <jonc@chen.org.nz>
diff --git a/security/Makefile b/security/Makefile
index 0a4b7916cd52..ebc2f14c36f1 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -116,7 +116,6 @@
     SUBDIR += execwrap
     SUBDIR += expiretable
     SUBDIR += f-prot
-    SUBDIR += f-prot-sig
     SUBDIR += f-protd
     SUBDIR += fakebo
     SUBDIR += fakeident
diff --git a/security/f-prot-sig/Makefile b/security/f-prot-sig/Makefile
deleted file mode 100644
index 805cb5237e87..000000000000
--- a/security/f-prot-sig/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# New ports collection makefile for:	f-prot-sig
-# Date created:				11 Feb 2004
-# Whom:                                 Tom McLaughlin <tmclaugh@sdf.lonestar.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	f-prot-sig
-PORTVERSION=	20071027
-CATEGORIES=	security
-MASTER_SITES=	http://updates.f-prot.com/files/
-DISTFILES=	fp-def.zip macrdef2.zip
-DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
-
-MAINTAINER=	tdb@FreeBSD.org
-COMMENT=	F-Prot Antivirus Signatures
-
-# F-Prot does not version their .DEF files so the port always pulls the latest.
-IGNOREFILES=	${DISTFILES}
-
-RESTRICTED=	Free for personal use only
-
-NO_BUILD=	YES
-NO_WRKSUBDIR=	YES
-USE_ZIP=	YES
-
-do-install:
-	${MKDIR} ${PREFIX}/f-prot
-	${INSTALL_DATA} ${WRKSRC}/* ${PREFIX}/f-prot
-
-	@${CAT} ${PKGMESSAGE} | ${SED} -e "s:%%PREFIX%%:${PREFIX}:g"
-
-.include <bsd.port.mk>
diff --git a/security/f-prot-sig/distinfo b/security/f-prot-sig/distinfo
deleted file mode 100644
index a3154d9490fe..000000000000
--- a/security/f-prot-sig/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 (f-prot-sig-20071027/fp-def.zip) = IGNORE
-SHA256 (f-prot-sig-20071027/fp-def.zip) = IGNORE
-MD5 (f-prot-sig-20071027/macrdef2.zip) = IGNORE
-SHA256 (f-prot-sig-20071027/macrdef2.zip) = IGNORE
diff --git a/security/f-prot-sig/pkg-descr b/security/f-prot-sig/pkg-descr
deleted file mode 100644
index 9d070d85461f..000000000000
--- a/security/f-prot-sig/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-F-Prot Antivirus for BSD Workstations utilizes the renowned F-Prot
-Antivirus scanning engine for primary scan but has in addition to
-that a system of internal heuristics devised to search for unknown
-viruses.
- 
-This port contains the virus signature files for use with F-Prot 
-Antivirus which can be found in ports under security/f-prot .
- 
-Please note that the license explicitly permits that F-Prot Antivirus
-for BSD Workstations is free for personal users on personal
-workstations. For any other use please consult their website for
-licensing information.
- 
-WWW: http://www.f-prot.com/virusinfo/
diff --git a/security/f-prot-sig/pkg-message b/security/f-prot-sig/pkg-message
deleted file mode 100644
index a78c7631f919..000000000000
--- a/security/f-prot-sig/pkg-message
+++ /dev/null
@@ -1,20 +0,0 @@
-***************************************************************************
-
-This is a port of the virus signature files for F-Prot Antivirus.
-You will need to install the port security/f-prot to make use of them.
-
-The port disables verifying the checksum of the distfiles due to
-their frequency of change. If you wish to verify the files yourself
-you may use the PGP signature files that have been installed in:
-
-%%PREFIX%%/f-prot/
-
-The FRISK public PGP key is located at:
-
-http://www.f-prot.com/company/KEY.ASC
-
-NOTE: The script check-updates.pl is already included with the
-f-prot port port and can be used as a secondary means of updating
-virus signature files.
-
-***************************************************************************
diff --git a/security/f-prot-sig/pkg-plist b/security/f-prot-sig/pkg-plist
deleted file mode 100644
index 201228d524c7..000000000000
--- a/security/f-prot-sig/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-f-prot/SIGN.ASC
-f-prot/SIGN.DEF
-f-prot/SIGN2.ASC
-f-prot/SIGN2.DEF
-f-prot/MACRO.DEF
-f-prot/MACRO.ASC
-@dirrmtry f-prot
diff --git a/security/f-prot/Makefile b/security/f-prot/Makefile
index b92efe2bedd9..a273bc1447b8 100644
--- a/security/f-prot/Makefile
+++ b/security/f-prot/Makefile
@@ -6,58 +6,63 @@
 #
 
 PORTNAME=	f-prot
-PORTVERSION=	4.6.8
+PORTVERSION=	6.2.1
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.i-scream.org/pub/ftp.f-prot.com/pub/bsd/ \
 		http://ftp.i-scream.org/pub/ftp.f-prot.com/pub/bsd/
-DISTNAME=	fp-freebsd-ws-${PORTVERSION}
+DISTNAME=	fp-FreeBSD-i386-ws-${PORTVERSION}
 
 MAINTAINER=	tdb@FreeBSD.org
 COMMENT=	F-Prot Antivirus for BSD Workstations
 
-RUN_DEPENDS=	${SITE_PERL}/HTTP/Request.pm:${PORTSDIR}/www/p5-libwww
-
-.ifndef(WITHOUT_SIGNATURES)
-RUN_DEPENDS+=	${LOCALBASE}/f-prot/SIGN.DEF:${PORTSDIR}/security/f-prot-sig
-.endif
-
-RESTRICTED=	Free for personal use only
-BROKEN=		This version no longer receives updates
+RESTRICTED=	Free for personal users on personal workstations only
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
-USE_PERL5=	yes
+SUB_FILES=	900.fpupdate fpscan fpupdate
 
-MAN1=		f-prot.1
+MAN1=		fpscan.1
+MAN5=		f-prot.conf.5
+MAN8=		fpupdate.8
 
-ONLY_FOR_ARCHS=	i386 amd64
+ONLY_FOR_ARCHS=	i386
 
 do-install:
-	cd ${WRKDIR} && ${TAR}	--exclude man_pages \
-				--exclude doc_ws \
-				--exclude f-prot.sh \
-				--exclude *.DEF \
-				--exclude install-f-prot.pl \
-				-cf - f-prot | ${TAR} -xf - -C ${PREFIX}
-
-	${INSTALL_SCRIPT} ${FILESDIR}/f-prot ${PREFIX}/bin/f-prot
-	${INSTALL_MAN} ${WRKSRC}/man_pages/f-prot.1 ${MANPREFIX}/man/man1/
-	${CHMOD} 755 ${PREFIX}/f-prot/tools/check-updates.pl
-
-.ifdef(WITHOUT_SIGNATURES)
-post-extract:
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "WARNING: You have chosen not to have the virus signatures installed."
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Make sure you download and update the signatures yourself, or use the"
-	@${ECHO_MSG} "check-updates.pl script provided in this port to do it for you."
-	@${ECHO_MSG} ""
-.endif
+	${MKDIR} ${PREFIX}/libexec/${PORTNAME}
+	${INSTALL_PROGRAM} ${WRKSRC}/fpscan ${PREFIX}/libexec/${PORTNAME}
+	${INSTALL_PROGRAM} ${WRKSRC}/fpupdate ${PREFIX}/libexec/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/antivir.def ${PREFIX}/libexec/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/license.key ${PREFIX}/libexec/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/product.data ${PREFIX}/libexec/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/libexec/${PORTNAME}
+
+	${INSTALL_DATA} ${WRKSRC}/f-prot.conf.default ${PREFIX}/etc/f-prot.conf.sample
+
+	${INSTALL_SCRIPT} ${WRKDIR}/fpscan ${PREFIX}/bin/fpscan
+	${INSTALL_SCRIPT} ${WRKDIR}/fpupdate ${PREFIX}/bin/fpupdate
+
+	${MKDIR} ${PREFIX}/etc/periodic/daily
+	${INSTALL_SCRIPT} ${WRKDIR}/900.fpupdate ${PREFIX}/etc/periodic/daily
+
+	${INSTALL_MAN} ${WRKSRC}/doc/man/fpscan.1 ${MANPREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/doc/man/f-prot.conf.5 ${MANPREFIX}/man/man5/
+	${INSTALL_MAN} ${WRKSRC}/doc/man/fpupdate.8 ${MANPREFIX}/man/man8/
 
 post-install:
 .ifndef(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	${CP} -Rp ${WRKSRC}/doc_ws/* ${DOCSDIR}
+	${CP} -R ${WRKSRC}/doc/html ${DOCSDIR}
+	${CP} ${WRKSRC}/doc/CHANGES ${DOCSDIR}
+	${CP} ${WRKSRC}/doc/LICENSE ${DOCSDIR}
+	${CP} ${WRKSRC}/doc/LICENSE-FPAV ${DOCSDIR}
+	${CP} ${WRKSRC}/doc/LICENSES-others ${DOCSDIR}
 .endif
+	@if [ ! -f ${PREFIX}/etc/f-prot.conf ]; then \
+		${CP} -p ${PREFIX}/etc/f-prot.conf.sample ${PREFIX}/etc/f-prot.conf ; \
+	fi
+	@if [ ! -e /etc/f-prot.conf ]; then \
+		${LN} -s ${PREFIX}/etc/f-prot.conf /etc/f-prot.conf ; \
+	fi
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/security/f-prot/distinfo b/security/f-prot/distinfo
index abcfcfaee2fd..019c460b36ab 100644
--- a/security/f-prot/distinfo
+++ b/security/f-prot/distinfo
@@ -1,3 +1,3 @@
-MD5 (fp-freebsd-ws-4.6.8.tar.gz) = caefa1a383bff94bc31c7b075f5afd86
-SHA256 (fp-freebsd-ws-4.6.8.tar.gz) = cc0fed548739ceafdb91bb7eef13fbdb61f418c18ae66205bac8b4235ec79b81
-SIZE (fp-freebsd-ws-4.6.8.tar.gz) = 7029954
+MD5 (fp-FreeBSD-i386-ws-6.2.1.tar.gz) = 4f8673ac9a146079205e04ff2b37368c
+SHA256 (fp-FreeBSD-i386-ws-6.2.1.tar.gz) = 8213d3708876a623613ac56b36f4fdc6d1bc67abd2255bfa67132d4cf3acadd1
+SIZE (fp-FreeBSD-i386-ws-6.2.1.tar.gz) = 13399985
diff --git a/security/f-prot/files/900.fpupdate.in b/security/f-prot/files/900.fpupdate.in
new file mode 100644
index 000000000000..857dd99df04c
--- /dev/null
+++ b/security/f-prot/files/900.fpupdate.in
@@ -0,0 +1,30 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# f-prot update script
+
+# If there is a global system configuration file, suck it in.
+if [ -r /etc/defaults/periodic.conf ]; then
+	. /etc/defaults/periodic.conf
+	source_periodic_confs
+fi
+
+: ${fpupdate_enable="YES"}
+
+case "$fpupdate_enable" in
+	[Yy][Ee][Ss])
+		echo -n "Updating f-prot definitions: "
+		%%PREFIX%%/bin/fpupdate >/dev/null
+		if [ $? = 0 ]; then
+			echo "done."
+			rc=0
+		else
+			echo "failed."
+			rc=3
+		fi
+		;;
+	*) rc=0;;
+esac
+
+exit $rc
diff --git a/security/f-prot/files/f-prot b/security/f-prot/files/f-prot
deleted file mode 100644
index 46919fc92bfe..000000000000
--- a/security/f-prot/files/f-prot
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/local/f-prot/f-prot ${@+"$@"}
diff --git a/security/f-prot/files/fpscan.in b/security/f-prot/files/fpscan.in
new file mode 100644
index 000000000000..29e4cded18b5
--- /dev/null
+++ b/security/f-prot/files/fpscan.in
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec %%PREFIX%%/libexec/f-prot/fpscan ${@+"$@"}
diff --git a/security/f-prot/files/fpupdate.in b/security/f-prot/files/fpupdate.in
new file mode 100644
index 000000000000..b8c4d53a63dc
--- /dev/null
+++ b/security/f-prot/files/fpupdate.in
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec %%PREFIX%%/libexec/f-prot/fpupdate --keyfile %%PREFIX%%/libexec/f-prot/license.key ${@+"$@"}
diff --git a/security/f-prot/pkg-message b/security/f-prot/pkg-message
new file mode 100644
index 000000000000..769d42b23ee9
--- /dev/null
+++ b/security/f-prot/pkg-message
@@ -0,0 +1,11 @@
+***************************************************************************
+
+F-Prot Antivirus for BSD Workstations has been installed.
+
+By default fpupdate will run daily to update F-Prot's virus
+definitions. If you do not want this behaviour please set the
+following in /etc/periodic.conf or /etc/periodic.conf.local:
+
+fpupdate_enable="NO"
+
+***************************************************************************
diff --git a/security/f-prot/pkg-plist b/security/f-prot/pkg-plist
index 684cac875fc8..96ad4856934a 100644
--- a/security/f-prot/pkg-plist
+++ b/security/f-prot/pkg-plist
@@ -1,37 +1,66 @@
-bin/f-prot
-f-prot/CHANGES
-f-prot/ENGLISH.TX0
-f-prot/LICENSE
-f-prot/LICENSE-FPAV
-f-prot/LICENSES-others
-f-prot/README
-f-prot/f-prot
-f-prot/etc/f-prot.conf.default
-f-prot/tools/check-updates.pl
-%%PORTDOCS%%%%DOCSDIR%%/add_info.html
-%%PORTDOCS%%%%DOCSDIR%%/auto_updt.html
-%%PORTDOCS%%%%DOCSDIR%%/comm_scan.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/inf_eicar.gif
-%%PORTDOCS%%%%DOCSDIR%%/info_options.html
-%%PORTDOCS%%%%DOCSDIR%%/inst_pro.html
-%%PORTDOCS%%%%DOCSDIR%%/loc_files.html
-%%PORTDOCS%%%%DOCSDIR%%/macro_scanning_options.html
-%%PORTDOCS%%%%DOCSDIR%%/main_feat.html
-%%PORTDOCS%%%%DOCSDIR%%/man_updt.html
-%%PORTDOCS%%%%DOCSDIR%%/per_scan.html
-%%PORTDOCS%%%%DOCSDIR%%/reporting_options.html
-%%PORTDOCS%%%%DOCSDIR%%/scanning_options.html
-%%PORTDOCS%%%%DOCSDIR%%/screenshot.jpg
-%%PORTDOCS%%%%DOCSDIR%%/sys_req.html
-%%PORTDOCS%%%%DOCSDIR%%/test_eicar.html
-%%PORTDOCS%%%%DOCSDIR%%/test_inst.html
-%%PORTDOCS%%%%DOCSDIR%%/updater.html
-%%PORTDOCS%%%%DOCSDIR%%/updater_req.html
-%%PORTDOCS%%%%DOCSDIR%%/updt_macro.gif
-%%PORTDOCS%%%%DOCSDIR%%/updt_sign.gif
-%%PORTDOCS%%%%DOCSDIR%%/updt_signature.gif
+bin/fpscan
+bin/fpupdate
+@unexec if [ -L /etc/f-prot.conf ]; then rm /etc/f-prot.conf; fi
+@unexec if cmp -s %D/etc/f-prot.conf.sample %D/etc/f-prot.conf; then rm -f %D/etc/f-prot.conf; fi
+etc/f-prot.conf.sample
+@exec if [ ! -f %D/etc/f-prot.conf ]; then cp -p %D/%F %B/f-prot.conf; fi
+@exec if [ ! -e /etc/f-prot.conf ]; then ln -s %D/etc/f-prot.conf /etc/f-prot.conf; fi
+etc/periodic/daily/900.fpupdate
+libexec/f-prot/README
+libexec/f-prot/antivir.def
+libexec/f-prot/fpscan
+libexec/f-prot/fpupdate
+libexec/f-prot/license.key
+libexec/f-prot/product.data
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE-FPAV
+%%PORTDOCS%%%%DOCSDIR%%/LICENSES-others
+%%PORTDOCS%%%%DOCSDIR%%/html/add_info.html
+%%PORTDOCS%%%%DOCSDIR%%/html/appendix_a.html
+%%PORTDOCS%%%%DOCSDIR%%/html/appendix_b.html
+%%PORTDOCS%%%%DOCSDIR%%/html/appendix_c.html
+%%PORTDOCS%%%%DOCSDIR%%/html/auto_updt.html
+%%PORTDOCS%%%%DOCSDIR%%/html/chmstyle.css
+%%PORTDOCS%%%%DOCSDIR%%/html/conf_scanmail_bootup.html
+%%PORTDOCS%%%%DOCSDIR%%/html/fpmon.html
+%%PORTDOCS%%%%DOCSDIR%%/html/fpmon_conf.html
+%%PORTDOCS%%%%DOCSDIR%%/html/fpmon_options.html
+%%PORTDOCS%%%%DOCSDIR%%/html/fprots.html
+%%PORTDOCS%%%%DOCSDIR%%/html/fpscan.html
+%%PORTDOCS%%%%DOCSDIR%%/html/fpscan_options.html
+%%PORTDOCS%%%%DOCSDIR%%/html/fpscand.html
+%%PORTDOCS%%%%DOCSDIR%%/html/fpscand_conf.html
+%%PORTDOCS%%%%DOCSDIR%%/html/fpscand_options.html
+%%PORTDOCS%%%%DOCSDIR%%/html/fpupdate_options.html
+%%PORTDOCS%%%%DOCSDIR%%/html/images/arrow_left.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/images/arrow_right.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/images/banner.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/images/dazuko.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/images/fpupdate.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/images/notusing_fprot_so_v6.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/images/test_eicar.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/images/using_fprot_so_v6.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/inst_pro.html
+%%PORTDOCS%%%%DOCSDIR%%/html/loc_files.html
+%%PORTDOCS%%%%DOCSDIR%%/html/loglevel.html
+%%PORTDOCS%%%%DOCSDIR%%/html/mailscanner.html
+%%PORTDOCS%%%%DOCSDIR%%/html/main_feat.html
+%%PORTDOCS%%%%DOCSDIR%%/html/man_updt.html
+%%PORTDOCS%%%%DOCSDIR%%/html/milter_scan.html
+%%PORTDOCS%%%%DOCSDIR%%/html/per_scan.html
+%%PORTDOCS%%%%DOCSDIR%%/html/postfix_scan.html
+%%PORTDOCS%%%%DOCSDIR%%/html/prot_samba.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qmail_scan.html
+%%PORTDOCS%%%%DOCSDIR%%/html/scan_with_mailscanner.html
+%%PORTDOCS%%%%DOCSDIR%%/html/sys_req.html
+%%PORTDOCS%%%%DOCSDIR%%/html/test_eicar.html
+%%PORTDOCS%%%%DOCSDIR%%/html/test_inst.html
+%%PORTDOCS%%%%DOCSDIR%%/html/updater.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm f-prot/tools
-@dirrm f-prot/etc
-@dirrmtry f-prot
+@dirrmtry libexec/f-prot
+@dirrmtry etc/periodic/daily
+@dirrmtry etc/periodic