From rob@debank.tv  Fri Jan 30 05:20:49 2004
Return-Path: <rob@debank.tv>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 145C516A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 30 Jan 2004 05:20:49 -0800 (PST)
Received: from haha.debank.tv (c92069.upc-c.chello.nl [212.187.92.69])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 931DD43D2F
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 30 Jan 2004 05:20:40 -0800 (PST)
	(envelope-from rob@debank.tv)
Received: from haha.debank.tv (localhost [127.0.0.1])
	by haha.debank.tv (8.12.10/8.12.10) with ESMTP id i0UDKVv1001975
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Fri, 30 Jan 2004 14:20:32 +0100 (CET)
	(envelope-from rob@debank.tv)
Received: (from root@localhost)
	by haha.debank.tv (8.12.10/8.12.10/Submit) id i0UDKV88001974;
	Fri, 30 Jan 2004 14:20:31 +0100 (CET)
	(envelope-from rob)
Message-Id: <200401301320.i0UDKV88001974@haha.debank.tv>
Date: Fri, 30 Jan 2004 14:20:31 +0100 (CET)
From: Rob Evers <rob@debank.tv>
Reply-To: Rob Evers <rob@debank.tv>
To: FreeBSD-gnats-submit@freebsd.org
Cc: dirk.meyer@dinoex.sub.org
Subject: Update security/clamav-devel
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         62112
>Category:       ports
>Synopsis:       Update security/clamav-devel
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    dinoex
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 30 05:30:17 PST 2004
>Closed-Date:    Fri Jan 30 19:45:45 CET 2004
>Last-Modified:  Fri Jan 30 19:45:45 CET 2004
>Originator:     Rob Evers
>Release:        FreeBSD 4.9-STABLE i386
>Organization:
>Environment:
System: FreeBSD haha.debank.tv 4.9-STABLE FreeBSD 4.9-STABLE #0: Tue Jan 20 17:31:23 CET 2004 rob@slopuh.debank.tv:/usr/obj/usr/src/sys/HAHA i386

>Description:
Update security/clamav-devel
-Get default config files from BUILD_WRKSRC to fix upgrade when config files are untouched
-Really use the POST-INSTALL target
-Update to 20040129
-Various OLE2/VBA fixes
>How-To-Repeat:
>Fix:

--- clamav-devel.patch begins here ---
diff -ur clamav-devel/Makefile clamav-devel.new/Makefile
--- clamav-devel/Makefile	Wed Jan 28 14:50:04 2004
+++ clamav-devel.new/Makefile	Fri Jan 30 14:07:36 2004
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	clamav
-PORTVERSION=	20040126
+PORTVERSION=	20040129
 CATEGORIES=	security
 MASTER_SITES=	http://clamav.sourceforge.net/snapshot/
 PKGNAMESUFFIX=	-devel
@@ -121,20 +121,21 @@
 		${SH} ${PKGINSTALL} ${PREFIX} PRE-INSTALL
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}${PKGNAMESUFFIX}
-	${INSTALL_DATA} ${WRKSRC}/docs/*pdf ${DOCSDIR}${PKGNAMESUFFIX}
+	@${INSTALL_DATA} ${WRKSRC}/docs/*pdf ${DOCSDIR}${PKGNAMESUFFIX}
 .endif
 
 post-install:
 	@[ -f ${PREFIX}/etc/clamav.conf ] || \
-		${CP} ${PREFIX}/etc/clamav.conf.default \
+		${CP} ${BUILD_WRKSRC}/etc/clamav.conf.default \
 			${PREFIX}/etc/clamav.conf
 	@[ -f ${PREFIX}/etc/freshclam.conf ] || \
-		${CP} ${PREFIX}/etc/freshclam.conf.default \
+		${CP} ${BUILD_WRKSRC}/etc/freshclam.conf.default \
 			${PREFIX}/etc/freshclam.conf
 	@${CHOWN} -R ${CLAMAVUSER}:${CLAMAVGROUP} ${DATADIR}
 	@${INSTALL_SCRIPT} ${WRKDIR}/clamav-clamd.sh \
 		${RC_DIR}/clamav-clamd${RC_SUFX}
 	@${INSTALL_SCRIPT} ${WRKDIR}/freshclam.sh ${RC_DIR}/freshclam${RC_SUFX}
+	@${SH} ${PKGINSTALL} ${PREFIX} POST-INSTALL
 .if defined(WITH_MILTER)
 	@${INSTALL_SCRIPT} ${WRKDIR}/clamav-milter.sh \
 		${RC_DIR}/clamav-milter${RC_SUFX}
diff -ur clamav-devel/distinfo clamav-devel.new/distinfo
--- clamav-devel/distinfo	Wed Jan 28 14:50:04 2004
+++ clamav-devel.new/distinfo	Fri Jan 30 13:26:58 2004
@@ -1 +1 @@
-MD5 (clamav-devel-20040126.tar.gz) = 71b7793bd733f59253c8e75419a49d4e
+MD5 (clamav-devel-20040129.tar.gz) = 8c0a73c2b832195b83edc163079285a4
diff -ur clamav-devel/pkg-install clamav-devel.new/pkg-install
--- clamav-devel/pkg-install	Thu Dec 11 16:32:29 2003
+++ clamav-devel.new/pkg-install	Wed Jan 28 16:14:40 2004
@@ -45,7 +45,7 @@
 
 if [ "$2" = "POST-INSTALL" ]; then
 	echo "===> Updating virus definitions..."
-	freshclam -u $3 --datadir=$4
+	freshclam
 fi
 
 exit 0
--- clamav-devel.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->dinoex 
Responsible-Changed-By: dinoex 
Responsible-Changed-When: Fri Jan 30 19:19:03 CET 2004 
Responsible-Changed-Why:  
I will take care of it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=62112 
State-Changed-From-To: open->closed 
State-Changed-By: dinoex 
State-Changed-When: Fri Jan 30 19:45:20 CET 2004 
State-Changed-Why:  
committed, thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=62112 
>Unformatted:
