summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornetchild <netchild@FreeBSD.org>2003-12-09 17:07:26 +0000
committernetchild <netchild@FreeBSD.org>2003-12-09 17:07:26 +0000
commit9c95dc47d12433af372535f6adeffa8fea18f314 (patch)
tree0d54b28642bf17a0d52fea63bf46d6a3ac8a60b1
parentc23655dc2fcaffbcf6072510a30e42682671a43f (diff)
downloadFreeBSD-ports-9c95dc47d12433af372535f6adeffa8fea18f314.zip
FreeBSD-ports-9c95dc47d12433af372535f6adeffa8fea18f314.tar.gz
Fix some bugs in the previous commit...
- correct typo in the name of the socket variable (used to remove a stale socket) - install the startup script with the correct name (important if you use clamav-milter too) Submitted by: Marius Strobl <marius@alchemy.franken.de> Approved by: maintainer (implizit, this is a bugfix for the previous version)
-rw-r--r--security/clamav/Makefile7
-rw-r--r--security/clamav/pkg-plist2
2 files changed, 5 insertions, 4 deletions
diff --git a/security/clamav/Makefile b/security/clamav/Makefile
index fcfd0e4..c5b0a27 100644
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -7,7 +7,7 @@
PORTNAME= clamav
PORTVERSION= 0.65
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= clamav
@@ -41,7 +41,7 @@ MAN1= clamscan.1 freshclam.1 sigtool.1 clamdscan.1
MAN5= clamav.conf.5
MAN8= clamd.8 clamav-milter.8
-CLAMAV_CLAMD_SOCKE?= /var/run/clamav/clamd
+CLAMAV_CLAMD_SOCKET?= /var/run/clamav/clamd
CLAMAV_MILTER_SOCKET?= /var/run/clmilter.sock
CONFLICTS= clamav-devel-*
@@ -110,7 +110,8 @@ pre-install:
${SH} ${PKGINSTALL} ${PREFIX} PRE-INSTALL
post-install:
- @${INSTALL_SCRIPT} ${WRKDIR}/clamav-clamd.sh ${RC_DIR}/clamd${RC_SUFX}
+ @${INSTALL_SCRIPT} ${WRKDIR}/clamav-clamd.sh \
+ ${RC_DIR}/clamav-clamd${RC_SUFX}
@${CHOWN} -R clamav:clamav ${DATADIR}
@[ -f ${PREFIX}/etc/clamav.conf ] || \
${CP} ${PREFIX}/etc/clamav.conf.default ${PREFIX}/etc/clamav.conf
diff --git a/security/clamav/pkg-plist b/security/clamav/pkg-plist
index bd5aa57..a12af6b 100644
--- a/security/clamav/pkg-plist
+++ b/security/clamav/pkg-plist
@@ -14,7 +14,7 @@ lib/libclamav.a
@unexec if cmp -s %D/etc/clamav.conf %D/etc/clamav.conf.default; then rm -f %D/etc/clamav.conf; fi
etc/clamav.conf.default
@exec [ -f %B/clamav.conf ] || cp %B/%f %B/clamav.conf
-etc/rc.d/clamd%%RC_SUFX%%
+etc/rc.d/clamav-clamd%%RC_SUFX%%
@owner clamav
@group clamav
%%DATADIR%%/daily.cvd
OpenPOWER on IntegriCloud