- Update to 20060406 snapshot -- fix multiple vulnerabilities

   * CVE-2006-1614
      Damian Put discovered an integer overflow in the PE header parser.
      This is only exploitable if the ArchiveMaxFileSize option is disabled.
   * CVE-2006-1615
      Format string vulnerabilities in the logging code have been discovered,
      which might lead to the execution of arbitrary code.
   * CVE-2006-1630
      David Luyer discovered, that ClamAV can be tricked into an invalid
      memory access in the cli_bitset_set() function, which may lead to
      a denial of service.

- Synchronize with clamav port using SUB_FILES, USE_RC_SUBR

PR:		ports/95425
Submitted by:	garga
Security:	VuXML 6a5174bd-c580-11da-9110-00123ffe8333

14 files changed, 122 insertions, 141 deletions

diff --git a/security/clamav-devel/Makefile b/security/clamav-devel/Makefile
index 68b610a1bddf..a416bbfdf6c6 100644
--- a/security/clamav-devel/Makefile
+++ b/security/clamav-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	clamav
-PORTVERSION=	20051104
-PORTREVISION=	1
+PORTVERSION=	20060406
 CATEGORIES=	security
 MASTER_SITES=	http://www.clamav.net/snapshot/ \
 		http://www.galle.com.br/~garga/clamav-devel/
@@ -17,8 +16,6 @@ DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	Command line virus scanner written entirely in C
 
-FORBIDDEN=	Security issues. http://www.vuxml.org/freebsd/6a5174bd-c580-11da-9110-00123ffe8333.html
-
 LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4
 RUN_DEPENDS=	lha:${PORTSDIR}/archivers/lha \
 		unarj:${PORTSDIR}/archivers/unarj \
@@ -30,16 +27,10 @@ RUN_DEPENDS=	lha:${PORTSDIR}/archivers/lha \
 OPTIONS=	MILTER "Compile the milter interface" Off \
 		CURL "Support URL downloading" Off
 
-USE_REINPLACE=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_AUTOTOOLS=	automake:19 autoconf:259 libtool:15
-LIBTOOLFILES=	acinclude.m4
 INSTALLS_SHLIB=	yes
-USE_RC_SUBR=	yes
-
-PKGINSTALL=	${WRKDIR}/pkg-install
-PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
+USE_RC_SUBR=	clamav-clamd clamav-freshclam
 
 PORTDOCS=	NEWS ChangeLog html
 
@@ -57,10 +48,13 @@ CONFIGURE_ARGS=	--with-dbdir=${DBDIR} \
 		--disable-gethostbyname_r \
 		--enable-readdir_r \
 		--disable-dependency-tracking
-CPPFLAGS+=	-I${LOCALBASE}/include
-CFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
-LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}"
+CPPFLAGS+=	-I${LOCALBASE}/include \
+		${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib \
+		${PTHREAD_LIBS}
+
+CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
 
 MAN1=		clamscan.1 freshclam.1 sigtool.1 clamdscan.1
 MAN5=		clamd.conf.5 freshclam.conf.5
@@ -73,14 +67,14 @@ CLAMAVGROUP?=	clamav
 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|%%LOGDIR%%|${LOGDIR}|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' \
-		-e 's|%%CLAMAV_MILTER_SOCKET%%|${CLAMAV_MILTER_SOCKET}|g'
+SUB_FILES=	pkg-install pkg-deinstall
+SUB_LIST=	DBDIR=${DBDIR} \
+		LOGDIR=${LOGDIR} \
+		RUNDIR=${RUNDIR} \
+		CLAMAVUSER=${CLAMAVUSER} \
+		CLAMAVGROUP=${CLAMAVGROUP} \
+		CLAMAV_CLAMD_SOCKET=${CLAMAV_CLAMD_SOCKET} \
+		CLAMAV_MILTER_SOCKET=${CLAMAV_MILTER_SOCKET}
 
 SED_CONF=	-E -e 's|^\#?(Example)$$|\#\1|' \
 		-e 's|^\#?((Update)?LogFile) .*/([a-z]+\.log)$$|\1 ${LOGDIR}/\3|' \
@@ -90,7 +84,6 @@ SED_CONF=	-E -e 's|^\#?(Example)$$|\#\1|' \
 		-e 's|^\#?(AllowSupplementaryGroups)$$|\1|' \
 		-e 's|^\#?(ScanMail)$$|\1|' \
 		-e 's|^\#?(NotifyClamd)$$|\1|' \
-		-e 's|^\#?(Checks)$$|\#\1|' \
 		-e 's|^\#?(DatabaseDirectory) .*$$|\1 ${DBDIR}|' \
 		-e 's|^\#?(DatabaseOwner) .*$$|\1 ${CLAMAVUSER}|' \
 		-e 's|^\#?(FixStaleSocket)$$|\1|'
@@ -98,23 +91,26 @@ SED_CONF=	-E -e 's|^\#?(Example)$$|\#\1|' \
 PLIST_SUB+=	CLAMAVUSER=${CLAMAVUSER} \
 		CLAMAVGROUP=${CLAMAVGROUP}
 
-RC_DIR=		${PREFIX}/etc/rc.d
-RC_SUFX=	.sh
-SED_SCRIPT+=	-e 's|%%RC_SUBR%%|${RC_SUBR}|g' \
-		-e 's|%%RC_DIR%%|${RC_DIR}|g' \
-		-e 's|%%RC_SUFX%%|${RC_SUFX}|g'
-PLIST_SUB+=	RC_DIR=${RC_DIR} \
-		RC_SUFX=${RC_SUFX}
-
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} == 502010
+PTHREAD_LIBS=	-pthread
+.endif
+
 .if defined(WITH_MILTER)
-.if !exists(/usr/lib/libmilter.a)
+USE_RC_SUBR+=	clamav-milter
+. if !defined(WITHOUT_LDAP) && exists(${LOCALBASE}/lib/libldap.so)
+USE_OPENLDAP=	yes
+LDFLAGS+=	-lldap
+. endif
+
+. if !exists(/usr/lib/libmilter.a)
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libmilter.a:${PORTSDIR}/mail/sendmail
 CONFIGURE_ENV+=	SENDMAIL="${LOCALBASE}/sbin/sendmail"
-.else
+. else
 CONFIGURE_ENV+=	SENDMAIL="/usr/sbin/sendmail"
-.endif
+. endif
+
 CONFIGURE_ARGS+=	--enable-milter
 PLIST_SUB+=	CLAMAV-MILTER=""
 .else
@@ -128,8 +124,11 @@ CONFIGURE_ARGS+=	--with-libcurl
 CONFIGURE_ARGS+=	--without-libcurl
 .endif
 
-pre-configure:
-	@cd ${WRKSRC} && ${ACLOCAL}
+post-patch:
+	@${REINPLACE_CMD} -e 's,$$(libdir)/pkgconfig,$$(prefix)/libdata/pkgconfig,' \
+		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|-pthread -lc_r|${PTHREAD_LIBS}|g' \
+		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 
 pre-build:
 	@if ${LDCONFIG} -r | ${GREP} -qw -e -lclamav; then \
@@ -141,44 +140,25 @@ pre-build:
 post-build:
 	@${REINPLACE_CMD} ${SED_CONF} ${BUILD_WRKSRC}/etc/clamd.conf
 	@${REINPLACE_CMD} ${SED_CONF} ${BUILD_WRKSRC}/etc/freshclam.conf
-	@${SED} ${SED_SCRIPT} ${PKGDIR}/pkg-install >${PKGINSTALL}
-	@${SED} ${SED_SCRIPT} ${PKGDIR}/pkg-deinstall >${PKGDEINSTALL}
-	@${SED} ${SED_SCRIPT} ${FILESDIR}/clamav-clamd.sh \
-		>${WRKDIR}/clamav-clamd.sh
-	@${SED} ${SED_SCRIPT} ${FILESDIR}/clamav-freshclam.sh \
-		>${WRKDIR}/clamav-freshclam.sh
-.	if defined(WITH_MILTER)
-		@${SED} ${SED_SCRIPT} ${FILESDIR}/clamav-milter.sh \
-			>${WRKDIR}/clamav-milter.sh
-.	endif
 
 pre-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} PKG_DESTDIR=${DESTDIR} \
 		${SH} ${PKGINSTALL} ${PREFIX} PRE-INSTALL
 
 post-install:
-	@${INSTALL_SCRIPT} ${WRKDIR}/clamav-clamd.sh \
-		${DESTDIR}${RC_DIR}/clamav-clamd${RC_SUFX}
-	@${INSTALL_SCRIPT} ${WRKDIR}/clamav-freshclam.sh \
-		${DESTDIR}${RC_DIR}/clamav-freshclam${RC_SUFX}
 	@${CHOWN} -R ${CLAMAVUSER}:${CLAMAVGROUP} ${DESTDIR}${DBDIR}
-.	for c in clamd freshclam
-		@[ -f ${DESTDIR}${PREFIX}/etc/${c}.conf ] || \
-			${CP} ${DESTDIR}${PREFIX}/etc/${c}.conf.default \
-				${DESTDIR}${PREFIX}/etc/${c}.conf
-.	endfor
-.	if defined(WITH_MILTER)
-		@${INSTALL_SCRIPT} ${WRKDIR}/clamav-milter.sh \
-			${DESTDIR}${RC_DIR}/clamav-milter${RC_SUFX}
-.	endif
-.	if !defined(NOPORTDOCS)
-		@${MKDIR} ${DESTDIR}${DOCSDIR}
-		@${INSTALL_DATA} ${INSTALL_WRKSRC}/NEWS ${INSTALL_WRKSRC}/ChangeLog \
-			${DESTDIR}${DOCSDIR}
-		@${MKDIR} ${DESTDIR}${DOCSDIR}/html
-		@${INSTALL_DATA} ${INSTALL_WRKSRC}/docs/html/*.* \
-			${DESTDIR}${DOCSDIR}/html
-.	endif
+.for c in clamd freshclam
+	@[ -f ${DESTDIR}${PREFIX}/etc/${c}.conf ] || \
+		${CP} ${DESTDIR}${PREFIX}/etc/${c}.conf.default ${DESTDIR}${PREFIX}/etc/${c}.conf
+.endfor
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DESTDIR}${DOCSDIR}
+	@${INSTALL_DATA} ${INSTALL_WRKSRC}/NEWS ${INSTALL_WRKSRC}/ChangeLog \
+		${DESTDIR}${DOCSDIR}
+	@${MKDIR} ${DESTDIR}${DOCSDIR}/html
+	@${INSTALL_DATA} ${INSTALL_WRKSRC}/docs/html/*.* \
+		${DESTDIR}${DOCSDIR}/html
+.endif
 	@${SETENV} PKG_PREFIX=${PREFIX} PKG_DESTDIR=${DESTDIR} \
 		${SH} ${PKGINSTALL} ${PREFIX} POST-INSTALL
 
diff --git a/security/clamav-devel/distinfo b/security/clamav-devel/distinfo
index b7abb35980f3..42d01905e357 100644
--- a/security/clamav-devel/distinfo
+++ b/security/clamav-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (clamav-devel-20051104.tar.gz) = f0018392f83c6bef1c62c6d4c0cbc718
-SHA256 (clamav-devel-20051104.tar.gz) = 946274d954b91b8f6054e318756eef26fb9b49d2ce75005e992dbab52640d066
-SIZE (clamav-devel-20051104.tar.gz) = 1686738
+MD5 (clamav-devel-20060406.tar.gz) = ec192d7eac5667b82b5b1f01078ecfa4
+SHA256 (clamav-devel-20060406.tar.gz) = 1cd5f9bddf9c6aebcceb14889e2f02670989d2bb93a6b87dfc4c97dcaef082ea
+SIZE (clamav-devel-20060406.tar.gz) = 1705228
diff --git a/security/clamav-devel/files/clamav-clamd.sh b/security/clamav-devel/files/clamav-clamd.in
index 6164dfaf5176..6164dfaf5176 100644
--- a/security/clamav-devel/files/clamav-clamd.sh
+++ b/security/clamav-devel/files/clamav-clamd.in
diff --git a/security/clamav-devel/files/clamav-freshclam.sh b/security/clamav-devel/files/clamav-freshclam.in
index 003bab98112a..77a6053c2e87 100644
--- a/security/clamav-devel/files/clamav-freshclam.sh
+++ b/security/clamav-devel/files/clamav-freshclam.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: ports/security/clamav-devel/files/freshclam.sh
+# $FreeBSD$
 #
 
 # PROVIDE: freshclam
@@ -23,7 +23,7 @@ rcvar=`set_rcvar`
 
 command=%%PREFIX%%/bin/freshclam
 pidfile=%%RUNDIR%%/freshclam.pid
-command_args="--daemon"
+command_args="--daemon -p ${pidfile}"
 required_dirs=%%DBDIR%%
 required_files=%%PREFIX%%/etc/freshclam.conf
 
diff --git a/security/clamav-devel/files/clamav-milter.sh b/security/clamav-devel/files/clamav-milter.in
index 9118b50ee781..2176d9a35989 100644
--- a/security/clamav-devel/files/clamav-milter.sh
+++ b/security/clamav-devel/files/clamav-milter.in
@@ -41,8 +41,6 @@ start_precmd()
 load_rc_config $name
 : ${clamav_milter_enable="NO"}
 : ${clamav_milter_socket="%%CLAMAV_MILTER_SOCKET%%"}
-: ${clamav_milter_flags="--postmaster-only --local --outgoing --max-children=50"}
+: ${clamav_milter_flags="--postmaster-only --local --outgoing --timeout=0 --max-children=50"}
 
-# add socket to any given argument
-clamav_milter_flags="${clamav_milter_flags} ${clamav_milter_socket}"
 run_rc_command "$1"
diff --git a/security/clamav-devel/files/patch-Makefile.am b/security/clamav-devel/files/patch-Makefile.am
deleted file mode 100644
index 186cd51dac1a..000000000000
--- a/security/clamav-devel/files/patch-Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.am.orig	Sat Oct 16 17:43:47 2004
-+++ Makefile.am	Sat Oct 16 17:44:12 2004
-@@ -20,6 +20,6 @@
- 
- bin_SCRIPTS=clamav-config
- 
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = libclamav.pc
- 
diff --git a/security/clamav-devel/files/patch-configure b/security/clamav-devel/files/patch-configure
new file mode 100644
index 000000000000..2ac2e4dfeb61
--- /dev/null
+++ b/security/clamav-devel/files/patch-configure
@@ -0,0 +1,48 @@
+--- configure.orig	Thu Jun 23 23:12:00 2005
++++ configure	Tue Jun 28 20:53:10 2005
+@@ -10914,6 +10914,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++#include <sys/types.h>
++#include <netinet/in.h>
++#include <arpa/nameser.h>
+ #include <resolv.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+@@ -10957,6 +10960,9 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
++#include <sys/types.h>
++#include <netinet/in.h>
++#include <arpa/nameser.h>
+ #include <resolv.h>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+@@ -11195,19 +11201,25 @@
+     sendmailver_c=`echo $sendmailver | awk -F. '{printf $3}'`
+ 
+ 
++if echo "$sendmailver_a" | egrep -q '^[0-9]+$'; then
+ cat >>confdefs.h <<_ACEOF
+ #define SENDMAIL_VERSION_A $sendmailver_a
+ _ACEOF
++fi
+ 
+ 
++if echo "$sendmailver_b" | egrep -q '^[0-9]+$'; then
+ cat >>confdefs.h <<_ACEOF
+ #define SENDMAIL_VERSION_B $sendmailver_b
+ _ACEOF
++fi
+ 
+ 
++if echo "$sendmailver_c" | egrep -q '^[0-9]+$'; then
+ cat >>confdefs.h <<_ACEOF
+ #define SENDMAIL_VERSION_C $sendmailver_c
+ _ACEOF
++fi
+ 
+   fi
+ fi
diff --git a/security/clamav-devel/files/patch-configure.in b/security/clamav-devel/files/patch-configure.in
deleted file mode 100644
index 04970df2970f..000000000000
--- a/security/clamav-devel/files/patch-configure.in
+++ /dev/null
@@ -1,31 +0,0 @@
---- configure.in.orig	Mon Jul  4 10:18:26 2005
-+++ configure.in	Mon Jul  4 10:21:50 2005
-@@ -178,9 +178,15 @@
-     sendmailver_b=`echo $sendmailver | awk -F. '{printf $2}'`
-     sendmailver_c=`echo $sendmailver | awk -F. '{printf $3}'`
- 
--    AC_DEFINE_UNQUOTED(SENDMAIL_VERSION_A, $sendmailver_a, [major version of Sendmail])
--    AC_DEFINE_UNQUOTED(SENDMAIL_VERSION_B, $sendmailver_b, [minor version of Sendmail])
--    AC_DEFINE_UNQUOTED(SENDMAIL_VERSION_C, $sendmailver_c, [subversion of Sendmail])
-+    if echo "$sendmailver_a" | egrep -q '^[0-9]+$'; then
-+      AC_DEFINE_UNQUOTED(SENDMAIL_VERSION_A, $sendmailver_a, [major version of Sendmail])
-+    fi
-+    if echo "$sendmailver_b" | egrep -q '^[0-9]+$'; then
-+      AC_DEFINE_UNQUOTED(SENDMAIL_VERSION_B, $sendmailver_b, [minor version of Sendmail])
-+    fi
-+    if echo "$sendmailver_c" | egrep -q '^[0-9]+$'; then
-+      AC_DEFINE_UNQUOTED(SENDMAIL_VERSION_C, $sendmailver_c, [subversion of Sendmail])
-+    fi
-   fi
- fi
- 
-@@ -389,9 +395,6 @@
-     ;;
- freebsd*)
-     if test "$have_pthreads" = "yes"; then
--	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread -lc_r"
--	CLAMD_LIBS="$CLAMD_LIBS -pthread -lc_r"
--	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread -lc_r"
- 	TH_SAFE="-thread-safe"
- 	AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
- 	AC_DEFINE(_REENTRANT,1,[thread safe])
diff --git a/security/clamav-devel/files/patch-etc::Makefile.am b/security/clamav-devel/files/patch-etc_Makefile.in
index 7790996e3ad5..e47b65443c8e 100644
--- a/security/clamav-devel/files/patch-etc::Makefile.am
+++ b/security/clamav-devel/files/patch-etc_Makefile.in
@@ -1,7 +1,7 @@
---- etc/Makefile.am.orig	Sat Oct  2 23:09:13 2004
-+++ etc/Makefile.am	Sun Oct 17 13:04:24 2004
-@@ -20,7 +20,5 @@
-  
+--- etc/Makefile.in.orig	Thu Feb 19 14:17:02 2004
++++ etc/Makefile.in	Thu Feb 19 14:17:36 2004
+@@ -333,10 +333,8 @@
+ 
  install:
  	$(mkinstalldirs) $(DESTDIR)$(CFGINST)
 -	@test -f $(DESTDIR)$(CFGINST)/clamd.conf || \
@@ -10,3 +10,6 @@
 -	$(INSTALL_DATA) $(srcdir)/freshclam.conf $(DESTDIR)$(CFGINST)
 +	$(INSTALL_DATA) $(srcdir)/clamd.conf $(DESTDIR)$(CFGINST)/clamd.conf.default
 +	$(INSTALL_DATA) $(srcdir)/freshclam.conf $(DESTDIR)$(CFGINST)/freshclam.conf.default
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/security/clamav-devel/files/patch-libclamav_zziplib_zzip-conf.h b/security/clamav-devel/files/patch-libclamav_zziplib_zzip-conf.h
new file mode 100644
index 000000000000..fe62753a8889
--- /dev/null
+++ b/security/clamav-devel/files/patch-libclamav_zziplib_zzip-conf.h
@@ -0,0 +1,11 @@
+--- libclamav/zziplib/zzip-conf.h.orig	Mon Nov 24 17:52:56 2003
++++ libclamav/zziplib/zzip-conf.h	Mon Nov 24 17:53:05 2003
+@@ -11,6 +11,8 @@
+ #ifndef _ZZIP_CONF_H
+ #define _ZZIP_CONF_H 1
+ 
++#include <sys/types.h>
++
+ #if !defined ZZIP_OMIT_CONFIG_H
+ # if defined _MSC_VER || defined __BORLANDC__ || defined __WATCOMC__
+ # include <zzip-msvc.h>
diff --git a/security/clamav-devel/files/patch-zziplib.h b/security/clamav-devel/files/patch-zziplib.h
deleted file mode 100644
index fc9fdc0479a9..000000000000
--- a/security/clamav-devel/files/patch-zziplib.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- libclamav/zziplib/zziplib.h.orig	Mon Sep 29 13:44:52 2003
-+++ libclamav/zziplib/zziplib.h	Fri Oct  3 15:45:22 2003
-@@ -19,6 +19,9 @@
- #ifndef _ZZIP_ZZIP_H /* zziplib.h */
- #define _ZZIP_ZZIP_H
- 
-+#ifdef __FreeBSD__
-+#include <unistd.h>
-+#endif
- #include <zzip-conf.h>
- 
- #include <fcntl.h>
diff --git a/security/clamav-devel/pkg-deinstall b/security/clamav-devel/files/pkg-deinstall.in
index 207212015296..207212015296 100644
--- a/security/clamav-devel/pkg-deinstall
+++ b/security/clamav-devel/files/pkg-deinstall.in
diff --git a/security/clamav-devel/pkg-install b/security/clamav-devel/files/pkg-install.in
index ee4cea1d98ef..91ec86b6b17b 100644
--- a/security/clamav-devel/pkg-install
+++ b/security/clamav-devel/files/pkg-install.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/security/clamav-devel/Attic/pkg-install,v 1.20 2005-01-27 12:15:27 yar Exp $
+# $FreeBSD$
 
 PREFIX=${PKG_PREFIX:-%%PREFIX%%}
 DESTDIR=${PKG_DESTDIR:-}
diff --git a/security/clamav-devel/pkg-plist b/security/clamav-devel/pkg-plist
index e82e19285b62..f56e1097ddf7 100644
--- a/security/clamav-devel/pkg-plist
+++ b/security/clamav-devel/pkg-plist
@@ -1,15 +1,9 @@
 @comment $FreeBSD$
-%%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
 bin/freshclam
 bin/sigtool
-etc/rc.d/clamav-clamd%%RC_SUFX%%
-etc/rc.d/clamav-freshclam%%RC_SUFX%%
-%%CLAMAV-MILTER%%etc/rc.d/clamav-milter%%RC_SUFX%%
 %%CLAMAV-MILTER%%sbin/clamav-milter
 sbin/clamd
 include/clamav.h