ports/57057: Fix -pthread problem on current

[Rob]

The following reply was made to PR ports/57057; it has been noted by GNATS.

From: Rob <rob at debank.tv>
To: bug-followup at freebsd.org
Cc: Kris Kennaway <kris at obsecurity.org>
Subject: Re: ports/57057: Fix -pthread problem on current
Date: Mon, 22 Sep 2003 12:12:43 +0200

 Kris Kennaway wrote:
 > On Sun, Sep 21, 2003 at 05:04:44PM +0200, Rob Evers wrote:
 > 
 >>>Submitter-Id:	current-users
 >>>Originator:	Rob Evers
 >>>Organization:	
 >>>Confidential:	no 
 >>>Synopsis:	Fix -pthread problem on current
 >>>Severity:	non-critical
 >>>Priority:	low
 >>>Category:	ports
 >>>Class:		maintainer-update
 >>>Release:	FreeBSD 4.9-PRERELEASE i386
 >>>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.
 > 
 > 
 > This appears to be wrong on several counts.  FreeBSD 5.x supports
 > pthreads, so you don't need to add a dependency on some other thread
 > port.  Instead, you need to patch the port to use PTHREAD_LIBS and
 > PTHREAD_CFLAGS instead of hard-coding a specific value, because the
 > correct string is different on 4.x and 5.x.
 > 
 > 
 >>+share/nls/POSIX
 >>+share/nls/en_US.US-ASCII
 > 
 > 
 > This shouldn't be here either.
 > 
 > Kris
 
 
 OK, here's a new patch that uses REINPLACE and native pthreads.
 
 diff -ruN clamav-devel.org/Makefile clamav-devel/Makefile
 --- clamav-devel.org/Makefile   Thu Sep  4 04:53:25 2003
 +++ clamav-devel/Makefile       Mon Sep 22 12:06:47 2003
 @@ -7,6 +7,7 @@
 
   PORTNAME=      clamav
   PORTVERSION=   20030829
 +PORTREVISION=  1
   CATEGORIES=    security
   MASTER_SITES=  http://clamav.sourceforge.net/snapshot/
   PKGNAMESUFFIX= -devel
 @@ -22,6 +23,7 @@
                  arc:${PORTSDIR}/archivers/arc \
                  unzip:${PORTSDIR}/archivers/unzip
 
 +USE_REINPLACE= yes
   USE_GMAKE=     yes
   GNU_CONFIGURE= yes
   CONFIGURE_TARGET=      --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 @@ -53,6 +55,8 @@
   PLIST_SUB+=    CLAMAV-MILTER:="@comment "
   .endif
 
 +post-patch:
 +       @${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' 
 ${WRKSRC}/configure
   pre-install:
          @${ECHO} "===>  Creating custom user to run clamav..."
          ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL