diff options
author | niels <niels@FreeBSD.org> | 2005-01-12 15:09:51 +0000 |
---|---|---|
committer | niels <niels@FreeBSD.org> | 2005-01-12 15:09:51 +0000 |
commit | da5406ef2ea3f30dc29fd43c1c40b8433b3992f9 (patch) | |
tree | 2fabfc5a80dd5a566554370dbfb570bdc3315c83 /security/clamav-devel | |
parent | 46f441b47df0d617975c678108926eabbf19ea46 (diff) | |
download | FreeBSD-ports-da5406ef2ea3f30dc29fd43c1c40b8433b3992f9.zip FreeBSD-ports-da5406ef2ea3f30dc29fd43c1c40b8433b3992f9.tar.gz |
Unbreak security/clamav-devel by updating it to 20050110 (maintainer update)
PR: ports/76086
Submitted by: maintainer
Approved by: nectar (mentor)
Diffstat (limited to 'security/clamav-devel')
-rw-r--r-- | security/clamav-devel/Makefile | 14 | ||||
-rw-r--r-- | security/clamav-devel/distinfo | 4 | ||||
-rw-r--r-- | security/clamav-devel/files/patch-configure.in | 13 | ||||
-rw-r--r-- | security/clamav-devel/pkg-plist | 7 |
4 files changed, 16 insertions, 22 deletions
diff --git a/security/clamav-devel/Makefile b/security/clamav-devel/Makefile index 16e02bea..465606c 100644 --- a/security/clamav-devel/Makefile +++ b/security/clamav-devel/Makefile @@ -6,8 +6,7 @@ # PORTNAME= clamav -PORTVERSION= 20041213 -PORTREVISION= 1 +PORTVERSION= 20050110 CATEGORIES= security MASTER_SITES= http://www.clamav.net/snapshot/ PKGNAMESUFFIX= -devel @@ -42,7 +41,9 @@ PKGDEINSTALL= ${WRKDIR}/pkg-deinstall PORTDOCS= NEWS ChangeLog html DBDIR= /var/db/clamav -PLIST_SUB+= DBDIR=${DBDIR} +RUNDIR= /var/run/clamav +PLIST_SUB+= DBDIR=${DBDIR} RUNDIR=${RUNDIR} + CONFIGURE_ARGS= --with-dbdir=${DBDIR} \ --with-zlib=/usr \ --disable-zlib-vcheck \ @@ -65,11 +66,12 @@ CONFLICTS= clamav-0.[0-9]* CLAMAVUSER?= clamav CLAMAVGROUP?= clamav -CLAMAV_CLAMD_SOCKET?= /var/run/clamav/clamd -CLAMAV_MILTER_SOCKET?= /var/run/clamav/clmilter.sock +CLAMAV_CLAMD_SOCKET?= ${RUNDIR}/clamd +CLAMAV_MILTER_SOCKET?= ${RUNDIR}/clmilter.sock SED_SCRIPT= -e 's|%%PREFIX%%|${PREFIX}|g' \ -e 's|%%DBDIR%%|${DBDIR}|g' \ + -e 's|%%RUNDIR%%|${RUNDIR}|g' \ -e 's|%%CLAMAVUSER%%|${CLAMAVUSER}|g' \ -e 's|%%CLAMAVGROUP%%|${CLAMAVGROUP}|g' \ -e 's|%%CLAMAV_CLAMD_SOCKET%%|${CLAMAV_CLAMD_SOCKET}|g' \ @@ -77,7 +79,7 @@ SED_SCRIPT= -e 's|%%PREFIX%%|${PREFIX}|g' \ SED_CONF= -E -e 's|^\#?(Example)$$|\#\1|' \ -e 's|^\#?((Update)?LogFile) .*/([a-z]+\.log)$$|\1 /var/log/clamav/\3|' \ - -e 's|^\#?(PidFile) .*/([a-z]+\.pid)$$|\1 /var/run/clamav/\2|' \ + -e 's|^\#?(PidFile) .*/([a-z]+\.pid)$$|\1 ${RUNDIR}/\2|' \ -e 's|^\#?(LocalSocket) .*$$|\1 ${CLAMAV_CLAMD_SOCKET}|' \ -e 's|^\#?(User) .*$$|\1 ${CLAMAVUSER}|' \ -e 's|^\#?(AllowSupplementaryGroups)$$|\1|' \ diff --git a/security/clamav-devel/distinfo b/security/clamav-devel/distinfo index 2ef6f1f..1603441 100644 --- a/security/clamav-devel/distinfo +++ b/security/clamav-devel/distinfo @@ -1,2 +1,2 @@ -MD5 (clamav-devel-20041213.tar.gz) = bbd6194cbbc0bd71341e5ecffa5486b7 -SIZE (clamav-devel-20041213.tar.gz) = 1476871 +MD5 (clamav-devel-20050110.tar.gz) = 60d394ae8b6533640adbef9306a35c2f +SIZE (clamav-devel-20050110.tar.gz) = 1542220 diff --git a/security/clamav-devel/files/patch-configure.in b/security/clamav-devel/files/patch-configure.in index b5a9fbe..2c383f6 100644 --- a/security/clamav-devel/files/patch-configure.in +++ b/security/clamav-devel/files/patch-configure.in @@ -1,14 +1,5 @@ ---- configure.in.orig Tue Dec 7 23:46:18 2004 -+++ configure.in Mon Dec 13 23:09:50 2004 -@@ -38,7 +38,7 @@ - AC_DEFINE(FILEBUFF, 8192, [file i/o buffer size]) - - AC_HEADER_STDC --AC_CHECK_HEADERS(stdint.h unistd.h sys/int_types.h dlfcn.h inttypes.h sys/inttypes.h memory.h ndir.h stdlib.h strings.h string.h sys/mman.h sys/param.h sys/stat.h sys/types.h malloc.h poll.h regex.h limits.h sys/filio.h uio.h) -+AC_CHECK_HEADERS(stdint.h unistd.h sys/int_types.h dlfcn.h inttypes.h sys/inttypes.h memory.h ndir.h stdlib.h strings.h string.h sys/mman.h sys/param.h sys/stat.h sys/types.h malloc.h poll.h regex.h limits.h sys/filio.h sys/uio.h) - AC_CHECK_HEADER(syslog.h,AC_DEFINE(USE_SYSLOG,1,[use syslog]),) - - AC_TYPE_OFF_T +--- configure.in.o Mon Jan 10 20:13:18 2005 ++++ configure.in Mon Jan 10 20:13:42 2005 @@ -360,9 +360,6 @@ ;; freebsd*) diff --git a/security/clamav-devel/pkg-plist b/security/clamav-devel/pkg-plist index a9a4485..5c5fb5d 100644 --- a/security/clamav-devel/pkg-plist +++ b/security/clamav-devel/pkg-plist @@ -1,6 +1,7 @@ @comment $FreeBSD$ -@unexec [ ! -f /var/run/clamav/clamd.pid ] || %%RC_DIR%%/clamav-clamd%%RC_SUFX%% stop || true -@unexec [ ! -f /var/run/clamav/freshclam.pid ] || %%RC_DIR%%/clamav-freshclam%%RC_SUFX%% stop || true +%%CLAMAV-MILTER%%@unexec [ ! -f %%RUNDIR%%/clamav-milter.pid ] || %%RC_DIR%%/clamav-milter%%RC_SUFX%% stop || true +@unexec [ ! -f %%RUNDIR%%/freshclam.pid ] || %%RC_DIR%%/clamav-freshclam%%RC_SUFX%% stop || true +@unexec [ ! -f %%RUNDIR%%/clamd.pid ] || %%RC_DIR%%/clamav-clamd%%RC_SUFX%% stop || true bin/clamav-config bin/clamscan bin/clamdscan @@ -25,5 +26,5 @@ etc/freshclam.conf.default @unexec [ ! -f %%DBDIR%%/daily.cvd ] || rm -f %%DBDIR%%/daily.cvd || true @unexec [ ! -f %%DBDIR%%/main.cvd ] || rm -f %%DBDIR%%/main.cvd || true @unexec rmdir %%DBDIR%% -@unexec rmdir /var/run/clamav 2>/dev/null || true +@unexec rmdir %%RUNDIR%% 2>/dev/null || true @unexec rmdir /var/log/clamav 2>/dev/null || true |