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.

5 files changed, 45 insertions, 63 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