Add a patch to configure so that it correctly determines the way

the Fortran compiler mangles function names.  Don't delete the
libtool .la file after installation -- they might be useful for something.

4 files changed, 50 insertions, 7 deletions

diff --git a/math/fftw/Makefile b/math/fftw/Makefile
index 59b001e6b17..45dbef6599d 100644
--- a/math/fftw/Makefile
+++ b/math/fftw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/17 18:22:21 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/04/27 22:22:22 jtb Exp $
 
 DISTNAME=		fftw-2.1.3
 CATEGORIES=		math
@@ -17,8 +17,4 @@ USE_FORTRAN=		yes
 USE_GMAKE=		yes
 INFO_FILES=		fftw.info
 
-post-install:
-	@${RM} -f ${LOCALBASE}/lib/librfftw.la
-	@${RM} -f ${LOCALBASE}/lib/libfftw.la
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/fftw/distinfo b/math/fftw/distinfo
index 5ef894a7fe9..298e01ff6e9 100644
--- a/math/fftw/distinfo
+++ b/math/fftw/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 08:45:40 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/04/27 22:22:22 jtb Exp $
 
 SHA1 (fftw-2.1.3.tar.gz) = 5796f2f904f66630024bf130880ec845333cda18
 Size (fftw-2.1.3.tar.gz) = 1139406 bytes
 SHA1 (patch-aa) = 7a451f7aa2d4fe0e5134d014006c63d077951726
+SHA1 (patch-ab) = 64fdc5b9a8d6da22714ec0f05ff7716bfcbc696a
diff --git a/math/fftw/patches/patch-ab b/math/fftw/patches/patch-ab
new file mode 100644
index 00000000000..8d4fd83be3d
--- /dev/null
+++ b/math/fftw/patches/patch-ab
@@ -0,0 +1,44 @@
+$NetBSD: patch-ab,v 1.1 2001/04/27 22:22:23 jtb Exp $
+
+--- configure.orig	Mon Nov  8 01:45:45 1999
++++ configure
+@@ -2215,6 +2215,7 @@
+ int main() {
+ foobar();
+ ; return 0; }
++void MAIN__(void){abort();}
+ EOF
+ if { (eval echo configure:2220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+@@ -2230,6 +2231,7 @@
+ int main() {
+ foobar_();
+ ; return 0; }
++void MAIN__(void){abort();}
+ EOF
+ if { (eval echo configure:2235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+@@ -2245,6 +2247,7 @@
+ int main() {
+ FOOBAR();
+ ; return 0; }
++void MAIN__(void){abort();}
+ EOF
+ if { (eval echo configure:2250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+@@ -2260,6 +2263,7 @@
+ int main() {
+ FOOBAR_();
+ ; return 0; }
++void MAIN__(void){abort();}
+ EOF
+ if { (eval echo configure:2265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+@@ -2337,6 +2341,7 @@
+ int main() {
+ $mangle_try();
+ ; return 0; }
++void MAIN__(void){abort();}
+ EOF
+ if { (eval echo configure:2342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
diff --git a/math/fftw/pkg/PLIST b/math/fftw/pkg/PLIST
index 183eebb95d5..7adba7f042d 100644
--- a/math/fftw/pkg/PLIST
+++ b/math/fftw/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2001/01/04 15:10:49 agc Exp $
+@comment $NetBSD: PLIST,v 1.5 2001/04/27 22:22:23 jtb Exp $
 @unexec install-info --delete %D/info/fftw.info %D/info/dir
 info/fftw.info
 info/fftw.info-1
@@ -10,10 +10,12 @@ info/fftw.info-5
 include/fftw.h
 include/rfftw.h
 lib/libfftw.a
+lib/libfftw.la
 lib/libfftw.so
 lib/libfftw.so.2
 lib/libfftw.so.2.5
 lib/librfftw.a
+lib/librfftw.la
 lib/librfftw.so
 lib/librfftw.so.2
 lib/librfftw.so.2.5