3 files changed, 61 insertions, 41 deletions

diff --git a/security/clamav-devel/files/patch-configure b/security/clamav-devel/files/patch-configure
deleted file mode 100644
index c2d83239eecd..000000000000
--- a/security/clamav-devel/files/patch-configure
+++ /dev/null
@@ -1,26 +0,0 @@
---- configure.bak	Fri Feb  6 14:46:08 2004
-+++ configure	Tue Feb 10 17:44:13 2004
-@@ -9316,23 +9316,12 @@
- 
- 
- 
--if test ! -r "$cfg_dir/clamav.conf"; then
--  INSTALL_CLAMAV_CONF_TRUE=
--  INSTALL_CLAMAV_CONF_FALSE='#'
--else
-   INSTALL_CLAMAV_CONF_TRUE='#'
-   INSTALL_CLAMAV_CONF_FALSE=
--fi
- 
- 
--
--if test ! -r "$cfg_dir/freshclam.conf"; then
--  INSTALL_FRESHCLAM_CONF_TRUE=
--  INSTALL_FRESHCLAM_CONF_FALSE='#'
--else
-   INSTALL_FRESHCLAM_CONF_TRUE='#'
-   INSTALL_FRESHCLAM_CONF_FALSE=
--fi
- 
- 
- if test "$test_urandom" = "yes"
diff --git a/security/clamav-devel/files/patch-configure.in b/security/clamav-devel/files/patch-configure.in
new file mode 100644
index 000000000000..5604d944491b
--- /dev/null
+++ b/security/clamav-devel/files/patch-configure.in
@@ -0,0 +1,61 @@
+--- 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
diff --git a/security/clamav-devel/files/patch-database_Makefile.in b/security/clamav-devel/files/patch-database_Makefile.in
deleted file mode 100644
index ff745761e284..000000000000
--- a/security/clamav-devel/files/patch-database_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
---- database/Makefile.in.orig	Tue Feb 10 17:19:06 2004
-+++ database/Makefile.in	Tue Feb 10 17:19:38 2004
-@@ -248,9 +248,9 @@
- 
- install:
- 	$(mkinstalldirs) $(DESTDIR)$(DBINST)
--	test -f $(DESTDIR)$(DBINST)/main.cvd || @$(INSTALL_DATA) main.cvd $(DESTDIR)$(DBINST)
--	test -f $(DESTDIR)$(DBINST)/daily.cvd || @$(INSTALL_DATA) daily.cvd $(DESTDIR)$(DBINST)
--	test -f $(DESTDIR)$(DBINST)/mirrors.txt || @$(INSTALL_DATA) mirrors.txt $(DESTDIR)$(DBINST)
-+	test -f $(DESTDIR)$(DBINST)/main.cvd || $(INSTALL_DATA) main.cvd $(DESTDIR)$(DBINST)
-+	test -f $(DESTDIR)$(DBINST)/daily.cvd || $(INSTALL_DATA) daily.cvd $(DESTDIR)$(DBINST)
-+	test -f $(DESTDIR)$(DBINST)/mirrors.txt || $(INSTALL_DATA) mirrors.txt $(DESTDIR)$(DBINST)
- 	test -f $(DESTDIR)$(DBINST)/viruses.db && rm -f $(DESTDIR)$(DBINST)/viruses.db || true
- 	test -f $(DESTDIR)$(DBINST)/viruses.db2 && rm -f $(DESTDIR)$(DBINST)/viruses.db2 || true
- 	@if test `id -u` -eq 0 && test -n "${CLAMAVUSER}" && test -n "${CLAMAVGROUP}"; then \