- Update to 20030829

- Fix build under stable
PR:		56374
Submitted by:	rob@debank.tv

4 files changed, 12 insertions, 20 deletions

diff --git a/security/clamav-devel/Makefile b/security/clamav-devel/Makefile
index 31a9801d8bfe..9121e3eba865 100644
--- a/security/clamav-devel/Makefile
+++ b/security/clamav-devel/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	clamav
-PORTVERSION=	20030805
+PORTVERSION=	20030829
 CATEGORIES=	security
-MASTER_SITES=	http://members.chello.nl/e.prochowski/
+MASTER_SITES=	http://clamav.sourceforge.net/snapshot/
 PKGNAMESUFFIX=	-devel
-DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
+DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	rob@debank.tv
 COMMENT=	Command line virus scanner written entirely in C
@@ -30,6 +30,8 @@ INSTALLS_SHLIB=	yes
 
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--disable-clamav --enable-bigstack
+CFLAGS+=	-I${LOCALBASE}/include
+CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 MAN1=		clamscan.1 freshclam.1 sigtool.1 clamdscan.1 clamav-milter.1
 MAN5=		clamav.conf.5
@@ -37,6 +39,12 @@ MAN8=		clamd.8
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} < 510001
+# compiles only with optimizer
+CFLAGS+=	-O
+LDFLAGS+=	-lcipher
+.endif
+
 .if defined(WITH_MILTER)
 USE_GCC=	3.2
 CONFIGURE_ARGS+=	--enable-milter
diff --git a/security/clamav-devel/distinfo b/security/clamav-devel/distinfo
index 52a6559dc344..f6170db145f4 100644
--- a/security/clamav-devel/distinfo
+++ b/security/clamav-devel/distinfo
@@ -1 +1 @@
-MD5 (clamav-devel-20030805.tar.gz) = d8d1962ab1335f650505598857a219dd
+MD5 (clamav-20030829.tar.gz) = 2189904a13d126d02f166b1638e65bcd
diff --git a/security/clamav-devel/files/patch-libclamav::zziplib::zzip-conf.h b/security/clamav-devel/files/patch-libclamav::zziplib::zzip-conf.h
deleted file mode 100644
index e3560d8078b5..000000000000
--- a/security/clamav-devel/files/patch-libclamav::zziplib::zzip-conf.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- libclamav/zziplib/zzip-conf.h.orig	Mon Aug  4 06:25:30 2003
-+++ libclamav/zziplib/zzip-conf.h	Thu Aug  7 03:48:35 2003
-@@ -29,6 +29,10 @@
- # endif

- #endif

- 

-+# ifdef ZZIP_HAVE_SYS_TYPES_H
-+# include <sys/types.h>
-+# endif
-+
- /* especially win32 platforms do not declare off_t so far - see zzip-msvc.h */

- #ifndef _zzip_off_t

- #ifdef   ZZIP_off_t

diff --git a/security/clamav-devel/pkg-plist b/security/clamav-devel/pkg-plist
index dc0a58103b8f..b35a4fe3f7b3 100644
--- a/security/clamav-devel/pkg-plist
+++ b/security/clamav-devel/pkg-plist
@@ -3,7 +3,6 @@ bin/clamscan
 bin/clamdscan
 bin/freshclam
 bin/sigtool
-etc/clamav.conf
 %%CLAMAV-MILTER:%%sbin/clamav-milter
 sbin/clamd
 include/clamav.h
@@ -12,8 +11,6 @@ lib/libclamav.so
 lib/libclamav.la
 lib/libclamav.a
 share/clamav/mirrors.txt
-share/clamav/viruses.db
-share/clamav/viruses.db2
 @exec chown clamav share/clamav share/clamav/mirrors.txt share/clamav/viruses.db share/clamav/viruses.db2
 @dirrm share/clamav
 @unexec rmuser -y clamav