Roll the 13 trivial patches into one (save some inodes!). Clean it up a bit.

16 files changed, 142 insertions, 165 deletions

diff --git a/math/fftpack/Makefile b/math/fftpack/Makefile
index 1829fc8355e..f094cb05ae6 100644
--- a/math/fftpack/Makefile
+++ b/math/fftpack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/12/01 01:49:46 jtb Exp $
+# $NetBSD: Makefile,v 1.4 2001/01/22 23:30:01 jtb Exp $
 
 DISTNAME=		fftpack-20001130
 CATEGORIES=		math
@@ -6,16 +6,13 @@ MASTER_SITES=		${MASTER_SITE_LOCAL}
 
 MAINTAINER=		jtb@netbsd.org
 
+NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 WRKSRC=			${WRKDIR}/fftpack
-
 USE_LIBTOOL=		YES
 UES_FORTRAN=		YES
 
-.include "../../mk/bsd.prefs.mk"
-
 post-extract:
-	@${SED} -e 's:%%FORTRAN%%:'${FC}':g' \
-	< ${FILESDIR}/Makefile > ${WRKSRC}/Makefile
+	${CP} ${FILESDIR}/Makefile ${WRKSRC}
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/fftpack
diff --git a/math/fftpack/files/Makefile b/math/fftpack/files/Makefile
index 26f8d31255a..c99278b9442 100644
--- a/math/fftpack/files/Makefile
+++ b/math/fftpack/files/Makefile
@@ -1,12 +1,16 @@
 LIB 	= fftpack
 
 LIBDIR	= ${PREFIX}/lib
-FORTRAN = %%FORTRAN%%
-FOPTS	= -O3
 
-all:	lib$(LIB)
+.if $(FC)=="f77" || $(FC)=="g77"
+FOPTS=-funroll-loops -O2
+.else
+FOPTS=-O2
+.endif
 
-OBJ =	cfftb.o cosqf1.o passb2.o radb2.o radfg.o		\
+all:	lib$(LIB).la
+
+OBJS =	cfftb.o cosqf1.o passb2.o radb2.o radfg.o		\
 	sinqi.o cfftb1.o cosqi.o passb3.o radb3.o rfftb.o	\
 	sint.o cfftf.o cost.o passb4.o radb4.o rfftb1.o		\
 	sint1.o cfftf1.o costi.o passb5.o radb5.o rfftf.o	\
@@ -16,15 +20,15 @@ OBJ =	cfftb.o cosqf1.o passb2.o radb2.o radfg.o		\
 	ezffti.o passf4.o radf4.o sinqb.o cosqf.o passb.o	\
 	passf5.o radf5.o sinqf.o
 
-lib$(LIB):	$(OBJ)
-	@$(LIBTOOL) --mode=link $(FORTRAN) $(FFLAGS) $(FOPTS) \
-	-O -o lib$(LIB).la $(OBJ:.o=.lo) --version-info 0:0 -rpath $(LIBDIR)
+lib$(LIB).la:	$(OBJS)
+	$(LIBTOOL) --mode=link $(FC) $(FFLAGS) $(FOPTS) \
+	-o $@ $(OBJS:.o=.lo)  -rpath $(LIBDIR) --version-info 0:0
 
 .f.o:
-	@$(LIBTOOL) --mode=compile $(FORTRAN) $(FFLAGS) $(FOPTS) -c $<
+	$(LIBTOOL) --mode=compile $(FC) $(FFLAGS) $(FOPTS) -c $<
 
-install:	lib$(LIB)
-	@$(LIBTOOL) --mode=install install -c lib$(LIB).la $(LIBDIR)
+install:	lib$(LIB).la
+	$(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) $? $(LIBDIR)
 
 clean:
 	rm -rf *.o *.lo .libs lib$(LIB).la
diff --git a/math/fftpack/files/patch-sum b/math/fftpack/files/patch-sum
index eaadd99611f..9a69e1fc714 100644
--- a/math/fftpack/files/patch-sum
+++ b/math/fftpack/files/patch-sum
@@ -1,15 +1,3 @@
-$NetBSD: patch-sum,v 1.1.1.1 2000/11/28 02:17:02 jtb Exp $
+$NetBSD: patch-sum,v 1.2 2001/01/22 23:30:02 jtb Exp $
 
-MD5 (patch-aa) = 2ce242bf4f6517e26ebfe052478aeec9
-MD5 (patch-ab) = a22c8f5b2db45ab0158e99b06f3597c2
-MD5 (patch-ac) = a03c41bcc139ba8354f31a588ffb7fdc
-MD5 (patch-ad) = 3696c86d63c5a3172b7c243dd5d0be55
-MD5 (patch-ae) = 25ffafb4fb407e377d87d9b724ac26ac
-MD5 (patch-af) = 95fc40b0e2c4c40ab63a081200e1a437
-MD5 (patch-ag) = e6a00232fa52bebd03097bdde5adb9ee
-MD5 (patch-ah) = 78c1dc78af77b77a4f230911c422549c
-MD5 (patch-ai) = 200a7967826bf87d9b241fef609e05f7
-MD5 (patch-aj) = 640b261c2017e9e0d1be71aa0b9931d5
-MD5 (patch-ak) = e667ba2273c8c192e9d3b460b8d70802
-MD5 (patch-al) = 0640528d8710ee8e0da7cd1926553000
-MD5 (patch-am) = da441cdff0119b5d8dcee2b852f245c1
+MD5 (patch-aa) = 3cc50a4e648fef18518a38cf2407c4f1
diff --git a/math/fftpack/patches/patch-aa b/math/fftpack/patches/patch-aa
index 8e9e8756d07..2911a34210a 100644
--- a/math/fftpack/patches/patch-aa
+++ b/math/fftpack/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/11/28 02:17:03 jtb Exp $
+$NetBSD: patch-aa,v 1.2 2001/01/22 23:30:02 jtb Exp $
 
 --- cfftb1.f.orig	Fri Nov 17 16:48:23 2000
 +++ cfftb1.f
@@ -9,3 +9,125 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/11/28 02:17:03 jtb Exp $
        NF = IFAC(2)
        NA = 0
        L1 = 1
+
+--- cfftf1.f.orig	Fri Nov 17 16:48:23 2000
++++ cfftf1.f
+@@ -1,5 +1,5 @@
+       SUBROUTINE CFFTF1 (N,C,CH,WA,IFAC)
+-      DIMENSION       CH(1)      ,C(1)       ,WA(1)      ,IFAC(1)
++      DIMENSION       CH(1)      ,C(1)       ,WA(1)      ,IFAC(*)
+       NF = IFAC(2)
+       NA = 0
+       L1 = 1
+
+--- cffti1.f.orig	Fri Nov 17 16:48:23 2000
++++ cffti1.f
+@@ -1,5 +1,5 @@
+       SUBROUTINE CFFTI1 (N,WA,IFAC)
+-      DIMENSION       WA(1)      ,IFAC(1)    ,NTRYH(4)
++      DIMENSION       WA(1)      ,IFAC(*)    ,NTRYH(4)
+       DATA NTRYH(1),NTRYH(2),NTRYH(3),NTRYH(4)/3,4,2,5/
+       NL = N
+       NF = 0
+
+--- cosqb.f.orig	Fri Nov 17 16:48:23 2000
++++ cosqb.f
+@@ -1,5 +1,5 @@
+       SUBROUTINE COSQB (N,X,WSAVE)
+-      DIMENSION       X(1)       ,WSAVE(1)
++      DIMENSION       X(*)       ,WSAVE(1)
+       DATA TSQRT2 /2.82842712474619/
+       IF (N-2) 101,102,103
+   101 X(1) = 4.*X(1)
+
+--- cosqf.f.orig	Fri Nov 17 16:48:23 2000
++++ cosqf.f
+@@ -1,5 +1,5 @@
+       SUBROUTINE COSQF (N,X,WSAVE)
+-      DIMENSION       X(1)       ,WSAVE(1)
++      DIMENSION       X(*)       ,WSAVE(1)
+       DATA SQRT2 /1.4142135623731/
+       IF (N-2) 102,101,103
+   101 TSQX = SQRT2*X(2)
+
+--- cost.f.orig	Fri Nov 17 16:48:23 2000
++++ cost.f
+@@ -1,5 +1,5 @@
+       SUBROUTINE COST (N,X,WSAVE)
+-      DIMENSION       X(1)       ,WSAVE(1)
++      DIMENSION       X(*)       ,WSAVE(1)
+       NM1 = N-1
+       NP1 = N+1
+       NS2 = N/2
+
+--- ezfft1.f.orig	Fri Nov 17 16:48:23 2000
++++ ezfft1.f
+@@ -1,5 +1,5 @@
+       SUBROUTINE EZFFT1 (N,WA,IFAC)
+-      DIMENSION       WA(1)      ,IFAC(1)    ,NTRYH(4)
++      DIMENSION       WA(1)      ,IFAC(*)    ,NTRYH(4)
+       DATA NTRYH(1),NTRYH(2),NTRYH(3),NTRYH(4)/4,2,3,5/
+      1    ,TPI/6.28318530717959/
+       NL = N
+
+--- ezfftb.f.orig	Fri Nov 17 16:48:23 2000
++++ ezfftb.f
+@@ -1,5 +1,5 @@
+       SUBROUTINE EZFFTB (N,R,AZERO,A,B,WSAVE)
+-      DIMENSION       R(1)       ,A(1)       ,B(1)       ,WSAVE(1)
++      DIMENSION       R(*)       ,A(1)       ,B(1)       ,WSAVE(1)
+       IF (N-2) 101,102,103
+   101 R(1) = AZERO
+       RETURN
+
+--- ezfftf.f.orig	Fri Nov 17 16:48:24 2000
++++ ezfftf.f
+@@ -2,7 +2,7 @@
+ C
+ C                       VERSION 3  JUNE 1979
+ C
+-      DIMENSION       R(1)       ,A(1)       ,B(1)       ,WSAVE(1)
++      DIMENSION       R(*)       ,A(1)       ,B(1)       ,WSAVE(1)
+       IF (N-2) 101,102,103
+   101 AZERO = R(1)
+       RETURN
+
+--- rfftb1.f.orig	Fri Nov 17 16:48:24 2000
++++ rfftb1.f
+@@ -1,5 +1,5 @@
+       SUBROUTINE RFFTB1 (N,C,CH,WA,IFAC)
+-      DIMENSION       CH(1)      ,C(1)       ,WA(1)      ,IFAC(1)
++      DIMENSION       CH(1)      ,C(1)       ,WA(1)      ,IFAC(*)
+       NF = IFAC(2)
+       NA = 0
+       L1 = 1
+
+--- rfftf1.f.orig	Fri Nov 17 16:48:24 2000
++++ rfftf1.f
+@@ -1,5 +1,5 @@
+       SUBROUTINE RFFTF1 (N,C,CH,WA,IFAC)
+-      DIMENSION       CH(1)      ,C(1)       ,WA(1)      ,IFAC(1)
++      DIMENSION       CH(1)      ,C(1)       ,WA(1)      ,IFAC(*)
+       NF = IFAC(2)
+       NA = 1
+       L2 = N
+
+--- rffti1.f.orig	Fri Nov 17 16:48:24 2000
++++ rffti1.f
+@@ -1,5 +1,5 @@
+       SUBROUTINE RFFTI1 (N,WA,IFAC)
+-      DIMENSION       WA(1)      ,IFAC(1)    ,NTRYH(4)
++      DIMENSION       WA(1)      ,IFAC(*)    ,NTRYH(4)
+       DATA NTRYH(1),NTRYH(2),NTRYH(3),NTRYH(4)/4,2,3,5/
+       NL = N
+       NF = 0
+
+--- sint1.f.orig	Fri Nov 17 16:48:24 2000
++++ sint1.f
+@@ -1,5 +1,5 @@
+       SUBROUTINE SINT1(N,WAR,WAS,XH,X,IFAC)
+-      DIMENSION WAR(1),WAS(1),X(1),XH(1),IFAC(1)
++      DIMENSION WAR(1),WAS(1),X(1),XH(*),IFAC(1)
+       DATA SQRT3 /1.73205080756888/
+       DO 100 I=1,N
+       XH(I) = WAR(I)
diff --git a/math/fftpack/patches/patch-ab b/math/fftpack/patches/patch-ab
deleted file mode 100644
index f617a4e5259..00000000000
--- a/math/fftpack/patches/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/11/28 02:17:03 jtb Exp $
-
---- cfftf1.f.orig	Fri Nov 17 16:48:23 2000
-+++ cfftf1.f
-@@ -1,5 +1,5 @@
-       SUBROUTINE CFFTF1 (N,C,CH,WA,IFAC)
--      DIMENSION       CH(1)      ,C(1)       ,WA(1)      ,IFAC(1)
-+      DIMENSION       CH(1)      ,C(1)       ,WA(1)      ,IFAC(*)
-       NF = IFAC(2)
-       NA = 0
-       L1 = 1
diff --git a/math/fftpack/patches/patch-ac b/math/fftpack/patches/patch-ac
deleted file mode 100644
index 39f46278ec5..00000000000
--- a/math/fftpack/patches/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/11/28 02:17:03 jtb Exp $
-
---- cffti1.f.orig	Fri Nov 17 16:48:23 2000
-+++ cffti1.f
-@@ -1,5 +1,5 @@
-       SUBROUTINE CFFTI1 (N,WA,IFAC)
--      DIMENSION       WA(1)      ,IFAC(1)    ,NTRYH(4)
-+      DIMENSION       WA(1)      ,IFAC(*)    ,NTRYH(4)
-       DATA NTRYH(1),NTRYH(2),NTRYH(3),NTRYH(4)/3,4,2,5/
-       NL = N
-       NF = 0
diff --git a/math/fftpack/patches/patch-ad b/math/fftpack/patches/patch-ad
deleted file mode 100644
index 6028dc059c9..00000000000
--- a/math/fftpack/patches/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2000/11/28 02:17:03 jtb Exp $
-
---- cosqb.f.orig	Fri Nov 17 16:48:23 2000
-+++ cosqb.f
-@@ -1,5 +1,5 @@
-       SUBROUTINE COSQB (N,X,WSAVE)
--      DIMENSION       X(1)       ,WSAVE(1)
-+      DIMENSION       X(*)       ,WSAVE(1)
-       DATA TSQRT2 /2.82842712474619/
-       IF (N-2) 101,102,103
-   101 X(1) = 4.*X(1)
diff --git a/math/fftpack/patches/patch-ae b/math/fftpack/patches/patch-ae
deleted file mode 100644
index 59df70ffbb2..00000000000
--- a/math/fftpack/patches/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2000/11/28 02:17:03 jtb Exp $
-
---- cosqf.f.orig	Fri Nov 17 16:48:23 2000
-+++ cosqf.f
-@@ -1,5 +1,5 @@
-       SUBROUTINE COSQF (N,X,WSAVE)
--      DIMENSION       X(1)       ,WSAVE(1)
-+      DIMENSION       X(*)       ,WSAVE(1)
-       DATA SQRT2 /1.4142135623731/
-       IF (N-2) 102,101,103
-   101 TSQX = SQRT2*X(2)
diff --git a/math/fftpack/patches/patch-af b/math/fftpack/patches/patch-af
deleted file mode 100644
index b2ead1bb56b..00000000000
--- a/math/fftpack/patches/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2000/11/28 02:17:03 jtb Exp $
-
---- cost.f.orig	Fri Nov 17 16:48:23 2000
-+++ cost.f
-@@ -1,5 +1,5 @@
-       SUBROUTINE COST (N,X,WSAVE)
--      DIMENSION       X(1)       ,WSAVE(1)
-+      DIMENSION       X(*)       ,WSAVE(1)
-       NM1 = N-1
-       NP1 = N+1
-       NS2 = N/2
diff --git a/math/fftpack/patches/patch-ag b/math/fftpack/patches/patch-ag
deleted file mode 100644
index 94984780262..00000000000
--- a/math/fftpack/patches/patch-ag
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2000/11/28 02:17:03 jtb Exp $
-
---- ezfft1.f.orig	Fri Nov 17 16:48:23 2000
-+++ ezfft1.f
-@@ -1,5 +1,5 @@
-       SUBROUTINE EZFFT1 (N,WA,IFAC)
--      DIMENSION       WA(1)      ,IFAC(1)    ,NTRYH(4)
-+      DIMENSION       WA(1)      ,IFAC(*)    ,NTRYH(4)
-       DATA NTRYH(1),NTRYH(2),NTRYH(3),NTRYH(4)/4,2,3,5/
-      1    ,TPI/6.28318530717959/
-       NL = N
diff --git a/math/fftpack/patches/patch-ah b/math/fftpack/patches/patch-ah
deleted file mode 100644
index 682ba905388..00000000000
--- a/math/fftpack/patches/patch-ah
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 2000/11/28 02:17:03 jtb Exp $
-
---- ezfftb.f.orig	Fri Nov 17 16:48:23 2000
-+++ ezfftb.f
-@@ -1,5 +1,5 @@
-       SUBROUTINE EZFFTB (N,R,AZERO,A,B,WSAVE)
--      DIMENSION       R(1)       ,A(1)       ,B(1)       ,WSAVE(1)
-+      DIMENSION       R(*)       ,A(1)       ,B(1)       ,WSAVE(1)
-       IF (N-2) 101,102,103
-   101 R(1) = AZERO
-       RETURN
diff --git a/math/fftpack/patches/patch-ai b/math/fftpack/patches/patch-ai
deleted file mode 100644
index 8de5ce8db6e..00000000000
--- a/math/fftpack/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 2000/11/28 02:17:03 jtb Exp $
-
---- ezfftf.f.orig	Fri Nov 17 16:48:24 2000
-+++ ezfftf.f
-@@ -2,7 +2,7 @@
- C
- C                       VERSION 3  JUNE 1979
- C
--      DIMENSION       R(1)       ,A(1)       ,B(1)       ,WSAVE(1)
-+      DIMENSION       R(*)       ,A(1)       ,B(1)       ,WSAVE(1)
-       IF (N-2) 101,102,103
-   101 AZERO = R(1)
-       RETURN
diff --git a/math/fftpack/patches/patch-aj b/math/fftpack/patches/patch-aj
deleted file mode 100644
index 579c44604fc..00000000000
--- a/math/fftpack/patches/patch-aj
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-aj,v 1.1.1.1 2000/11/28 02:17:02 jtb Exp $
-
---- rfftb1.f.orig	Fri Nov 17 16:48:24 2000
-+++ rfftb1.f
-@@ -1,5 +1,5 @@
-       SUBROUTINE RFFTB1 (N,C,CH,WA,IFAC)
--      DIMENSION       CH(1)      ,C(1)       ,WA(1)      ,IFAC(1)
-+      DIMENSION       CH(1)      ,C(1)       ,WA(1)      ,IFAC(*)
-       NF = IFAC(2)
-       NA = 0
-       L1 = 1
diff --git a/math/fftpack/patches/patch-ak b/math/fftpack/patches/patch-ak
deleted file mode 100644
index 503446b7e6d..00000000000
--- a/math/fftpack/patches/patch-ak
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ak,v 1.1.1.1 2000/11/28 02:17:03 jtb Exp $
-
---- rfftf1.f.orig	Fri Nov 17 16:48:24 2000
-+++ rfftf1.f
-@@ -1,5 +1,5 @@
-       SUBROUTINE RFFTF1 (N,C,CH,WA,IFAC)
--      DIMENSION       CH(1)      ,C(1)       ,WA(1)      ,IFAC(1)
-+      DIMENSION       CH(1)      ,C(1)       ,WA(1)      ,IFAC(*)
-       NF = IFAC(2)
-       NA = 1
-       L2 = N
diff --git a/math/fftpack/patches/patch-al b/math/fftpack/patches/patch-al
deleted file mode 100644
index 996199f83c4..00000000000
--- a/math/fftpack/patches/patch-al
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-al,v 1.1.1.1 2000/11/28 02:17:02 jtb Exp $
-
---- rffti1.f.orig	Fri Nov 17 16:48:24 2000
-+++ rffti1.f
-@@ -1,5 +1,5 @@
-       SUBROUTINE RFFTI1 (N,WA,IFAC)
--      DIMENSION       WA(1)      ,IFAC(1)    ,NTRYH(4)
-+      DIMENSION       WA(1)      ,IFAC(*)    ,NTRYH(4)
-       DATA NTRYH(1),NTRYH(2),NTRYH(3),NTRYH(4)/4,2,3,5/
-       NL = N
-       NF = 0
diff --git a/math/fftpack/patches/patch-am b/math/fftpack/patches/patch-am
deleted file mode 100644
index b2e778b9799..00000000000
--- a/math/fftpack/patches/patch-am
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-am,v 1.1.1.1 2000/11/28 02:17:02 jtb Exp $
-
---- sint1.f.orig	Fri Nov 17 16:48:24 2000
-+++ sint1.f
-@@ -1,5 +1,5 @@
-       SUBROUTINE SINT1(N,WAR,WAS,XH,X,IFAC)
--      DIMENSION WAR(1),WAS(1),X(1),XH(1),IFAC(1)
-+      DIMENSION WAR(1),WAS(1),X(1),XH(*),IFAC(1)
-       DATA SQRT3 /1.73205080756888/
-       DO 100 I=1,N
-       XH(I) = WAR(I)