4 files changed, 46 insertions, 93 deletions

diff --git a/security/clamav-devel/Makefile b/security/clamav-devel/Makefile
index f926f97a1067..cfdb38ffaa9f 100644
--- a/security/clamav-devel/Makefile
+++ b/security/clamav-devel/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	clamav
-PORTVERSION=	20040701
+PORTVERSION=	20040826
 CATEGORIES=	security
-MASTER_SITES=	http://clamav.sourceforge.net/snapshot/
+MASTER_SITES=	http://www.clamav.net/snapshot/
 PKGNAMESUFFIX=	-devel
 DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 
@@ -29,7 +29,9 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_AUTOCONF_VER=259
-USE_LIBTOOL_VER=13
+USE_AUTOMAKE_VER=18
+USE_LIBTOOL_VER=15
+LIBTOOLFILES=	acinclude.m4
 INSTALLS_SHLIB=	yes
 USE_RC_SUBR=	yes
 
@@ -39,9 +41,9 @@ CONFIGURE_ARGS=	--with-dbdir=${DATADIR} \
 		--enable-bigstack \
 		--disable-dependency-tracking
 CPPFLAGS+=	-I${LOCALBASE}/include
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}" "CPPFLAGS=${CPPFLAGS}"
+CFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
+LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}"
 
 MAN1=		clamscan.1 freshclam.1 sigtool.1 clamdscan.1
 MAN5=		clamav.conf.5 freshclam.conf.5
@@ -107,7 +109,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/lib/sendmail|/usr/sbin/sendmail|g' \
 		${WRKSRC}/clamav-milter/clamav-milter.c
 	@${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' \
-		${WRKSRC}/Makefile.in
+		${WRKSRC}/Makefile.am
 
 post-build:
 	@${SED} ${SED_CONF} ${BUILD_WRKSRC}/etc/clamav.conf \
diff --git a/security/clamav-devel/distinfo b/security/clamav-devel/distinfo
index 5fb13d9fda71..6d4dd4a6b829 100644
--- a/security/clamav-devel/distinfo
+++ b/security/clamav-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (clamav-devel-20040701.tar.gz) = ed79ebff018bbd9664e3de1e09946ac9
-SIZE (clamav-devel-20040701.tar.gz) = 1577535
+MD5 (clamav-devel-20040826.tar.gz) = c739f4d138863a27ce57976e6bb67deb
+SIZE (clamav-devel-20040826.tar.gz) = 1660493
diff --git a/security/clamav-devel/files/patch-configure.in b/security/clamav-devel/files/patch-configure.in
index 5604d944491b..2a49133a10a1 100644
--- a/security/clamav-devel/files/patch-configure.in
+++ b/security/clamav-devel/files/patch-configure.in
@@ -1,61 +1,35 @@
---- clamav-devel.orig/files/patch-configure.in	Thu Jan  1 01:00:00 1970
-+++ clamav-devel/files/patch-configure.in	Sun Feb 29 20:35:49 2004
-@@ -0,0 +1,58 @@
-+--- configure.in.orig	Mon Feb 23 18:24:52 2004
-++++ configure.in	Wed Feb 25 17:39:15 2004
-+@@ -199,9 +199,9 @@
-+ AC_SUBST(CFGDIR)
-+ AC_DEFINE_UNQUOTED(CONFDIR,"$cfg_dir",[where to look for the config file])
-+ 
-+-dnl Do not overwrite the current config file
-+-AM_CONDITIONAL(INSTALL_CLAMAV_CONF, test ! -r "$cfg_dir/clamav.conf")
-+-AM_CONDITIONAL(INSTALL_FRESHCLAM_CONF, test ! -r "$cfg_dir/freshclam.conf")
-++dnl Do not install config files
-++AM_CONDITIONAL(INSTALL_CLAMAV_CONF, test 0 = 1 )
-++AM_CONDITIONAL(INSTALL_FRESHCLAM_CONF, test 0 = 1 )
-+ 
-+ if test "$test_urandom" = "yes"
-+ then
-+@@ -294,10 +294,38 @@
-+     ;;
-+ freebsd*)
-+     if test "$have_pthreads" = "yes"; then
-+-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread -lc_r"
-+-	CLAMD_LIBS="-pthread -lc_r"
-+-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread -lc_r"
-+-	TH_SAFE="-thread-safe"
-++	if test -n "$with_os_version"; then
-++		OSVERSION="$with_os_version"
-++	else
-++		OSVERSION=`/sbin/sysctl -n kern.osreldate`
-++	fi
-++	if test -z "$PTHREAD_CFLAGS"; then
-++		if test "$OSVERSION" -lt "502102"; then
-++			PTHREAD_CFLAGS="-D_THREAD_SAFE"
-++		else
-++			unset PTHREAD_CFLAGS
-++		fi
-++	fi
-++	if test -z "$PTHREAD_LIBS"; then
-++		if test "$OSVERSION" -lt "502102"; then
-++			PTHREAD_LIBS="-lc_r"
-++		fi
-++		if test "$OSVERSION" -lt "500016"; then
-++			PTHREAD_LIBS="-pthread"
-++		fi
-++		if test "$OSVERSION" -ge "502102"; then
-++			PTHREAD_LIBS="-lpthread"
-++		fi
-++	fi
-++
-++	if test "$OSVERSION" -lt "500016"; then
-++		PTHREAD_LIBS="$PTHREAD_LIBS -lc_r"
-++	fi
-++
-++	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS $PTHREAD_LIBS"
-++	CLAMD_LIBS="$PTHREAD_LIBS"
-++	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS $PTHREAD_LIBS"
-++	TH_SAFE="-thread-safe $PTHREAD_CFLAGS"
-+ 	AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
-+ 	AC_DEFINE(_REENTRANT,1,[thread safe])
-+     fi
+--- configure.in.orig	Sun Aug 22 19:08:25 2004
++++ configure.in	Thu Sep  2 13:36:30 2004
+@@ -284,9 +284,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])
+@@ -510,6 +507,8 @@
+ 
+ dnl Check for gethostbyname_r and number of its arguments
+ dnl Code from libwww/configure.in
++AC_CHECK_FUNC(gethostbyname_r)
++if test $ac_cv_func_gethostbyname_r = 'yes'; then
+ AC_MSG_CHECKING(for gethostbyname_r)
+ if test -z "$ac_cv_gethostbyname_args"; then
+ AC_TRY_COMPILE(
+@@ -565,6 +564,13 @@
+ 	AC_DEFINE(HAVE_GETHOSTBYNAME_R_6,1,[gethostbyname_r takes 6 arguments])
+     fi
+     AC_MSG_RESULT([yes, and it takes $ac_cv_gethostbyname_args arguments])
++fi
++else
++dnl Check for gethostbyname()
++AC_CHECK_FUNC(gethostbyname)
++if test $ac_cv_func_gethostbyname = 'no'; then
++    AC_MSG_ERROR(***** fail on check gethostbyname())
++fi
+ fi
+ 
+ dnl Check for clamav in /etc/passwd
diff --git a/security/clamav-devel/files/patch-ltmain.sh b/security/clamav-devel/files/patch-ltmain.sh
deleted file mode 100644
index 74d32db0b279..000000000000
--- a/security/clamav-devel/files/patch-ltmain.sh
+++ /dev/null
@@ -1,23 +0,0 @@
---- ltmain.sh.orig	Sat Sep 27 05:20:20 2003
-+++ ltmain.sh	Sat Sep 27 05:24:02 2003
-@@ -4259,10 +4259,16 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
--	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
--	instname="$dir/$name"i
--	$show "$install_prog $instname $destdir/$name"
--	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	case $host in
-+	*-*-freebsd*)
-+	  # Do not install the useless pseudo-library
-+	;;
-+	*)
-+	  name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-+	  instname="$dir/$name"i
-+	  $show "$install_prog $instname $destdir/$name"
-+	  $run eval "$install_prog $instname $destdir/$name" || exit $?
-+	esac
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"