pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/security/fprot-workstation-bin * Convert security/fpro...
details: https://anonhg.NetBSD.org/pkgsrc/rev/281b91a7a81f
branches: trunk
changeset: 532505:281b91a7a81f
user: jlam <jlam%pkgsrc.org@localhost>
date: Tue Aug 21 23:14:45 2007 +0000
description:
* Convert security/fprot-workstation-bin to use the emulator framework.
* Remove unncessary dependency on netbsd32_compat16 on NetBSD/amd64.
This package installs statically linked binaries, so there is no
need for any shared libraries or ld.elf_so to run fprot.
* Stop pretending to support non-NetBSD platforms -- the build and
install targets bear no relation to the extracted distfiles on Linux
or Solaris. Support will be re-added in the fullness of time.
diffstat:
security/fprot-workstation-bin/Makefile | 94 +++------
security/fprot-workstation-bin/Makefile.netbsd-i386 | 44 ++++
security/fprot-workstation-bin/PLIST | 40 ----
security/fprot-workstation-bin/PLIST.netbsd-i386 | 40 ++++
security/fprot-workstation-bin/distinfo | 7 +-
security/fprot-workstation-bin/patches/emul-netbsd-i386-patch-aa | 60 ++++++
security/fprot-workstation-bin/patches/patch-aa | 60 ------
7 files changed, 179 insertions(+), 166 deletions(-)
diffs (truncated from 409 to 300 lines):
diff -r d289494533c0 -r 281b91a7a81f security/fprot-workstation-bin/Makefile
--- a/security/fprot-workstation-bin/Makefile Tue Aug 21 22:49:02 2007 +0000
+++ b/security/fprot-workstation-bin/Makefile Tue Aug 21 23:14:45 2007 +0000
@@ -1,90 +1,56 @@
-# $NetBSD: Makefile,v 1.38 2007/08/07 21:42:55 taca Exp $
+# $NetBSD: Makefile,v 1.39 2007/08/21 23:14:45 jlam Exp $
-DISTNAME= #defined
+DISTNAME= fprot-workstation-bin # overridden below
PKGNAME= fprot-workstation-bin-${FPVER}
CATEGORIES= security
+MASTER_SITES= # empty
+DIST_SUBDIR= ${PKGBASE}-20070806
+FPVER= 4.6.8
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://www.f-prot.com/products/home_use/bsd/
+HOMEPAGE= http://www.f-prot.com/products/home_use/
COMMENT= F-prot antivirus for home users
-DEPENDS+= p5-libwww>=5.69:../../www/p5-libwww
-DEPENDS+= unzip-[0-9]*:../../archivers/unzip
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-[2-9]*-x86_64 \
- Linux-*-i386 SunOS-*-sparc
+LICENSE= fprot-workstation-license
RESTRICTED= Redistribution not permitted
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
NO_SRC_ON_FTP= ${RESTRICTED}
-LICENSE= fprot-workstation-license
-WRKSRC= ${WRKDIR}/f-prot
-NO_BUILD= yes
-USE_TOOLS+= perl:run
+DEPENDS+= p5-libwww>=5.69:../../www/p5-libwww
+
+USE_TOOLS+= perl:run unzip:run
-FPVER= 4.6.8
-DATDIR= ${PREFIX}/share/fprot-workstation-bin
-DOCDIR= ${PREFIX}/share/doc/fprot-workstation-bin
-FPDIR= ${PREFIX}/libexec/fprot-workstation-bin
-CONF_FILES= ${DATDIR}/MACRO.DEF ${FPDIR}/MACRO.DEF
-CONF_FILES+= ${DATDIR}/SIGN.DEF ${FPDIR}/SIGN.DEF
-CONF_FILES+= ${DATDIR}/SIGN2.DEF ${FPDIR}/SIGN2.DEF
-REQD_DIRS+= ${FPDIR}
+PKG_INSTALLATION_TYPES= overwrite pkgviews
+
+#EMUL_PLATFORMS+= linux-i386
+EMUL_PLATFORMS+= netbsd-i386
+#EMUL_PLATFORMS+= solaris-i386
+#EMUL_PLATFORMS+= solaris-sparc
+EMUL_MODULES.linux= base
.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "NetBSD"
-MASTER_SITES= http://files.f-prot.com/files/bsd-x86/
-DISTNAME= fp-netbsd-ws
-.endif
-
-.if ${OPSYS} == "Linux"
+# This following section should be split out into Makefile.${EMUL_PLATFORM}
+# files and the appropriate build and installation code added.
+#
+.if ${EMUL_PLATFORM} == "linux-i386"
MASTER_SITES= http://files.f-prot.com/files/linux-x86/
DISTNAME= fp-linux-ws
-.endif
-
-.if ${OPSYS} == "SunOS"
+.elif ${EMUL_PLATFORM} == "solaris-i386"
+MASTER_SITES= http://files.f-prot.com/files/solaris-i386/
+DISTNAME= fp-solaris-i386-ws
+.elif ${EMUL_PLATFORM} == "solaris-sparc"
MASTER_SITES= http://files.f-prot.com/files/solaris-sparc/
DISTNAME= fp-solaris-sparc-ws
.endif
-.if (${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "x86_64")
-DEPENDS+= netbsd32_compat16>=1.0:../../emulators/netbsd32_compat16
+.if exists(Makefile.${EMUL_PLATFORM})
+. include "Makefile.${EMUL_PLATFORM}"
+.else
+NO_BUILD= yes
+do-install: # nothing
.endif
-DIST_SUBDIR= ${PKGBASE}-20070806
-
-SUBST_CLASSES+= f-prot
-SUBST_MESSAGE.f-prot= Configuring f-prot location.
-SUBST_STAGE.f-prot= post-patch
-SUBST_FILES.f-prot= f-prot.sh
-SUBST_SED.f-prot= -e "s,^exec \`.*\`,exec ${FPDIR}/f-prot,g"
-
-SUBST_CLASSES+= paths
-SUBST_MESSAGE.paths= Configuring default paths.
-SUBST_STAGE.paths= post-patch
-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 ${PKGMANDIR}/man1 ${PKGMANDIR}/man8 sbin
-
-do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/f-prot.sh ${PREFIX}/bin/f-prot
- ${INSTALL_SCRIPT} ${WRKSRC}/tools/check-updates.pl ${PREFIX}/sbin
- ${INSTALL_MAN} ${WRKSRC}/man_pages/check-updates.pl.8 ${PREFIX}/${PKGMANDIR}/man8
- ${INSTALL_MAN} ${WRKSRC}/man_pages/f-prot.1 ${PREFIX}/${PKGMANDIR}/man1
- ${INSTALL_DATA_DIR} ${DATDIR}
- ${INSTALL_DATA} ${WRKSRC}/*.DEF ${DATDIR}
- ${INSTALL_DATA_DIR} ${DOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/LICENSE* ${WRKSRC}/README ${WRKSRC}/CHANGES \
- ${WRKSRC}/doc_ws/* ${DOCDIR}
- ${INSTALL_PROGRAM_DIR} ${FPDIR}
- ${INSTALL_DATA} ${WRKSRC}/ENGLISH.TX0 ${FPDIR}
- ${INSTALL_PROGRAM} ${WRKSRC}/f-prot ${FPDIR}
-
.include "../../mk/bsd.pkg.mk"
diff -r d289494533c0 -r 281b91a7a81f security/fprot-workstation-bin/Makefile.netbsd-i386
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/fprot-workstation-bin/Makefile.netbsd-i386 Tue Aug 21 23:14:45 2007 +0000
@@ -0,0 +1,44 @@
+# $NetBSD: Makefile.netbsd-i386,v 1.1 2007/08/21 23:14:46 jlam Exp $
+
+MASTER_SITES= http://files.f-prot.com/files/bsd-x86/
+DISTNAME= fp-netbsd-ws
+
+WRKSRC= ${WRKDIR}/f-prot
+BUILD_DIRS= # empty
+
+DATDIR= ${PREFIX}/share/fprot-workstation-bin
+DOCDIR= ${PREFIX}/share/doc/fprot-workstation-bin
+FPDIR= ${PREFIX}/libexec/fprot-workstation-bin
+CONF_FILES= ${DATDIR}/MACRO.DEF ${FPDIR}/MACRO.DEF
+CONF_FILES+= ${DATDIR}/SIGN.DEF ${FPDIR}/SIGN.DEF
+CONF_FILES+= ${DATDIR}/SIGN2.DEF ${FPDIR}/SIGN2.DEF
+REQD_DIRS+= ${FPDIR}
+
+SUBST_CLASSES+= f-prot
+SUBST_MESSAGE.f-prot= Configuring f-prot location.
+SUBST_STAGE.f-prot= post-patch
+SUBST_FILES.f-prot= f-prot.sh
+SUBST_SED.f-prot= -e "s,^exec \`.*\`,exec ${FPDIR}/f-prot,g"
+
+SUBST_CLASSES+= paths
+SUBST_MESSAGE.paths= Configuring default paths.
+SUBST_STAGE.paths= post-patch
+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 ${PKGMANDIR}/man1 ${PKGMANDIR}/man8 sbin
+
+do-install:
+ ${INSTALL_SCRIPT} ${WRKSRC}/f-prot.sh ${PREFIX}/bin/f-prot
+ ${INSTALL_SCRIPT} ${WRKSRC}/tools/check-updates.pl ${PREFIX}/sbin
+ ${INSTALL_MAN} ${WRKSRC}/man_pages/check-updates.pl.8 ${PREFIX}/${PKGMANDIR}/man8
+ ${INSTALL_MAN} ${WRKSRC}/man_pages/f-prot.1 ${PREFIX}/${PKGMANDIR}/man1
+ ${INSTALL_DATA_DIR} ${DATDIR}
+ ${INSTALL_DATA} ${WRKSRC}/*.DEF ${DATDIR}
+ ${INSTALL_DATA_DIR} ${DOCDIR}
+ ${INSTALL_DATA} ${WRKSRC}/LICENSE* ${WRKSRC}/README ${WRKSRC}/CHANGES \
+ ${WRKSRC}/doc_ws/* ${DOCDIR}
+ ${INSTALL_PROGRAM_DIR} ${FPDIR}
+ ${INSTALL_DATA} ${WRKSRC}/ENGLISH.TX0 ${FPDIR}
+ ${INSTALL_PROGRAM} ${WRKSRC}/f-prot ${FPDIR}
diff -r d289494533c0 -r 281b91a7a81f security/fprot-workstation-bin/PLIST
--- a/security/fprot-workstation-bin/PLIST Tue Aug 21 22:49:02 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-@comment $NetBSD: PLIST,v 1.7 2005/11/21 02:06:50 ben Exp $
-bin/f-prot
-libexec/fprot-workstation-bin/ENGLISH.TX0
-libexec/fprot-workstation-bin/f-prot
-man/man1/f-prot.1
-man/man8/check-updates.pl.8
-sbin/check-updates.pl
-share/doc/fprot-workstation-bin/CHANGES
-share/doc/fprot-workstation-bin/LICENSE
-share/doc/fprot-workstation-bin/LICENSE-FPAV
-share/doc/fprot-workstation-bin/LICENSES-others
-share/doc/fprot-workstation-bin/README
-share/doc/fprot-workstation-bin/add_info.html
-share/doc/fprot-workstation-bin/auto_updt.html
-share/doc/fprot-workstation-bin/comm_scan.html
-share/doc/fprot-workstation-bin/index.html
-share/doc/fprot-workstation-bin/inf_eicar.gif
-share/doc/fprot-workstation-bin/info_options.html
-share/doc/fprot-workstation-bin/inst_pro.html
-share/doc/fprot-workstation-bin/loc_files.html
-share/doc/fprot-workstation-bin/macro_scanning_options.html
-share/doc/fprot-workstation-bin/main_feat.html
-share/doc/fprot-workstation-bin/man_updt.html
-share/doc/fprot-workstation-bin/per_scan.html
-share/doc/fprot-workstation-bin/reporting_options.html
-share/doc/fprot-workstation-bin/scanning_options.html
-share/doc/fprot-workstation-bin/screenshot.jpg
-share/doc/fprot-workstation-bin/sys_req.html
-share/doc/fprot-workstation-bin/test_eicar.html
-share/doc/fprot-workstation-bin/test_inst.html
-share/doc/fprot-workstation-bin/updater.html
-share/doc/fprot-workstation-bin/updater_req.html
-share/doc/fprot-workstation-bin/updt_macro.gif
-share/doc/fprot-workstation-bin/updt_sign.gif
-share/doc/fprot-workstation-bin/updt_signature.gif
-share/fprot-workstation-bin/MACRO.DEF
-share/fprot-workstation-bin/SIGN.DEF
-share/fprot-workstation-bin/SIGN2.DEF
-@dirrm share/doc/fprot-workstation-bin
-@dirrm share/fprot-workstation-bin
diff -r d289494533c0 -r 281b91a7a81f security/fprot-workstation-bin/PLIST.netbsd-i386
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/fprot-workstation-bin/PLIST.netbsd-i386 Tue Aug 21 23:14:45 2007 +0000
@@ -0,0 +1,40 @@
+@comment $NetBSD: PLIST.netbsd-i386,v 1.1 2007/08/21 23:14:46 jlam Exp $
+bin/f-prot
+libexec/fprot-workstation-bin/ENGLISH.TX0
+libexec/fprot-workstation-bin/f-prot
+man/man1/f-prot.1
+man/man8/check-updates.pl.8
+sbin/check-updates.pl
+share/doc/fprot-workstation-bin/CHANGES
+share/doc/fprot-workstation-bin/LICENSE
+share/doc/fprot-workstation-bin/LICENSE-FPAV
+share/doc/fprot-workstation-bin/LICENSES-others
+share/doc/fprot-workstation-bin/README
+share/doc/fprot-workstation-bin/add_info.html
+share/doc/fprot-workstation-bin/auto_updt.html
+share/doc/fprot-workstation-bin/comm_scan.html
+share/doc/fprot-workstation-bin/index.html
+share/doc/fprot-workstation-bin/inf_eicar.gif
+share/doc/fprot-workstation-bin/info_options.html
+share/doc/fprot-workstation-bin/inst_pro.html
+share/doc/fprot-workstation-bin/loc_files.html
+share/doc/fprot-workstation-bin/macro_scanning_options.html
+share/doc/fprot-workstation-bin/main_feat.html
+share/doc/fprot-workstation-bin/man_updt.html
+share/doc/fprot-workstation-bin/per_scan.html
+share/doc/fprot-workstation-bin/reporting_options.html
+share/doc/fprot-workstation-bin/scanning_options.html
+share/doc/fprot-workstation-bin/screenshot.jpg
+share/doc/fprot-workstation-bin/sys_req.html
+share/doc/fprot-workstation-bin/test_eicar.html
+share/doc/fprot-workstation-bin/test_inst.html
+share/doc/fprot-workstation-bin/updater.html
+share/doc/fprot-workstation-bin/updater_req.html
+share/doc/fprot-workstation-bin/updt_macro.gif
+share/doc/fprot-workstation-bin/updt_sign.gif
+share/doc/fprot-workstation-bin/updt_signature.gif
+share/fprot-workstation-bin/MACRO.DEF
+share/fprot-workstation-bin/SIGN.DEF
+share/fprot-workstation-bin/SIGN2.DEF
+@dirrm share/doc/fprot-workstation-bin
+@dirrm share/fprot-workstation-bin
diff -r d289494533c0 -r 281b91a7a81f security/fprot-workstation-bin/distinfo
--- a/security/fprot-workstation-bin/distinfo Tue Aug 21 22:49:02 2007 +0000
+++ b/security/fprot-workstation-bin/distinfo Tue Aug 21 23:14:45 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2007/08/07 21:42:55 taca Exp $
+$NetBSD: distinfo,v 1.24 2007/08/21 23:14:46 jlam Exp $
SHA1 (fprot-workstation-bin-20070806/fp-linux-ws.tar.gz) = 41569c2ab9dee920af1647c1d3d49d6140688d1b
RMD160 (fprot-workstation-bin-20070806/fp-linux-ws.tar.gz) = 79a97f353cd957712b5aeffd4ef3b08b91deca1f
@@ -6,7 +6,10 @@
SHA1 (fprot-workstation-bin-20070806/fp-netbsd-ws.tar.gz) = 6825b89ed16c08ae1058a63ca3541803d487b370
RMD160 (fprot-workstation-bin-20070806/fp-netbsd-ws.tar.gz) = fc84d14dc87d56a704a6a16f9f31de6291bfe27a
Size (fprot-workstation-bin-20070806/fp-netbsd-ws.tar.gz) = 7027984 bytes
+SHA1 (fprot-workstation-bin-20070806/fp-solaris-i386-ws.tar.gz) = 392725cdf4cbfc16824e16ff316f0c7aa39a8bb8
+RMD160 (fprot-workstation-bin-20070806/fp-solaris-i386-ws.tar.gz) = 69a347c5adee8909de4a70f8f3eda8792bbe401f
+Size (fprot-workstation-bin-20070806/fp-solaris-i386-ws.tar.gz) = 7043022 bytes
SHA1 (fprot-workstation-bin-20070806/fp-solaris-sparc-ws.tar.gz) = 470a55ce9724e46b58a0615bbf233219f85dee27
RMD160 (fprot-workstation-bin-20070806/fp-solaris-sparc-ws.tar.gz) = 91c40d36e7e592b49c645d711f95fc9218f2622b
Size (fprot-workstation-bin-20070806/fp-solaris-sparc-ws.tar.gz) = 7869673 bytes
-SHA1 (patch-aa) = df60e04a2194bd9c84df08fcc524144f5e198ba0
+SHA1 (emul-netbsd-i386-patch-aa) = df60e04a2194bd9c84df08fcc524144f5e198ba0
diff -r d289494533c0 -r 281b91a7a81f security/fprot-workstation-bin/patches/emul-netbsd-i386-patch-aa
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/fprot-workstation-bin/patches/emul-netbsd-i386-patch-aa Tue Aug 21 23:14:45 2007 +0000
@@ -0,0 +1,60 @@
+$NetBSD: emul-netbsd-i386-patch-aa,v 1.1 2007/08/21 23:14:46 jlam Exp $
+
+--- tools/check-updates.pl.orig 2006-01-05 11:55:12.000000000 +0000
++++ tools/check-updates.pl
+@@ -158,6 +158,8 @@ sub findDEFDirectory {
+ return $dir;
+ }
+
++ return qq(XXXFPDIRXXX/);
++
+ # Try FindBin
+ eval 'use FindBin qw($Bin); $dir = $Bin if $Bin;';
+ unless ($@){
+@@ -353,12 +355,14 @@ sub printHelp {
+ # A sub function which checks if the temporary directory you are using
Home |
Main Index |
Thread Index |
Old Index