From 5267e3335cf2b01b672cbc662b054f4ddc8b3618 Mon Sep 17 00:00:00 2001
From: kirby <kirby@openbsd.org>
Date: Tue, 23 Oct 2012 20:44:03 +0000
Subject: [PATCH] Enable threaded libs. OK pirofti@ library bump prodded by
 steven@, yes please by sthen@

---
 math/fftw3/Makefile                     | 15 +++++++++------
 math/fftw3/pkg/PFRAG.double-main        |  4 +++-
 math/fftw3/pkg/PFRAG.double-shared-main |  3 ++-
 math/fftw3/pkg/PFRAG.float-main         |  4 +++-
 math/fftw3/pkg/PFRAG.float-shared-main  |  3 ++-
 5 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/math/fftw3/Makefile b/math/fftw3/Makefile
index 9375894ada3..d47c400ada7 100644
--- a/math/fftw3/Makefile
+++ b/math/fftw3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2012/03/29 13:38:40 sthen Exp $
+# $OpenBSD: Makefile,v 1.23 2012/10/23 20:44:03 kirby Exp $
 
 COMMENT-main=	C routines for computing the Discrete Fourier Transform
 COMMENT-common=	common files for the fftw3 packages
@@ -10,10 +10,12 @@ FULLPKGNAME-main=	fftw3-${V}
 # XXX set it to its default value so that bsd.port.mk won't whine
 FULLPKGPATH-main=	math/fftw3,-main${FLAVOR_EXT:S/-/,/g}
 FULLPKGNAME-common=	fftw3-common-${V}
-REVISION-main=	0
+REVISION-main=	1
 REVISION-common=0
-SHARED_LIBS=	fftw3	5.0 \
-		fftw3f	5.0
+SHARED_LIBS=	fftw3	6.0 \
+		fftw3f	6.0 \
+		fftw3_threads	0.0 \
+		fftw3f_threads	0.0
 CATEGORIES=	math
 
 HOMEPAGE=	http://www.fftw.org/
@@ -40,7 +42,8 @@ USE_LIBTOOL=	Yes
 USE_GROFF =	Yes
 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--enable-portable-binary
+		--enable-portable-binary \
+		--enable-threads
 
 .if ${FLAVOR} == "float"
 CONFIGURE_ARGS+=--enable-float
@@ -49,7 +52,7 @@ FULLPKGNAME-main=	fftw3-float-${V}
 
 FULLPKGPATH-common=	math/fftw3,-common
 RUN_DEPENDS-main=	${FULLPKGPATH-common}
-WANTLIB-main=		c m
+WANTLIB-main=		c m pthread
 PKG_ARCH-common=	*
 
 post-install:
diff --git a/math/fftw3/pkg/PFRAG.double-main b/math/fftw3/pkg/PFRAG.double-main
index f4359f7a91d..5aabc63f7e1 100644
--- a/math/fftw3/pkg/PFRAG.double-main
+++ b/math/fftw3/pkg/PFRAG.double-main
@@ -1,8 +1,10 @@
-@comment $OpenBSD: PFRAG.double-main,v 1.2 2008/10/08 22:27:22 steven Exp $
+@comment $OpenBSD: PFRAG.double-main,v 1.3 2012/10/23 20:44:03 kirby Exp $
 @pkgpath math/fftw3
 @pkgpath math/fftw3,double
 @bin bin/fftw-wisdom
 lib/libfftw3.a
 lib/libfftw3.la
+lib/libfftw3_threads.a
+lib/libfftw3_threads.la
 lib/pkgconfig/fftw3.pc
 @man man/man1/fftw-wisdom.1
diff --git a/math/fftw3/pkg/PFRAG.double-shared-main b/math/fftw3/pkg/PFRAG.double-shared-main
index 9de764b8b0b..f7c35f2faa5 100644
--- a/math/fftw3/pkg/PFRAG.double-shared-main
+++ b/math/fftw3/pkg/PFRAG.double-shared-main
@@ -1,2 +1,3 @@
-@comment $OpenBSD: PFRAG.double-shared-main,v 1.1 2006/11/21 20:42:30 steven Exp $
+@comment $OpenBSD: PFRAG.double-shared-main,v 1.2 2012/10/23 20:44:03 kirby Exp $
 @lib lib/libfftw3.so.${LIBfftw3_VERSION}
+@lib lib/libfftw3_threads.so.${LIBfftw3_threads_VERSION}
diff --git a/math/fftw3/pkg/PFRAG.float-main b/math/fftw3/pkg/PFRAG.float-main
index f0452c33c10..a246173f5f1 100644
--- a/math/fftw3/pkg/PFRAG.float-main
+++ b/math/fftw3/pkg/PFRAG.float-main
@@ -1,7 +1,9 @@
-@comment $OpenBSD: PFRAG.float-main,v 1.2 2008/10/08 22:27:22 steven Exp $
+@comment $OpenBSD: PFRAG.float-main,v 1.3 2012/10/23 20:44:04 kirby Exp $
 @pkgpath math/fftw3,float
 @bin bin/fftwf-wisdom
 lib/libfftw3f.a
 lib/libfftw3f.la
+lib/libfftw3f_threads.a
+lib/libfftw3f_threads.la
 lib/pkgconfig/fftw3f.pc
 @man man/man1/fftwf-wisdom.1
diff --git a/math/fftw3/pkg/PFRAG.float-shared-main b/math/fftw3/pkg/PFRAG.float-shared-main
index 0135edeb720..bc2bdc82d55 100644
--- a/math/fftw3/pkg/PFRAG.float-shared-main
+++ b/math/fftw3/pkg/PFRAG.float-shared-main
@@ -1,2 +1,3 @@
-@comment $OpenBSD: PFRAG.float-shared-main,v 1.1 2006/11/21 20:42:30 steven Exp $
+@comment $OpenBSD: PFRAG.float-shared-main,v 1.2 2012/10/23 20:44:04 kirby Exp $
 @lib lib/libfftw3f.so.${LIBfftw3f_VERSION}
+@lib lib/libfftw3f_threads.so.${LIBfftw3f_threads_VERSION}