ports/57057: Fix -pthread problem on current

[Rob Evers]

>Number:         57057
>Category:       ports
>Synopsis:       Fix -pthread problem on current
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Sep 21 08:10:14 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Rob Evers
>Release:        FreeBSD 4.9-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD haha.debank.tv 4.9-PRERELEASE FreeBSD 4.9-PRERELEASE #0: Thu Sep 18 16:37:14 CEST 2003 rob at haha.debank.tv:/usr/obj/usr/src/sys/HAHA i386


	
>Description:
Fix -pthread problems on current, use a replacement thread implementation.
>How-To-Repeat:
>Fix:

diff -urN clamav-devel.org/Makefile clamav-devel/Makefile
--- clamav-devel.org/Makefile   Thu Sep  4 04:53:25 2003
+++ clamav-devel/Makefile       Sun Sep 21 17:03:31 2003
@@ -43,6 +43,9 @@
 # compiles only with optimizer
 CFLAGS+=       -O
 LDFLAGS+=      -lcipher
+.else
+LIB_DEPENDS+=  pthread.10:${PORTSDIR}/devel/ngpt
+EXTRA_PATCHES+=        ${FILESDIR}/pthread.diff
 .endif
 
 .if defined(WITH_MILTER)
diff -urN clamav-devel.org/files/pthread.diff clamav-devel/files/pthread.diff
--- clamav-devel.org/files/pthread.diff Thu Jan  1 01:00:00 1970
+++ clamav-devel/files/pthread.diff     Sun Sep 21 15:48:50 2003
@@ -0,0 +1,13 @@
+--- configure.orig     Fri Aug 29 05:54:57 2003
++++ configure  Sun Sep 21 15:40:39 2003
+@@ -9089,8 +9089,8 @@
+     ;;
+ freebsd*)
+     if test "$have_pthreads" = "yes"; then
+-      LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread -lc_r"
+-      CLAMD_LIBS="-pthread -lc_r"
++      LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread -lc_r"
++      CLAMD_LIBS="-lpthread -lc_r"
+       TH_SAFE="-thread-safe"
+       cat >>confdefs.h <<\_ACEOF
+ #define CL_THREAD_SAFE 1
diff -urN clamav-devel.org/pkg-plist clamav-devel/pkg-plist
--- clamav-devel.org/pkg-plist  Thu Sep  4 04:53:25 2003
+++ clamav-devel/pkg-plist      Sun Sep 21 17:00:07 2003
@@ -11,6 +11,8 @@
 lib/libclamav.la
 lib/libclamav.a
 share/clamav/mirrors.txt
+share/nls/POSIX
+share/nls/en_US.US-ASCII
 @exec chown clamav share/clamav share/clamav/mirrors.txt share/clamav/viruses.db share/clamav/viruses.db2
 @dirrm share/clamav
 @unexec rmuser -y clamav


>Release-Note:
>Audit-Trail:
>Unformatted: