Update F-PROT Antivirus 6.1.0:

	f-prot-antivirus6-ws-bin
	f-prot-antivirus6-fs-bin
	f-prot-antivirus6-ms-bin

pkgsrc change:

* Now binary of F-PROT Antivirus are built on NetBSD 4, previously it 2.
  And it works on not only i386 but also amd64 netbsd32 compat.

From CHANGES:

* Scan engine upgraded from 4.5.1 to 4.6.2 with improved detection rates and
  fewer false positives.
* Fixes and clarification in documentatioon.
* New switches introduced in fpscan.
* Bugfix in fpscand resolves some rare issues on OpenBSD.
* Bugfix in fpupdate resolves compatibility issues on some Linux distros.
* Bugfix in fp-milter resolves issues on BSDs.
* Bugfix in fp.so resolves some issues on multiple platforms.
* Bugfix on fpupdate for AIX resolves an rare issue.
* Minor fixes to scan-mail.pl to improve filehandling.
* Minor improvements in the installer.
* Startup scripts improved for several platforms.

6 files changed, 29 insertions, 14 deletions

diff --git a/security/f-prot-antivirus6-fs-bin/distinfo b/security/f-prot-antivirus6-fs-bin/distinfo
new file mode 100644
index 00000000000..e14b26dcbf7
--- /dev/null
+++ b/security/f-prot-antivirus6-fs-bin/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2011/09/25 14:13:48 taca Exp $
+
+SHA1 (fp-NetBSD.x86.32-fs-6.1.0.tar.gz) = cdae29097fc5cd7c4d6db4d615901c4951e26c63
+RMD160 (fp-NetBSD.x86.32-fs-6.1.0.tar.gz) = 0e1f4efdd2481a444e51134df3792b9c8a9d02f8
+Size (fp-NetBSD.x86.32-fs-6.1.0.tar.gz) = 31661490 bytes
diff --git a/security/f-prot-antivirus6-ms-bin/Makefile b/security/f-prot-antivirus6-ms-bin/Makefile
index 73f93656211..a521c6b707a 100644
--- a/security/f-prot-antivirus6-ms-bin/Makefile
+++ b/security/f-prot-antivirus6-ms-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/06/16 22:27:03 taca Exp $
+# $NetBSD: Makefile,v 1.4 2011/09/25 14:13:49 taca Exp $
 #
 DISTNAME=		${FP_DISTNAME}
 CATEGORIES=		security
@@ -31,7 +31,11 @@ SPECIAL_PERMS+=		${FPROTDIR}/scan-mail.pl ${BINOWN} ${FPROT_GROUP} 0750
 PKG_GROUP=		${FPROT_GROUP}
 PKG_USERS=		${FPROT_USER}
 
-REPLACE_PERL+=		mailtools/scan-mail.pl
+REPLACE_PERL+=		mailtools/scan-mail.pl perl/lib/Anomy/HTMLCleaner.pm \
+			perl/lib/Anomy/Log.pm perl/lib/Anomy/MIMEStream.pm \
+			perl/lib/Anomy/Sanitizer/FProt/Client.pm \
+			perl/lib/Anomy/Sanitizer/FileTypes.pm \
+			perl/lib/Anomy/Sanitizer.pm
 
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Configuring default paths.
@@ -58,7 +62,7 @@ install-ms:
 		${INSTALL_PROGRAM} fp-milter fp-qmail \
 			${DESTDIR}${PREFIX}/${FPROTDIR}
 	cd ${WRKSRC}/doc/man/; \
-		${INSTALL_MAN} scan-mail.pl.8 fp-milter.8 fp-qmail.8 \
+		${INSTALL_MAN} scan-mail.pl.8 \
 			${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
 	${FIND} ${WRKSRC}/perl -type f -exec ${CHMOD} 0444 {} \; \
 			-name '*.orig' -exec rm -f {} \;
diff --git a/security/f-prot-antivirus6-ms-bin/distinfo b/security/f-prot-antivirus6-ms-bin/distinfo
index 1d3e12d45df..9d409a61fc0 100644
--- a/security/f-prot-antivirus6-ms-bin/distinfo
+++ b/security/f-prot-antivirus6-ms-bin/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.2 2010/06/16 22:27:03 taca Exp $
+$NetBSD: distinfo,v 1.3 2011/09/25 14:13:49 taca Exp $
 
+SHA1 (fp-NetBSD.x86.32-ms-6.1.0.tar.gz) = e9d4740b7ca4ba7b3c353541942ecd260eb165fb
+RMD160 (fp-NetBSD.x86.32-ms-6.1.0.tar.gz) = 8b4a0988341a97efc766f474a50629a29bc03265
+Size (fp-NetBSD.x86.32-ms-6.1.0.tar.gz) = 32057952 bytes
 SHA1 (patch-aa) = 5a4abf9cc615dfa28b899744712e2119f52e18ce
 SHA1 (patch-ab) = cc92bda1262e0d043ba39fefded3a08731ab7d77
 SHA1 (patch-ac) = 1c5aeb2677c6015328a6e58e660405cf6fdc2350
diff --git a/security/f-prot-antivirus6-ws-bin/distinfo b/security/f-prot-antivirus6-ws-bin/distinfo
new file mode 100644
index 00000000000..38b076ac80a
--- /dev/null
+++ b/security/f-prot-antivirus6-ws-bin/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2011/09/25 14:13:49 taca Exp $
+
+SHA1 (fp-NetBSD.x86.32-ws-6.1.0.tar.gz) = 9902c9e08eb02d6c082c80977598bf5b3a6fca38
+RMD160 (fp-NetBSD.x86.32-ws-6.1.0.tar.gz) = 933d883addc8b2f179481e286353f6eb538c904d
+Size (fp-NetBSD.x86.32-ws-6.1.0.tar.gz) = 30997634 bytes
diff --git a/security/f-prot-antivirus6/Makefile.common b/security/f-prot-antivirus6/Makefile.common
index a761f6a9850..0fc859fc321 100644
--- a/security/f-prot-antivirus6/Makefile.common
+++ b/security/f-prot-antivirus6/Makefile.common
@@ -1,20 +1,20 @@
-# $NetBSD: Makefile.common,v 1.2 2010/06/16 22:27:03 taca Exp $
+# $NetBSD: Makefile.common,v 1.3 2011/09/25 14:13:48 taca Exp $
 #
 # used by security/f-prot-antivirus6-ms-bin/Makefile
 # used by security/f-prot-antivirus6-fs-bin/Makefile
 # used by security/f-prot-antivirus6-ws-bin/Makefile
 #
-ONLY_FOR_PLATFORM=	NetBSD-*-i386
+ONLY_FOR_PLATFORM=	NetBSD-*-i386 NetBSD-*-x86_64
 CONFLICTS+=		f-prot-antivirus6-{fs,ms,ws} fprot-workstation-bin-*
 
-VERSION=		6.0.3.1
+VERSION=		6.1.0
 
 # ws, ms, fs
-FP_TYPE?=	ws
-FP_ARCH?=	${MACHINE_ARCH}
+FP_TYPE?=	ms
+FP_ARCH?=	x86.32
 FP_OPSYS?=	${OPSYS}
 
-FP_DISTNAME=	fp-${FP_OPSYS}-${FP_ARCH}-${FP_TYPE}-${VERSION}
+FP_DISTNAME=	fp-${FP_OPSYS}.${FP_ARCH}-${FP_TYPE}-${VERSION}
 PKGNAME=	f-prot-antivirus6-${FP_TYPE}-bin-${VERSION}
 
 RESTRICTED=		"Commercial product"
@@ -27,7 +27,7 @@ LICENSE=		f-prot-antivirus-license
 
 WRKSRC?=		${WRKDIR}/f-prot
 NO_BUILD=		yes
-NO_CHECKSUM=		yes
+#NO_CHECKSUM=		yes
 USE_TOOLS+=		pax
 
 DATA=			antivir.def
diff --git a/security/f-prot-antivirus6/PLIST b/security/f-prot-antivirus6/PLIST
index b728d20de47..504dd53a89a 100644
--- a/security/f-prot-antivirus6/PLIST
+++ b/security/f-prot-antivirus6/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2010/06/16 22:27:03 taca Exp $
+@comment $NetBSD: PLIST,v 1.3 2011/09/25 14:13:48 taca Exp $
 bin/fpscan
 ${PLIST.scanmail}${PERL5_SUB_INSTALLVENDORLIB}/Anomy/HTMLCleaner.pm
 ${PLIST.scanmail}${PERL5_SUB_INSTALLVENDORLIB}/Anomy/Log.pm
@@ -18,8 +18,6 @@ ${FPROTDIR}/product.data
 ${PLIST.scanmail}${FPROTDIR}/scan-mail.pl
 man/man1/fpscan.1
 man/man5/f-prot.conf.5
-${PLIST.scanmail}man/man8/fp-milter.8
-${PLIST.scanmail}man/man8/fp-qmail.8
 ${PLIST.fpso}man/man8/fp.so.8
 ${PLIST.fpso}man/man8/fpmon.8
 ${PLIST.fpscand}man/man8/fpscand.8