Pullup ticket 1941 - requested by taca

security update for fprot-workstation-bin

Revisions pulled up:
- pkgsrc/security/fprot-workstation-bin/Makefile		1.34, 1.35
- pkgsrc/security/fprot-workstation-bin/distinfo		1.22

   Module Name:		pkgsrc
   Committed By:	taca
   Date:		Wed Dec  6 15:27:59 UTC 2006

   Modified Files:
   	pkgsrc/security/fprot-workstation-bin: Makefile distinfo

   Log Message:
   Update F-Prot Antivirus to 4.6.7.

   F-PROT Antivirus for UNIX, version 4.6.7

   Version 4.6.7 is a bugfix release which addresses the following issues:

   o	Fixed an issue with multipart zip files that could be reported
   	as invalid or corrupt
   o	Several fixes to the scanning engine to improve handling of
   	corrupted files, mostly .chm, .cab and .rar files.
   o	Fixed a potential endless loop in corrupted .ace files in response
   	to a vulnerability report.
   o	Fixed an error in f-prot.sh that would cause the wrong part of paths to be
   	substituted. Reported by Patrick Diddens.
---
   Module Name:		pkgsrc
   Committed By:	taca
   Date:		Thu Dec  7 05:40:07 UTC 2006

   Modified Files:
   	pkgsrc/security/fprot-workstation-bin: Makefile

   Log Message:
   Correct wrong usage of PKGMANDIR.

2 files changed, 14 insertions, 15 deletions

diff --git a/security/fprot-workstation-bin/Makefile b/security/fprot-workstation-bin/Makefile
index c121fccaf35..fc3b8faf13b 100644
--- a/security/fprot-workstation-bin/Makefile
+++ b/security/fprot-workstation-bin/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2006/04/12 13:34:49 tron Exp $
+# $NetBSD: Makefile,v 1.33.4.1 2006/12/07 15:01:25 salo Exp $
 
 DISTNAME=		#defined
 PKGNAME=		fprot-workstation-bin-${FPVER}
-PKGREVISION=		2
 CATEGORIES=		security
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
@@ -27,7 +26,7 @@ WRKSRC=			${WRKDIR}/f-prot
 NO_BUILD=		yes
 USE_TOOLS+=		perl:run
 
-FPVER=			4.6.6
+FPVER=			4.6.7
 DATDIR=			${PREFIX}/share/fprot-workstation-bin
 DOCDIR=			${PREFIX}/share/doc/fprot-workstation-bin
 FPDIR=			${PREFIX}/libexec/fprot-workstation-bin
@@ -57,7 +56,7 @@ DISTNAME=		fp-solaris-sparc-ws-${FPVER}
 DEPENDS+=	netbsd32_compat16>=1.0:../../emulators/netbsd32_compat16
 .endif
 
-DIST_SUBDIR=		${DISTNAME}
+DIST_SUBDIR=		${PKGBASE}-20061204
 
 SUBST_CLASSES+=		f-prot
 SUBST_MESSAGE.f-prot=	Configuring f-prot location.
@@ -72,7 +71,7 @@ SUBST_FILES.paths=	tools/check-updates.pl
 SUBST_SED.paths=	-e "s,XXXFPDIRXXX,${FPDIR},"
 SUBST_SED.paths+=	-e "s,/usr/bin/perl,${PREFIX}/bin/perl,g"
 
-INSTALLATION_DIRS=	bin man/man1 man/man8 sbin
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man8 sbin
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/f-prot.sh ${PREFIX}/bin/f-prot
diff --git a/security/fprot-workstation-bin/distinfo b/security/fprot-workstation-bin/distinfo
index cdbbb8bb07c..8cb83a9f6e2 100644
--- a/security/fprot-workstation-bin/distinfo
+++ b/security/fprot-workstation-bin/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.21 2006/02/11 20:11:01 ben Exp $
+$NetBSD: distinfo,v 1.21.6.1 2006/12/07 15:01:25 salo Exp $
 
-SHA1 (fp-netbsd-ws-4.6.6/fp-netbsd-ws-4.6.6.tar.gz) = 5f583a8afd9a5b6eec35f1632151307de3d2e800
-RMD160 (fp-netbsd-ws-4.6.6/fp-netbsd-ws-4.6.6.tar.gz) = e5c9d81cd6993a045df05258f53eeb3e60a06af2
-Size (fp-netbsd-ws-4.6.6/fp-netbsd-ws-4.6.6.tar.gz) = 4167231 bytes
-SHA1 (fp-linux-ws-4.6.6/fp-linux-ws-4.6.6.tar.gz) = 40df2562bfa38c6dd0a58f9daf42167fe583bb25
-RMD160 (fp-linux-ws-4.6.6/fp-linux-ws-4.6.6.tar.gz) = b0ec52e7f577fa26f2545129fa180a5c405d5af5
-Size (fp-linux-ws-4.6.6/fp-linux-ws-4.6.6.tar.gz) = 4138951 bytes
-SHA1 (fp-solaris-sparc-ws-4.6.6/fp-solaris-sparc-ws-4.6.6.tar.gz) = be56592494d01c81c8c674545422ef57457f897f
-RMD160 (fp-solaris-sparc-ws-4.6.6/fp-solaris-sparc-ws-4.6.6.tar.gz) = e5bd2376424cfa1b48dbb47f1c0530bcdb66f2ed
-Size (fp-solaris-sparc-ws-4.6.6/fp-solaris-sparc-ws-4.6.6.tar.gz) = 5006272 bytes
+SHA1 (fprot-workstation-bin-20061204/fp-linux-ws-4.6.7.tar.gz) = 242832bdf1e89a6dc4f1bbb692933f5152750fd6
+RMD160 (fprot-workstation-bin-20061204/fp-linux-ws-4.6.7.tar.gz) = 8962a84f3a080ac24b8ea4b24fe3b972868471e4
+Size (fprot-workstation-bin-20061204/fp-linux-ws-4.6.7.tar.gz) = 5756587 bytes
+SHA1 (fprot-workstation-bin-20061204/fp-netbsd-ws-4.6.7.tar.gz) = 3f3563ea0b3bf737ae81fa5083939eede0a5d72d
+RMD160 (fprot-workstation-bin-20061204/fp-netbsd-ws-4.6.7.tar.gz) = 9846d02ea37caf59a1e741487cc84f066713000b
+Size (fprot-workstation-bin-20061204/fp-netbsd-ws-4.6.7.tar.gz) = 5786190 bytes
+SHA1 (fprot-workstation-bin-20061204/fp-solaris-sparc-ws-4.6.7.tar.gz) = 67988265436ff392ad6dc2ecb13860323fcc275c
+RMD160 (fprot-workstation-bin-20061204/fp-solaris-sparc-ws-4.6.7.tar.gz) = d7176f20b555e91ccbbc41a0e37ace7e2f970c79
+Size (fprot-workstation-bin-20061204/fp-solaris-sparc-ws-4.6.7.tar.gz) = 6626053 bytes
 SHA1 (patch-aa) = df60e04a2194bd9c84df08fcc524144f5e198ba0