Don't build shared Fortran libraries. They're too problematic.

Strictly numerical libraries, like fftpack, work fine, but some
which make use of Fortran I/O have problems resolving symbols.
This is a known problem with g77/f2c.

23 files changed, 119 insertions, 239 deletions

diff --git a/math/blas/Makefile b/math/blas/Makefile
index ca7fc8b355a..6ec2e28aeec 100644
--- a/math/blas/Makefile
+++ b/math/blas/Makefile
@@ -1,27 +1,18 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/11/06 17:55:12 wennmach Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/02 00:23:49 jtb Exp $
 #
 
-DISTNAME=	blas
-PKGNAME=	blas-1.0
-CATEGORIES=	math
-MASTER_SITES=	ftp://ftp.netlib.org/blas/ \
-		ftp://netlib.bell-labs.com/netlib/blas/ \
-		ftp://www.hensa.ac.uk/mirrors/netlib/blas/
-EXTRACT_SUFX=	.tgz
+DISTNAME=		blas
+PKGNAME=		blas-1.0
+CATEGORIES=		math
+MASTER_SITES=		ftp://ftp.netlib.org/blas/ \
+			ftp://netlib.bell-labs.com/netlib/blas/ \
+			ftp://www.hensa.ac.uk/mirrors/netlib/blas/
+EXTRACT_SUFX=		.tgz
 
-MAINTAINER=	jasontd@indigo.ie
+MAINTAINER=		jtb@netbsd.org
 
-WRKSRC=		${WRKDIR}
-NO_WRKSUBDIR=	YES
-USE_LIBTOOL=	YES
-USE_FORTRAN=	YES
-
-FFLAGS=	-O3
-
-.include "../../mk/bsd.prefs.mk"
-
-pre-build:
-	${SED} -e 's:%%FORTRAN%%:'${FC}':g;s:%%FFLAGS%%:'${FFLAGS}':g' \
-	< ${FILESDIR}/Makefile > ${WRKSRC}/Makefile
+WRKSRC=			${WRKDIR}
+NO_WRKSUBDIR=		YES
+USE_FORTRAN=		YES
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/blas/files/Makefile b/math/blas/files/Makefile
index 12dd25d1662..6b34290dc4b 100644
--- a/math/blas/files/Makefile
+++ b/math/blas/files/Makefile
@@ -1,41 +1,36 @@
 LIB	= blas
 
 LIBDIR	= ${PREFIX}/lib
-FORTRAN = %%FORTRAN%%
-FFLAGS	= %%FFLAGS%%
 
-all:	lib$(LIB)
-
-OBJ= caxpy.o ccopy.o cdotc.o cdotu.o cgbmv.o cgemm.o cgemv.o cgerc.o	\
-cgeru.o chbmv.o chemm.o chemv.o cher.o cher2.o cher2k.o cherk.o		\
-chpmv.o chpr.o chpr2.o crotg.o cscal.o csrot.o csscal.o cswap.o		\
-csymm.o csyr2k.o csyrk.o ctbmv.o ctbsv.o ctpmv.o ctpsv.o ctrmm.o	\
-ctrmv.o ctrsm.o ctrsv.o dasum.o daxpy.o dcabs1.o dcopy.o ddot.o		\
-dgbmv.o dgemm.o dgemv.o dger.o dnrm2.o drot.o drotg.o drotm.o drotmg.o	\
-dsbmv.o dscal.o dsdot.o dspmv.o dspr.o dspr2.o dswap.o dsymm.o dsymv.o	\
-dsyr.o dsyr2.o dsyr2k.o dsyrk.o dtbmv.o dtbsv.o dtpmv.o dtpsv.o		\
-dtrmm.o dtrmv.o dtrsm.o dtrsv.o dzasum.o dznrm2.o icamax.o idamax.o	\
-isamax.o izamax.o lsame.o sasum.o saxpy.o scasum.o scnrm2.o scopy.o	\
-sdot.o sdsdot.o sgbmv.o sgemm.o sgemv.o sger.o snrm2.o srot.o srotg.o	\
-srotm.o srotmg.o ssbmv.o sscal.o sspmv.o sspr.o sspr2.o sswap.o		\
-ssymm.o ssymv.o ssyr.o ssyr2.o ssyr2k.o ssyrk.o stbmv.o stbsv.o		\
-stpmv.o stpsv.o strmm.o strmv.o strsm.o strsv.o xerbla.o zaxpy.o	\
-zcopy.o zdotc.o zdotu.o zdrot.o zdscal.o zgbmv.o zgemm.o zgemv.o	\
-zgerc.o zgeru.o zhbmv.o zhemm.o zhemv.o zher.o zher2.o zher2k.o		\
-zherk.o zhpmv.o zhpr.o zhpr2.o zrotg.o zscal.o zswap.o zsymm.o		\
-zsyr2k.o zsyrk.o ztbmv.o ztbsv.o ztpmv.o ztpsv.o ztrmm.o ztrmv.o	\
-ztrsm.o ztrsv.o
-
-
-lib$(LIB): 	$(OBJ)
-	@$(LIBTOOL) --mode=link $(FORTRAN) -O -o lib$(LIB).la $(OBJ:.o=.lo) \
-	-rpath $(LIBDIR)
-
-install: 	lib$(LIB)
-	@$(LIBTOOL) --mode=install install -c lib$(LIB).la $(LIBDIR)
-
-.f.o: 
-	@$(LIBTOOL) --mode=compile $(FORTRAN) $(FFLAGS) -c $*.f
+all:	lib$(LIB).a
+
+OBJS = caxpy.o ccopy.o cdotc.o cdotu.o cgbmv.o cgemm.o cgemv.o cgerc.o	\
+       cgeru.o chbmv.o chemm.o chemv.o cher.o cher2.o cher2k.o cherk.o	\
+       chpmv.o chpr.o chpr2.o crotg.o cscal.o csrot.o csscal.o cswap.o	\
+       csymm.o csyr2k.o csyrk.o ctbmv.o ctbsv.o ctpmv.o ctpsv.o		\
+       ctrmm.o ctrmv.o ctrsm.o ctrsv.o dasum.o daxpy.o dcabs1.o		\
+       dcopy.o ddot.o dgbmv.o dgemm.o dgemv.o dger.o dnrm2.o drot.o	\
+       drotg.o drotm.o drotmg.o dsbmv.o dscal.o dsdot.o dspmv.o dspr.o	\
+       dspr2.o dswap.o dsymm.o dsymv.o dsyr.o dsyr2.o dsyr2k.o dsyrk.o	\
+       dtbmv.o dtbsv.o dtpmv.o dtpsv.o dtrmm.o dtrmv.o dtrsm.o dtrsv.o	\
+       dzasum.o dznrm2.o icamax.o idamax.o isamax.o izamax.o lsame.o	\
+       sasum.o saxpy.o scasum.o scnrm2.o scopy.o sdot.o sdsdot.o	\
+       sgbmv.o sgemm.o sgemv.o sger.o snrm2.o srot.o srotg.o srotm.o	\
+       srotmg.o ssbmv.o sscal.o sspmv.o sspr.o sspr2.o sswap.o ssymm.o	\
+       ssymv.o ssyr.o ssyr2.o ssyr2k.o ssyrk.o stbmv.o stbsv.o stpmv.o	\
+       stpsv.o strmm.o strmv.o strsm.o strsv.o xerbla.o zaxpy.o		\
+       zcopy.o zdotc.o zdotu.o zdrot.o zdscal.o zgbmv.o zgemm.o		\
+       zgemv.o zgerc.o zgeru.o zhbmv.o zhemm.o zhemv.o zher.o zher2.o	\
+       zher2k.o zherk.o zhpmv.o zhpr.o zhpr2.o zrotg.o zscal.o zswap.o	\
+       zsymm.o zsyr2k.o zsyrk.o ztbmv.o ztbsv.o ztpmv.o ztpsv.o		\
+       ztrmm.o ztrmv.o ztrsm.o ztrsv.o
+
+lib$(LIB).a: 	$(OBJS)
+	$(AR) cru $@ $?
+	$(RANLIB) $@
+
+install: 	lib$(LIB).a
+	$(BSD_INSTALL_DATA) $? $(LIBDIR)
 
 clean:
-	rm -rf *.o *.lo .libs lib$(LIB).la
+	rm -f *.o lib$(LIB).a
diff --git a/math/blas/pkg/COMMENT b/math/blas/pkg/COMMENT
index 4eb65655f5d..296c6ef461e 100644
--- a/math/blas/pkg/COMMENT
+++ b/math/blas/pkg/COMMENT
@@ -1 +1 @@
-Basic Linear Algebra Subroutines (Fortran)
+Basic Linear Algebra Subprograms (Fortran)
diff --git a/math/blas/pkg/DESCR b/math/blas/pkg/DESCR
index b0068e2751f..084b5d5e4dc 100644
--- a/math/blas/pkg/DESCR
+++ b/math/blas/pkg/DESCR
@@ -1,4 +1,4 @@
-The BLAS (Basic Linear Algebra Subroutines) are high quality "building
+The BLAS (Basic Linear Algebra Subprograms) are high quality "building
 block" routines for performing basic vector and matrix
 operations. Level 1 BLAS do vector-vector operations, Level 2 BLAS do
 matrix-vector operations, and Level 3 BLAS do matrix-matrix
diff --git a/math/blas/pkg/PLIST b/math/blas/pkg/PLIST
index 54eb4246d56..b96220e1573 100644
--- a/math/blas/pkg/PLIST
+++ b/math/blas/pkg/PLIST
@@ -1,6 +1,2 @@
-@comment $NetBSD: PLIST,v 1.2 2001/01/04 15:10:48 agc Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/02/02 00:23:50 jtb Exp $
 lib/libblas.a
-lib/libblas.la
-lib/libblas.so
-lib/libblas.so.0
-lib/libblas.so.0.0
diff --git a/math/dfftpack/Makefile b/math/dfftpack/Makefile
index f09e5f10ae1..7001acc5e2e 100644
--- a/math/dfftpack/Makefile
+++ b/math/dfftpack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/01/26 22:19:35 jtb Exp $
+# $NetBSD: Makefile,v 1.3 2001/02/02 00:23:50 jtb Exp $
 
 DISTNAME=		dfftpack-20001209
 CATEGORIES=		math
@@ -9,7 +9,6 @@ MAINTAINER=		jtb@netbsd.org
 NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 WRKSRC=			${WRKDIR}/dfftpack
 USE_FORTRAN=		YES
-USE_LIBTOOL=		YES
 
 post-extract:
 	${CP} ${FILESDIR}/Makefile ${WRKSRC}
diff --git a/math/dfftpack/files/Makefile b/math/dfftpack/files/Makefile
index c215fee96e2..849b4f5a253 100644
--- a/math/dfftpack/files/Makefile
+++ b/math/dfftpack/files/Makefile
@@ -2,7 +2,7 @@ LIB 	= dfftpack
 
 LIBDIR	= ${PREFIX}/lib
 
-all:	lib$(LIB).la
+all:	lib$(LIB).a
 
 OBJS = 	zfftb.o cfftb1.o zfftf.o cfftf1.o zffti.o cffti1.o dcosqb.o	\
 	cosqb1.o dcosqf.o cosqf1.o dcosqi.o dcost.o dcosti.o ezfft1.o	\
@@ -12,15 +12,12 @@ OBJS = 	zfftb.o cfftb1.o zfftf.o cfftf1.o zffti.o cffti1.o dcosqb.o	\
 	radf5.o radfg.o dfftb.o rfftb1.o dfftf.o rfftf1.o dffti.o	\
 	rffti1.o dsinqb.o dsinqf.o dsinqi.o dsint.o sint1.o dsinti.o
 
-lib$(LIB).la:	$(OBJS)
-	$(LIBTOOL) --mode=link $(FC) $(FFLAGS) -o $@ $(OBJS:.o=.lo) \
-	-rpath $(LIBDIR) --version-info 0:0
+lib$(LIB).a:	$(OBJS)
+	$(AR) cru $@ $?
+	$(RANLIB) $@
 
-.f.o:
-	$(LIBTOOL) --mode=compile $(FC) $(FFLAGS) -c $*.f
-
-install:	lib$(LIB).la
-	$(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) $? $(LIBDIR)
+install:	lib$(LIB).a
+	$(BSD_INSTALL_DATA) $? $(LIBDIR)
 
 clean: 
-	 rm -rf *.o *.lo .libs lib$(LIB).la
+	 rm -f *.o lib$(LIB).a
diff --git a/math/dfftpack/pkg/PLIST b/math/dfftpack/pkg/PLIST
index 50460cb89d0..3f276c67c40 100644
--- a/math/dfftpack/pkg/PLIST
+++ b/math/dfftpack/pkg/PLIST
@@ -1,9 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2001/01/04 15:10:48 agc Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/02/02 00:23:50 jtb Exp $
 lib/libdfftpack.a
-lib/libdfftpack.la
-lib/libdfftpack.so
-lib/libdfftpack.so.0
-lib/libdfftpack.so.0.0
 share/doc/dfftpack/README
 share/doc/dfftpack/doc
 share/doc/dfftpack/doc.double
diff --git a/math/eispack/Makefile b/math/eispack/Makefile
index d62beeeb7c2..9ec04d42897 100644
--- a/math/eispack/Makefile
+++ b/math/eispack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/12/01 01:48:25 jtb Exp $
+# $NetBSD: Makefile,v 1.3 2001/02/02 00:23:50 jtb Exp $
 
 DISTNAME=		eispack-20001130
 CATEGORIES=		math
@@ -6,14 +6,11 @@ MASTER_SITES=		${MASTER_SITE_LOCAL}
 
 MAINTAINER=		jtb@netbsd.org
 
+NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 WRKSRC=			${WRKDIR}/eispack
-USE_LIBTOOL=		YES
-UES_FORTRAN=		YES
-
-.include "../../mk/bsd.prefs.mk"
+USE_FORTRAN=		YES
 
 pre-build:
-	@${SED} -e 's:%%FORTRAN%%:'${FC}':g' \
-	< ${FILESDIR}/Makefile > ${WRKSRC}/Makefile
+	${CP} ${FILESDIR}/Makefile ${WRKSRC}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/eispack/files/Makefile b/math/eispack/files/Makefile
index f23d957baf1..de89a9fb0ff 100644
--- a/math/eispack/files/Makefile
+++ b/math/eispack/files/Makefile
@@ -1,12 +1,10 @@
 LIB	= eispack
-LIBDIR	= ${PREFIX}/lib
 
-FORTRAN = %%FORTRAN%%
-FOPTS	= -O3
+LIBDIR	= ${PREFIX}/lib
 
-all:	lib$(LIB)
+all:	lib$(LIB).a
 
-OBJ = 	csroot.o epslon.o pythag.o bakvec.o balanc.o balbak.o bandr.o	\
+OBJS = 	csroot.o epslon.o pythag.o bakvec.o balanc.o balbak.o bandr.o	\
 	bandv.o	bisect.o bqr.o cbabk2.o	cbal.o cg.o ch.o cinvit.o	\
 	combak.o comhes.o comlr.o comlr2.o comqr.o comqr2.o cortb.o	\
 	corth.o	elmbak.o elmhes.o eltran.o figi.o figi2.o hqr.o	hqr2.o	\
@@ -18,15 +16,12 @@ OBJ = 	csroot.o epslon.o pythag.o bakvec.o balanc.o balbak.o bandr.o	\
 	trbak1.o trbak3.o tred1.o tred2.o tred3.o tridib.o tsturm.o	\
 	cdiv.o
 
-lib$(LIB):	$(OBJ)
-	@$(LIBTOOL) --mode=link $(FORTRAN) $(FFLAGS) $(FOPTS) \
-	-O -o lib$(LIB).la $(OBJ:.o=.lo) --version-info 0:0 -rpath $(LIBDIR)
-
-.f.o:
-	@$(LIBTOOL) --mode=compile $(FORTRAN) $(FFLAGS) $(FOPTS) -c $*.f
+lib$(LIB).a:	$(OBJS)
+	$(AR) cru $@ $?
+	$(RANLIB) $@
 
-install:	lib$(LIB)
-	@$(LIBTOOL) --mode=install install -c lib$(LIB).la $(LIBDIR)
+install:	lib$(LIB).a
+	$(BSD_INSTALL_DATA) lib$(LIB).a $(LIBDIR)
 
 clean:
-	rm -rf *.o *.lo .libs lib$(LIB).la
+	rm -f *.o lib$(LIB).a
diff --git a/math/fftpack/Makefile b/math/fftpack/Makefile
index f094cb05ae6..db1a00a55d4 100644
--- a/math/fftpack/Makefile
+++ b/math/fftpack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/01/22 23:30:01 jtb Exp $
+# $NetBSD: Makefile,v 1.5 2001/02/02 00:23:51 jtb Exp $
 
 DISTNAME=		fftpack-20001130
 CATEGORIES=		math
@@ -8,8 +8,7 @@ MAINTAINER=		jtb@netbsd.org
 
 NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 WRKSRC=			${WRKDIR}/fftpack
-USE_LIBTOOL=		YES
-UES_FORTRAN=		YES
+USE_FORTRAN=		YES
 
 post-extract:
 	${CP} ${FILESDIR}/Makefile ${WRKSRC}
diff --git a/math/fftpack/files/Makefile b/math/fftpack/files/Makefile
index c99278b9442..fd444e41daa 100644
--- a/math/fftpack/files/Makefile
+++ b/math/fftpack/files/Makefile
@@ -2,13 +2,7 @@ LIB 	= fftpack
 
 LIBDIR	= ${PREFIX}/lib
 
-.if $(FC)=="f77" || $(FC)=="g77"
-FOPTS=-funroll-loops -O2
-.else
-FOPTS=-O2
-.endif
-
-all:	lib$(LIB).la
+all:	lib$(LIB).a
 
 OBJS =	cfftb.o cosqf1.o passb2.o radb2.o radfg.o		\
 	sinqi.o cfftb1.o cosqi.o passb3.o radb3.o rfftb.o	\
@@ -20,15 +14,12 @@ OBJS =	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).la:	$(OBJS)
-	$(LIBTOOL) --mode=link $(FC) $(FFLAGS) $(FOPTS) \
-	-o $@ $(OBJS:.o=.lo)  -rpath $(LIBDIR) --version-info 0:0
-
-.f.o:
-	$(LIBTOOL) --mode=compile $(FC) $(FFLAGS) $(FOPTS) -c $<
+lib$(LIB).a:	$(OBJS)
+	$(AR) cru $@ $?
+	$(RANLIB) $@
 
-install:	lib$(LIB).la
-	$(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) $? $(LIBDIR)
+install:	lib$(LIB).a
+	$(BSD_INSTALL_DATA) $? $(LIBDIR)
 
 clean:
-	rm -rf *.o *.lo .libs lib$(LIB).la
+	rm -f *.o lib$(LIB).a
diff --git a/math/fftpack/pkg/PLIST b/math/fftpack/pkg/PLIST
index 925a835c14e..466298f6a70 100644
--- a/math/fftpack/pkg/PLIST
+++ b/math/fftpack/pkg/PLIST
@@ -1,8 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2001/01/04 15:10:48 agc Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/02/02 00:23:51 jtb Exp $
 lib/libfftpack.a
-lib/libfftpack.la
-lib/libfftpack.so
-lib/libfftpack.so.0
-lib/libfftpack.so.0.0
 share/doc/fftpack/doc
 @dirrm share/doc/fftpack
diff --git a/math/minpack/Makefile b/math/minpack/Makefile
index 798897d7316..018d62ee653 100644
--- a/math/minpack/Makefile
+++ b/math/minpack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/12/10 05:11:31 jtb Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/02 00:23:52 jtb Exp $
 
 DISTNAME=		minpack-20001130
 CATEGORIES=		math
@@ -6,16 +6,11 @@ MASTER_SITES=		${MASTER_SITE_LOCAL}
 
 MAINTAINER=		jtb@netbsd.org
 
+NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 WRKSRC=			${WRKDIR}/minpack
 USE_FORTRAN=		YES
 
 pre-build:
-	@${SED} -e 's:%%F77%%:'${FC}':g' \
-	< ${FILESDIR}/Makefile > ${WRKSRC}/Makefile
-
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/minpack
-	${INSTALL_DATA} ${WRKSRC}/ex/file* ${WRKSRC}/ex/index* \
-	${PREFIX}/share/examples/minpack
+	${CP} ${FILESDIR}/Makefile ${WRKSRC}
 
 .include "../../mk/bsd.pkg.mk"
\ No newline at end of file
diff --git a/math/minpack/files/Makefile b/math/minpack/files/Makefile
index 525701fa4f0..671fd46e00b 100644
--- a/math/minpack/files/Makefile
+++ b/math/minpack/files/Makefile
@@ -1,8 +1,6 @@
 LIB 	= minpack
 
 LIBDIR	= ${PREFIX}/lib
-F77	= %%F77%%
-FFLAGS	= -O3
 
 all:	lib$(LIB).a
 
@@ -14,14 +12,11 @@ OBJ =   covar.o	dmchar.o dogleg.o dpmpar.o enorm.o errjac.o fdjac1.o	\
 	vecjac.o
 
 lib$(LIB).a:	$(OBJ)
-	$(AR) ru $@ $?
+	$(AR) cru $@ $?
 	$(RANLIB) $@
 
-.f.o:
-	$(F77) $(FFLAGS) -c $<
-
 install:	lib$(LIB).a
-	install -c lib$(LIB).a $(LIBDIR)
+	$(BSD_INSTALL_DATA) $? $(LIBDIR)
 
 clean:
-	rm -rf *.o lib$(LIB).a
+	rm -f *.o lib$(LIB).a
diff --git a/math/minpack/pkg/PLIST b/math/minpack/pkg/PLIST
index 846e34db468..3a5c8f90d05 100644
--- a/math/minpack/pkg/PLIST
+++ b/math/minpack/pkg/PLIST
@@ -1,28 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/12/10 05:11:31 jtb Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/02/02 00:23:52 jtb Exp $
 lib/libminpack.a
-share/examples/minpack/file01
-share/examples/minpack/file02
-share/examples/minpack/file03
-share/examples/minpack/file04
-share/examples/minpack/file05
-share/examples/minpack/file06
-share/examples/minpack/file07
-share/examples/minpack/file08
-share/examples/minpack/file09
-share/examples/minpack/file10
-share/examples/minpack/file11
-share/examples/minpack/file12
-share/examples/minpack/file13
-share/examples/minpack/file14
-share/examples/minpack/file15
-share/examples/minpack/file16
-share/examples/minpack/file17
-share/examples/minpack/file18
-share/examples/minpack/file19
-share/examples/minpack/file20
-share/examples/minpack/file21
-share/examples/minpack/file22
-share/examples/minpack/file23
-share/examples/minpack/index
-share/examples/minpack/index.html
-@dirrm share/examples/minpack
diff --git a/math/odepack/Makefile b/math/odepack/Makefile
index a2427e987c1..81c2d3a4166 100644
--- a/math/odepack/Makefile
+++ b/math/odepack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/12/01 01:50:44 jtb Exp $
+# $NetBSD: Makefile,v 1.4 2001/02/02 00:23:52 jtb Exp $
 
 DISTNAME=		odepack-20001130
 CATEGORIES=		math
@@ -6,21 +6,16 @@ MASTER_SITES=		${MASTER_SITE_LOCAL}
 
 MAINTAINER=		jtb@netbsd.org
 
+NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 WRKSRC=			${WRKDIR}/odepack
-USE_LIBTOOL=		YES
 USE_FORTRAN=		YES
 
-.include "../../mk/bsd.prefs.mk"
-
 pre-build:
-	@${SED} -e 's:%%FORTRAN%%:'${FC}':g' \
-	< ${FILESDIR}/Makefile > ${WRKSRC}/Makefile
+	${CP} ${FILESDIR}/Makefile ${WRKSRC}
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/odepack
 	${INSTALL_DATA} ${WRKSRC}/doc ${PREFIX}/share/doc/odepack
 	${INSTALL_DATA} ${WRKSRC}/readme ${PREFIX}/share/doc/odepack
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/odepack
-	${INSTALL_DATA} ${WRKSRC}/demo.f ${PREFIX}/share/examples/odepack
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/odepack/files/Makefile b/math/odepack/files/Makefile
index d64ae1c79b1..af473e0ed50 100644
--- a/math/odepack/files/Makefile
+++ b/math/odepack/files/Makefile
@@ -1,28 +1,24 @@
 LIB	= odepack
 
 LIBDIR	= ${PREFIX}/lib
-FORTRAN = %%FORTRAN%%
-FOPTS	= -O3
 
-all:	lib$(LIB)
+all:	lib$(LIB).a
 
-OBJ = adjlr.o aigbt.o ainvg.o blkdta000.o bnorm.o cdrv.o cfode.o cntnzu.o \
-	decbt.o ewset.o fnorm.o intdy.o iprep.o jgroup.o lsoda.o	  \
-	lsodar.o lsode.o lsodes.o lsodi.o lsoibt.o md.o mdi.o mdm.o mdp.o \
-	mdu.o nnfc.o nnsc.o nntc.o nroc.o nsfc.o odrv.o pjibt.o prep.o	  \
-	prepj.o	prepji.o prja.o prjs.o rchek.o roots.o slsbt.o slss.o	  \
-	solbt.o solsy.o srcar.o srcma.o srcms.o srcom.o sro.o stoda.o	  \
-	stode.o stodi.o vmnorm.o vnorm.o xerrwv.o xsetf.o xsetun.o
+OBJS = adjlr.o aigbt.o ainvg.o blkdta000.o bnorm.o cdrv.o cfode.o	\
+       cntnzu.o decbt.o ewset.o fnorm.o intdy.o iprep.o jgroup.o	\
+       lsoda.o lsodar.o lsode.o lsodes.o lsodi.o lsoibt.o md.o mdi.o	\
+       mdm.o mdp.o mdu.o nnfc.o nnsc.o nntc.o nroc.o nsfc.o odrv.o	\
+       pjibt.o prep.o prepj.o prepji.o prja.o prjs.o rchek.o roots.o	\
+       slsbt.o slss.o solbt.o solsy.o srcar.o srcma.o srcms.o srcom.o	\
+       sro.o stoda.o stode.o stodi.o vmnorm.o vnorm.o xerrwv.o xsetf.o	\
+       xsetun.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).a:	$(OBJS)
+	$(AR) cru $@ $?
+	$(RANLIB) $@
 
-.f.o:
-	@$(LIBTOOL) --mode=compile $(FORTRAN) $(FFLAGS) $(FOPTS) -c $*.f
-
-install:	lib$(LIB)
-	@$(LIBTOOL) --mode=install install -c lib$(LIB).la $(LIBDIR)
+install:	lib$(LIB).a
+	$(BSD_INSTALL_DATA) $? $(LIBDIR)
 
 clean:
-	rm -rf *.o *.lo .libs lib$(LIB).la
\ No newline at end of file
+	rm -f *.o lib$(LIB).a
diff --git a/math/odepack/pkg/PLIST b/math/odepack/pkg/PLIST
index 36abb4aba41..a2886c44c02 100644
--- a/math/odepack/pkg/PLIST
+++ b/math/odepack/pkg/PLIST
@@ -1,11 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2001/01/04 15:10:49 agc Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/02/02 00:23:53 jtb Exp $
 lib/libodepack.a
-lib/libodepack.la
-lib/libodepack.so
-lib/libodepack.so.0
-lib/libodepack.so.0.0
 share/doc/odepack/doc
 share/doc/odepack/readme
-share/examples/odepack/demo.f
-@dirrm share/examples/odepack
 @dirrm share/doc/odepack
diff --git a/math/quadpack/Makefile b/math/quadpack/Makefile
index 49e526363b7..4f00c9e92ea 100644
--- a/math/quadpack/Makefile
+++ b/math/quadpack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/12/01 01:51:33 jtb Exp $
+# $NetBSD: Makefile,v 1.3 2001/02/02 00:23:53 jtb Exp $
 
 DISTNAME=		quadpack-20001130
 CATEGORIES=		math
@@ -6,20 +6,17 @@ MASTER_SITES=		${MASTER_SITE_LOCAL}
 
 MAINTAINER=		jtb@netbsd.org
 
+NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 WRKSRC=			${WRKDIR}/quadpack
-
-USE_LIBTOOL=		YES
-UES_FORTRAN=		YES
-
-.include "../../mk/bsd.prefs.mk"
+USE_FORTRAN=		YES
 
 pre-build:
-	@${SED} -e 's:%%FORTRAN%%:'${FC}':g' \
-	< ${FILESDIR}/Makefile > ${WRKSRC}/Makefile
+	${CP} ${FILESDIR}/Makefile ${WRKSRC}
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/quadpack
-	@for i in doc readme ; do \
-	${INSTALL_DATA} ${WRKSRC}/$$i ${PREFIX}/share/doc/quadpack ; done
+	for i in doc readme ; do					\
+	${INSTALL_DATA} ${WRKSRC}/$$i ${PREFIX}/share/doc/quadpack;	\
+	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/quadpack/files/Makefile b/math/quadpack/files/Makefile
index 20efa3af9df..a22ea3a0725 100644
--- a/math/quadpack/files/Makefile
+++ b/math/quadpack/files/Makefile
@@ -1,12 +1,10 @@
 LIB 	= quadpack
 
 LIBDIR	= ${PREFIX}/lib
-FORTRAN = %%FORTRAN%%
-FFLAGS	= -O3
 
-all:	lib$(LIB)
+all:	lib$(LIB).a
 
-OBJ= 	dqag.o dqage.o dqagi.o dqagie.o dqagp.o dqagpe.o dqags.o	\
+OBJS = 	dqag.o dqage.o dqagi.o dqagie.o dqagp.o dqagpe.o dqags.o	\
 	dqagse.o dqawc.o dqawce.o dqawf.o dqawfe.o dqawo.o		\
 	dqawoe.o dqaws.o dqawse.o dqc25c.o dqc25f.o dqc25s.o		\
 	dqcheb.o dqelg.o dqk15.o dqk15i.o dqk15w.o dqk21.o		\
@@ -18,15 +16,12 @@ OBJ= 	dqag.o dqage.o dqagi.o dqagie.o dqagp.o dqagpe.o dqags.o	\
 	qk31.o qk41.o qk51.o qk61.o qmomo.o qng.o qpsrt.o		\
 	qwgtc.o qwgtf.o qwgts.o
 
-lib$(LIB):	$(OBJ)
-	@$(LIBTOOL) --mode=link $(FORTRAN) $(FFLAGS) \
-	-O -o lib$(LIB).la $(OBJ:.o=.lo) -rpath $(LIBDIR) --version-info 0:0
+lib$(LIB).a:	$(OBJS)
+	$(AR) cru $@ $?
+	$(RANLIB) $@
 
-.f.o:
-	@$(LIBTOOL) --mode=compile $(FORTRAN) $(FFLAGS) -c $*.f
-
-install:	lib$(LIB)
-	@$(LIBTOOL) --mode=install install -c lib$(LIB).la $(LIBDIR)
+install:	lib$(LIB).a
+	$(BSD_INSTALL_DATA) $? $(LIBDIR)
 
 clean:
-	rm -rf *.o *.lo .libs lib$(LIB).la
+	rm -f *.o lib$(LIB).a
diff --git a/math/quadpack/pkg/PLIST b/math/quadpack/pkg/PLIST
index caaf94d31e2..2b56400b09c 100644
--- a/math/quadpack/pkg/PLIST
+++ b/math/quadpack/pkg/PLIST
@@ -1,9 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2001/01/04 15:10:49 agc Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/02/02 00:23:53 jtb Exp $
 lib/libquadpack.a
-lib/libquadpack.la
-lib/libquadpack.so
-lib/libquadpack.so.0
-lib/libquadpack.so.0.0
 share/doc/quadpack/doc
 share/doc/quadpack/readme
 @dirrm share/doc/quadpack
diff --git a/math/slatec/files/Makefile b/math/slatec/files/Makefile
index 2371fa4345c..ac6b4602b0a 100644
--- a/math/slatec/files/Makefile
+++ b/math/slatec/files/Makefile
@@ -2,12 +2,6 @@ LIB	= slatec
 
 LIBDIR	= ${PREFIX}/lib
 
-.if ${FC}=="f77" || ${FC}=="g77"
-FOPTS=-funroll-loops -O2
-.else
-FOPTS=-O2
-.endif
-
 all:	lib$(LIB).a
 
 OBJS = aaaaaa.o acosh.o ai.o aie.o albeta.o algams.o ali.o alngam.o	\
@@ -220,9 +214,6 @@ i1mach.o:
 r1mach.o:
 	$(FC) -c $<
 
-.f.o:
-	$(FC) $(FFLAGS) $(FOPTS) -c $<
-
 install:  lib$(LIB).a
 	$(BSD_INSTALL_DATA) $? $(LIBDIR)