Add support for Linux/i386. Add DIST_SUBDIR since NetBSD binary archive

contents changed without changing the filename.  Also update distinfo and
PLIST.

3 files changed, 28 insertions, 9 deletions

diff --git a/security/fprot-workstation-bin/Makefile b/security/fprot-workstation-bin/Makefile
index bdf2a44ce14..01b06a0eb34 100644
--- a/security/fprot-workstation-bin/Makefile
+++ b/security/fprot-workstation-bin/Makefile
@@ -1,22 +1,23 @@
-# $NetBSD: Makefile,v 1.8 2004/03/26 02:27:52 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2004/04/17 03:57:33 ben Exp $
 #
 
-DISTNAME=		fp-netbsd-ws-4.4.1
+DISTNAME=		#defined
 PKGNAME=		fprot-workstation-bin-4.4.1
 PKGREVISION=		1
 CATEGORIES=		security
-MASTER_SITES=		ftp://ftp.f-prot.com/pub/bsd/
 
 MAINTAINER=		ben@NetBSD.org
 HOMEPAGE=		http://www.f-prot.com/products/home_use/bsd/
 COMMENT=		F-prot antivirus for home users
 
+DIST_SUBDIR=		${PKGNAME}
+
 DEPENDS+=		p5-libwww>=5.69:../../www/p5-libwww
 DEPENDS+=		unzip-[0-9]*:../../archivers/unzip
 
 PKG_INSTALLATION_TYPES= overwrite pkgviews
 
-ONLY_FOR_PLATFORM=	NetBSD-*-i386
+ONLY_FOR_PLATFORM=	NetBSD-*-i386 Linux-*-i386
 RESTRICTED=		"Redistribution not permitted"
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
@@ -28,6 +29,18 @@ WRKSRC=			${WRKDIR}/f-prot
 NO_BUILD=		yes
 USE_BUILDLINK3=		yes
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD"
+MASTER_SITES=		ftp://ftp.f-prot.com/pub/bsd/
+DISTNAME=		fp-netbsd-ws-4.4.1
+.endif
+
+.if ${OPSYS} == "Linux"
+MASTER_SITES=		ftp://ftp.f-prot.com/pub/linux/
+DISTNAME=		fp-linux-ws-4.4.1
+.endif
+
 post-patch:
 	cd ${WRKSRC}/tools && ${MV} check-updates.pl check-updates.pl.bak
 	${SED} -e "s,/usr/local/f-prot,${PREFIX}/lib/fprot-workstation-bin,g" \
@@ -39,6 +52,11 @@ post-patch:
 		<${WRKSRC}/f-prot.sh.bak \
 		>${WRKSRC}/f-prot.sh
 
+.if ${OPSYS} == "NetBSD"
+pre-install:
+	${RM} -f ${WRKSRC}/doc_ws/norm_scan.gif
+.endif
+
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/f-prot.sh ${PREFIX}/bin/f-prot
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/check-updates.pl ${PREFIX}/sbin
diff --git a/security/fprot-workstation-bin/PLIST b/security/fprot-workstation-bin/PLIST
index 9523df2b437..3f8554c89d7 100644
--- a/security/fprot-workstation-bin/PLIST
+++ b/security/fprot-workstation-bin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/02/02 04:10:04 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/04/17 03:57:33 ben Exp $
 bin/f-prot
 lib/fprot-workstation-bin/f-prot
 lib/fprot-workstation-bin/ENGLISH.TX0
@@ -20,7 +20,6 @@ share/doc/html/fprot-workstation-bin/loc_files.html
 share/doc/html/fprot-workstation-bin/macro_scanning_options.html
 share/doc/html/fprot-workstation-bin/main_feat.html
 share/doc/html/fprot-workstation-bin/man_updt.html
-share/doc/html/fprot-workstation-bin/norm_scan.gif
 share/doc/html/fprot-workstation-bin/per_scan.html
 share/doc/html/fprot-workstation-bin/reporting_options.html
 share/doc/html/fprot-workstation-bin/scanning_options.html
diff --git a/security/fprot-workstation-bin/distinfo b/security/fprot-workstation-bin/distinfo
index b609fe2d8bf..7522c7d3fd4 100644
--- a/security/fprot-workstation-bin/distinfo
+++ b/security/fprot-workstation-bin/distinfo
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.5 2004/03/19 15:33:01 taca Exp $
+$NetBSD: distinfo,v 1.6 2004/04/17 03:57:33 ben Exp $
 
-SHA1 (fp-netbsd-ws-4.4.1.tar.gz) = 56d5d6da11afb18bcc425c0eb2bfb9894efb3bc7
-Size (fp-netbsd-ws-4.4.1.tar.gz) = 2336319 bytes
+SHA1 (fp-netbsd-ws-4.4.1.tar.gz) = d12b8a0a0a2ec59cad3b4de54787171e2a49f756
+Size (fp-netbsd-ws-4.4.1.tar.gz) = 2351843 bytes
+SHA1 (fp-linux-ws-4.4.1.tar.gz) = ffab3c76f1a46d4179747de1968017769c238b8f
+Size (fp-linux-ws-4.4.1.tar.gz) = 2463276 bytes