From 071f800f92bcc862ab54771bd40b95ed479da37c Mon Sep 17 00:00:00 2001 From: kristerw Date: Sat, 29 May 2004 20:45:34 +0000 Subject: Use PTHREAD_OPTS+=require instead of implementing the same functionality using if ${PTHREAD_TYPE} == "none" etc, and use the blessed pthread package instead of depending on devel/unproven-pthreads. Bump PKGREVISION. --- textproc/opensp/Makefile | 9 +++------ textproc/opensp/buildlink3.mk | 8 ++------ 2 files changed, 5 insertions(+), 12 deletions(-) (limited to 'textproc/opensp') diff --git a/textproc/opensp/Makefile b/textproc/opensp/Makefile index 60e27c16440..b7ff7059faf 100644 --- a/textproc/opensp/Makefile +++ b/textproc/opensp/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.20 2004/05/19 05:42:38 minskim Exp $ +# $NetBSD: Makefile,v 1.21 2004/05/29 20:45:34 kristerw Exp $ # DISTNAME= OpenSP-1.5.1 PKGNAME= ${DISTNAME:S/OpenSP/opensp/} +PKGREVISION= 1 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=openjade/} @@ -15,7 +16,7 @@ CONFLICTS+= sp-[0-9]* USE_BUILDLINK3= yes USE_PERL5= build USE_LIBTOOL= yes -PTHREAD_OPTS+= native +PTHREAD_OPTS+= require GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-http \ @@ -24,8 +25,4 @@ CONFIGURE_ARGS+= --enable-http \ .include "../../devel/gettext-lib/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" -.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none") -. include "../../devel/unproven-pthreads/buildlink3.mk" -.endif - .include "../../mk/bsd.pkg.mk" diff --git a/textproc/opensp/buildlink3.mk b/textproc/opensp/buildlink3.mk index ccd6a49ea2f..98b9f1c3bd9 100644 --- a/textproc/opensp/buildlink3.mk +++ b/textproc/opensp/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2004/05/19 05:42:38 minskim Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2004/05/29 20:45:34 kristerw Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ OPENSP_BUILDLINK3_MK:= ${OPENSP_BUILDLINK3_MK}+ @@ -15,13 +15,9 @@ BUILDLINK_DEPENDS.opensp+= opensp>=1.5.1 BUILDLINK_PKGSRCDIR.opensp?= ../../textproc/opensp .endif # OPENSP_BUILDLINK3_MK -PTHREAD_OPTS+= native +PTHREAD_OPTS+= require .include "../../devel/gettext-lib/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" -.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none") -. include "../../devel/unproven-pthreads/buildlink3.mk" -.endif - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} -- cgit v1.2.3