From 102398f45af0dc85ff09b1df0ce02a40b3a96149 Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Mon, 9 Jun 2008 23:55:20 +0000 Subject: [PATCH] - Forgot to remove one conditional about PTHREAD_LIB on last commit --- security/clamav-devel/Makefile | 12 ++++-------- security/clamav/Makefile | 12 ++++-------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/security/clamav-devel/Makefile b/security/clamav-devel/Makefile index bfb38e60a431..fd7935b4156c 100644 --- a/security/clamav-devel/Makefile +++ b/security/clamav-devel/Makefile @@ -59,6 +59,10 @@ CPPFLAGS+= -I${LOCALBASE}/include \ LDFLAGS+= -L${LOCALBASE}/lib \ ${PTHREAD_LIBS} +# This port has a problem with -pthread, +# force to use -lthr until it's not fixed. +PTHREAD_LIBS= -lthr + MAN1= clamconf.1 \ clamscan.1 \ freshclam.1 \ @@ -103,14 +107,6 @@ PLIST_SUB+= CLAMAVUSER=${CLAMAVUSER} \ .include -# This port has a problem with -pthread, -# force to use -lthr until it's not fixed. -.if ${OSVERSION} >= 601000 -PTHREAD_LIBS= -lthr -.else -PTHREAD_LIBS= -lpthread -.endif - .if defined(WITH_ARC) RUN_DEPENDS+= arc:${PORTSDIR}/archivers/arc .endif diff --git a/security/clamav/Makefile b/security/clamav/Makefile index 0af57b9282a7..f740f14150ff 100644 --- a/security/clamav/Makefile +++ b/security/clamav/Makefile @@ -54,6 +54,10 @@ CPPFLAGS+= -I${LOCALBASE}/include \ LDFLAGS+= -L${LOCALBASE}/lib \ ${PTHREAD_LIBS} +# This port has a problem with -pthread, +# force to use -lthr until it's not fixed. +PTHREAD_LIBS= -lthr + MAN1= clamconf.1 \ clamscan.1 \ freshclam.1 \ @@ -98,14 +102,6 @@ PLIST_SUB+= CLAMAVUSER=${CLAMAVUSER} \ .include -# This port has a problem with -pthread, -# force to use -lthr until it's not fixed. -.if ${OSVERSION} >= 601000 -PTHREAD_LIBS= -lthr -.else -PTHREAD_LIBS= -lpthread -.endif - .if defined(WITH_ARC) RUN_DEPENDS+= arc:${PORTSDIR}/archivers/arc .endif