Attachment #90189 for bug #127310

View | Details | Raw Unified | Return to bug 127310
Collapse All | Expand All

Lines 6-12 Link Here

(-)Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= clamav	8	PORTNAME= clamav
9	PORTVERSION= 0.93.3	9	PORTVERSION= 0.94
10	CATEGORIES= security	10	CATEGORIES= security
11	MASTER_SITES= SF	11	MASTER_SITES= SF
12		12

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (clamav-0.93.3.tar.gz) = 06d87fbece062e5c0661ee07703208c9	1	MD5 (clamav-0.94.tar.gz) = d3f6d5fff2db81950491749166ab0ffa
2	SHA256 (clamav-0.93.3.tar.gz) = 7aa98796671dfe3db5a20e25669404c4e4461d2a6c77de352edf99f2c989e500	2	SHA256 (clamav-0.94.tar.gz) = ae188c18936ea9154eb6a85ea553c29f4349ee3e95457055fae5fe1b981af602
3	SIZE (clamav-0.93.3.tar.gz) = 18242568	3	SIZE (clamav-0.94.tar.gz) = 20509228




lib/libclamav.a
lib/libclamav.la
lib/libclamav.so
lib/libclamav.so.5
%%UNRAR%%lib/libclamunrar.a
%%UNRAR%%lib/libclamunrar.la
%%UNRAR%%lib/libclamunrar.so
%%UNRAR%%lib/libclamunrar.so.5
%%UNRAR%%lib/libclamunrar_iface.a
%%UNRAR%%lib/libclamunrar_iface.la
%%UNRAR%%lib/libclamunrar_iface.so
%%UNRAR%%lib/libclamunrar_iface.so.5
libdata/pkgconfig/libclamav.pc
@unexec if cmp -s %D/etc/clamd.conf %D/etc/clamd.conf.default; then rm -f %D/etc/clamd.conf; fi
etc/clamd.conf.default




--- configure.orig	2008-09-01 11:41:18.000000000 -0700
+++ configure	2008-09-11 21:40:30.703529448 -0700
@@ -16542,7 +16542,6 @@
     ;;
 freebsd[45]*)
     if test "$have_pthreads" = "yes"; then
-	THREAD_LIBS="-pthread -lc_r"
 	TH_SAFE="-thread-safe"
 
 cat >>confdefs.h <<\_ACEOF
@@ -16571,7 +16570,7 @@
     ;;
 freebsd*)
     if test "$have_pthreads" = "yes"; then
-	THREAD_LIBS="-lthr"
+	THREAD_LIBS="%%PTHREAD_LIBS%%"
 	TH_SAFE="-thread-safe"
 
 cat >>confdefs.h <<\_ACEOF
@@ -16931,7 +16930,7 @@
 if test "$have_milter" = "yes"; then
 
         save_LDFLAGS="$LDFLAGS"
-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
+	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS %%PTHREAD_LIBS%%"
     if test -d /usr/lib/libmilter ; then
 	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -L/usr/lib/libmilter"
     fi
@@ -17468,19 +17467,25 @@
     sendmailver_c=`echo $sendmailver | awk -F. '{printf $3}'`
 
 

+fi
 
   fi
   if test "x$ac_cv_have_lresolv_r" != "xyes"; then
@@ -23087,7 +23093,7 @@
     ;;
 freebsd*)
     if test "$have_pthreads" = "yes"; then
-	THREAD_LIBS="-pthread -lc_r"
+	THREAD_LIBS="%%PTHREAD_LIBS%%"
 	TH_SAFE="-thread-safe"
 
 cat >>confdefs.h <<\_ACEOF
@@ -23427,7 +23433,7 @@
 if test "$have_milter" = "yes"; then
 
         save_LDFLAGS="$LDFLAGS"
-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
+	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS %%PTHREAD_LIBS%%"
     if test -d /usr/lib/libmilter ; then
 	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -L/usr/lib/libmilter"
     fi

Return to bug 127310

Lines 12-26 include/clamav-config.h Link Here

(-)pkg-plist (-3 / +3 lines)
12	lib/libclamav.a	12	lib/libclamav.a
13	lib/libclamav.la	13	lib/libclamav.la
14	lib/libclamav.so	14	lib/libclamav.so
15	lib/libclamav.so.4	15	lib/libclamav.so.5
16	%%UNRAR%%lib/libclamunrar.a	16	%%UNRAR%%lib/libclamunrar.a
17	%%UNRAR%%lib/libclamunrar.la	17	%%UNRAR%%lib/libclamunrar.la
18	%%UNRAR%%lib/libclamunrar.so	18	%%UNRAR%%lib/libclamunrar.so
19	%%UNRAR%%lib/libclamunrar.so.4	19	%%UNRAR%%lib/libclamunrar.so.5
20	%%UNRAR%%lib/libclamunrar_iface.a	20	%%UNRAR%%lib/libclamunrar_iface.a
21	%%UNRAR%%lib/libclamunrar_iface.la	21	%%UNRAR%%lib/libclamunrar_iface.la
22	%%UNRAR%%lib/libclamunrar_iface.so	22	%%UNRAR%%lib/libclamunrar_iface.so
23	%%UNRAR%%lib/libclamunrar_iface.so.4	23	%%UNRAR%%lib/libclamunrar_iface.so.5
24	libdata/pkgconfig/libclamav.pc	24	libdata/pkgconfig/libclamav.pc
25	@unexec if cmp -s %D/etc/clamd.conf %D/etc/clamd.conf.default; then rm -f %D/etc/clamd.conf; fi	25	@unexec if cmp -s %D/etc/clamd.conf %D/etc/clamd.conf.default; then rm -f %D/etc/clamd.conf; fi
26	etc/clamd.conf.default	26	etc/clamd.conf.default

Lines 1-6 Link Here

(-)files/patch-configure (-22 / +30 lines)
1	--- configure.orig Thu Mar 1 20:46:19 2007	1	--- configure.orig 2008-09-01 11:41:18.000000000 -0700
2	+++ configure Tue Mar 13 10:28:27 2007	2	+++ configure 2008-09-11 21:40:30.703529448 -0700
3	@@ -22431,19 +22431,25 @@	3	@@ -16542,7 +16542,6 @@
		4	;;
		5	freebsd[45]*)
		6	if test "$have_pthreads" = "yes"; then
		7	- THREAD_LIBS="-pthread -lc_r"
		8	TH_SAFE="-thread-safe"
		9
		10	cat >>confdefs.h <<\_ACEOF
		11	@@ -16571,7 +16570,7 @@
		12	;;
		13	freebsd*)
		14	if test "$have_pthreads" = "yes"; then
		15	- THREAD_LIBS="-lthr"
		16	+ THREAD_LIBS="%%PTHREAD_LIBS%%"
		17	TH_SAFE="-thread-safe"
		18
		19	cat >>confdefs.h <<\_ACEOF
		20	@@ -16931,7 +16930,7 @@
		21	if test "$have_milter" = "yes"; then
		22
		23	save_LDFLAGS="$LDFLAGS"
		24	- CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
		25	+ CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS %%PTHREAD_LIBS%%"
		26	if test -d /usr/lib/libmilter ; then
		27	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -L/usr/lib/libmilter"
		28	fi
		29	@@ -17468,19 +17467,25 @@
4	sendmailver_c=`echo $sendmailver \| awk -F. '{printf $3}'`	30	sendmailver_c=`echo $sendmailver \| awk -F. '{printf $3}'`
5		31
6		32
Lines 25-46 Link Here
25	+fi	51	+fi
26		52
27	fi	53	fi
28	fi	54	if test "x$ac_cv_have_lresolv_r" != "xyes"; then
29	@@ -23087,7 +23093,7 @@
30	;;
31	freebsd*)
32	if test "$have_pthreads" = "yes"; then
33	- THREAD_LIBS="-pthread -lc_r"
34	+ THREAD_LIBS="%%PTHREAD_LIBS%%"
35	TH_SAFE="-thread-safe"
36
37	cat >>confdefs.h <<\_ACEOF
38	@@ -23427,7 +23433,7 @@
39	if test "$have_milter" = "yes"; then
40
41	save_LDFLAGS="$LDFLAGS"
42	- CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
43	+ CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS %%PTHREAD_LIBS%%"
44	if test -d /usr/lib/libmilter ; then
45	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -L/usr/lib/libmilter"
46	fi