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.

3 files changed, 19 insertions, 34 deletions

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