From 75fa523fe01ea60dc7bdd7d3486f4e0bbc97ec66 Mon Sep 17 00:00:00 2001
From: garga <garga@FreeBSD.org>
Date: Mon, 3 Nov 2008 22:48:53 +0000
Subject: - Update to 0.94.1 - Add --libdir to CONFIGURE_ARGS to fix libdir
 detection under 6.x

---
 security/clamav/Makefile              |  6 +++---
 security/clamav/distinfo              |  6 +++---
 security/clamav/files/patch-configure | 16 ++++++++--------
 3 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'security')

diff --git a/security/clamav/Makefile b/security/clamav/Makefile
index 425881aa4e9..f572e9fee86 100644
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	clamav
-PORTVERSION=	0.94
-PORTREVISION=	1
+DISTVERSION=	0.94.1
 CATEGORIES=	security
 MASTER_SITES=	SF
 
@@ -40,7 +39,8 @@ PLIST_SUB+=	DBDIR=${DBDIR} LOGDIR=${LOGDIR} RUNDIR=${RUNDIR}
 
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
-CONFIGURE_ARGS=	--with-dbdir=${DBDIR} \
+CONFIGURE_ARGS=	--libdir=${PREFIX}/lib \
+		--with-dbdir=${DBDIR} \
 		--with-zlib=/usr \
 		--disable-zlib-vcheck \
 		--disable-clamuko \
diff --git a/security/clamav/distinfo b/security/clamav/distinfo
index 3824e25cfdb..f8858fe4899 100644
--- a/security/clamav/distinfo
+++ b/security/clamav/distinfo
@@ -1,3 +1,3 @@
-MD5 (clamav-0.94.tar.gz) = d3f6d5fff2db81950491749166ab0ffa
-SHA256 (clamav-0.94.tar.gz) = ae188c18936ea9154eb6a85ea553c29f4349ee3e95457055fae5fe1b981af602
-SIZE (clamav-0.94.tar.gz) = 20509228
+MD5 (clamav-0.94.1.tar.gz) = dbe6820ff98f5a6f67a03e3ad63fa90b
+SHA256 (clamav-0.94.1.tar.gz) = 15cd3f5ed349f736b9926dd118d0b8edda7d58fe1f73118d4ffd21b3016f5dea
+SIZE (clamav-0.94.1.tar.gz) = 21817818
diff --git a/security/clamav/files/patch-configure b/security/clamav/files/patch-configure
index 45424480bb1..17be13d43fa 100644
--- a/security/clamav/files/patch-configure
+++ b/security/clamav/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2008-09-01 15:41:18.000000000 -0300
-+++ configure	2008-09-05 08:57:53.000000000 -0300
-@@ -16571,7 +16571,7 @@
+--- configure.orig	2008-10-15 07:41:31.000000000 -0300
++++ configure	2008-10-15 08:55:58.000000000 -0300
+@@ -17909,7 +17909,7 @@
      ;;
  freebsd*)
      if test "$have_pthreads" = "yes"; then
@@ -9,16 +9,16 @@
  	TH_SAFE="-thread-safe"
  
  cat >>confdefs.h <<\_ACEOF
-@@ -16931,7 +16931,7 @@
+@@ -18269,7 +18269,7 @@
  if test "$have_milter" = "yes"; then
  
-         save_LDFLAGS="$LDFLAGS"
--	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
-+	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS $THREAD_LIBS"
+         save_LIBS="$LIBS"
+-    CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
++    CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS $THREAD_LIBS"
      if test -d /usr/lib/libmilter ; then
  	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -L/usr/lib/libmilter"
      fi
-@@ -17468,19 +17468,25 @@
+@@ -18806,19 +18806,25 @@
      sendmailver_c=`echo $sendmailver | awk -F. '{printf $3}'`
  
  
-- 
cgit