From 39ba9398d99f43684d87c93b5fed4b8aa369d6ed Mon Sep 17 00:00:00 2001
From: Michael Johnson <ahze@FreeBSD.org>
Date: Mon, 20 Dec 2004 04:55:50 +0000
Subject: - Fix build for 4.x users who define WITH_OPTIMIZED_CFLAGS and have
 SSE by   using internal libtool since we use gcc34 and libtool15 doesn't like
 a   different CC/CXX other than the one it was built with [1] - Fix plist if
 WITH_SMP_THREADS was defined - Bump PORTREVISION to force update of plist
 changes

Reported by:	marcus [1]
---
 math/fftw3/Makefile              |  7 +++++--
 math/fftw3/files/patch-ltmain.sh | 15 +++++++++++++++
 math/fftw3/pkg-plist             |  3 +++
 3 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 math/fftw3/files/patch-ltmain.sh

(limited to 'math/fftw3')

diff --git a/math/fftw3/Makefile b/math/fftw3/Makefile
index 8b9167ff378d..9a2349fadf24 100644
--- a/math/fftw3/Makefile
+++ b/math/fftw3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fftw3
 PORTVERSION=	3.0.1
-PORTREVISION?=	3
+PORTREVISION?=	4
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.fftw.org/pub/fftw/ 		\
 		http://www.fftw.org/ 			\
@@ -24,7 +24,7 @@ FFTW3_FLAVOR?=	default
 FFTW3_SUFX=
 
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_INC_LIBTOOL_VER=15
 USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_REINPLACE=	yes
 USE_PERL5_BUILD=yes
@@ -73,6 +73,9 @@ CONFIGURE_ENV+=	CFLAGS="${CFLAGS:N-O:N-O*} -O3 -fomit-frame-pointer -fno-schedul
 
 .if defined(WITH_SMP_THREADS)
 CONFIGURE_ARGS+=--enable-threads
+PLIST_SUB+=	THREADS=""
+.else
+PLIST_SUB+=	THREADS="@comment "
 .endif
 
 .if defined(FFTW3_FLAVOR)
diff --git a/math/fftw3/files/patch-ltmain.sh b/math/fftw3/files/patch-ltmain.sh
new file mode 100644
index 000000000000..d2b0fa90de55
--- /dev/null
+++ b/math/fftw3/files/patch-ltmain.sh
@@ -0,0 +1,15 @@
+--- ltmain.sh.orig	Sun Dec 19 23:35:06 2004
++++ ltmain.sh	Sun Dec 19 23:35:19 2004
+@@ -4280,10 +4280,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false ; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/math/fftw3/pkg-plist b/math/fftw3/pkg-plist
index 9973bc8d093f..66dab6394e8c 100644
--- a/math/fftw3/pkg-plist
+++ b/math/fftw3/pkg-plist
@@ -5,4 +5,7 @@ bin/fftw%%FFTW3_SUFX%%-wisdom
 lib/libfftw3%%FFTW3_SUFX%%.a
 lib/libfftw3%%FFTW3_SUFX%%.so
 lib/libfftw3%%FFTW3_SUFX%%.so.3
+%%THREADS%%lib/libfftw3%%FFTW3_SUFX%%_threads.a
+%%THREADS%%lib/libfftw3%%FFTW3_SUFX%%_threads.so
+%%THREADS%%lib/libfftw3%%FFTW3_SUFX%%_threads.so.3
 libdata/pkgconfig/fftw3%%FFTW3_SUFX%%.pc
-- 
cgit v1.2.3