libtool-ize this for building its shared libs instead of using

bsd.lib.mk.  Should address PR26628 where this package can't
build on solaris.  In addition, this cleans up some PLIST hacks.

7 files changed, 112 insertions, 215 deletions

diff --git a/lang/f2c/Makefile b/lang/f2c/Makefile
index c1e7ddc40e7..7c17e11cfc9 100644
--- a/lang/f2c/Makefile
+++ b/lang/f2c/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2004/04/09 21:07:48 minskim Exp $
+# $NetBSD: Makefile,v 1.29 2004/09/14 22:09:40 dmcmahill Exp $
 
 DISTNAME=	f2c-20001205
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 
@@ -17,7 +17,7 @@ MASTER_SITES=	${MASTER_SITE_LOCAL}
 #read what the last change date was.
 #
 #   mv f2c.tar f2c-yyyymmdd.tar
-#   gzip f2c-yyyymmdd.tar
+#   gzip --best f2c-yyyymmdd.tar
 MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://www.netlib.org/f2c/index.html
 COMMENT=	Fortran to C compiler including a script to emulate f77
@@ -29,10 +29,10 @@ F2CMINOR=	0
 MAKE_ENV+=	F2CMAJOR=${F2CMAJOR} F2CMINOR=${F2CMINOR}
 MAKE_ENV+=	LIBOWN=${LIBOWN} LIBGRP=${LIBGRP}
 PLIST_SUBST+=	F2CMAJOR=${F2CMAJOR} F2CMINOR=${F2CMINOR}
-PLIST_SRC=	${WRKDIR}/PLIST
 
 WRKSRC=		${WRKDIR}/f2c
 USE_BUILDLINK3=	yes
+USE_LIBTOOL=	yes
 
 post-extract:
 	@${RM} ${WRKSRC}/index.html
@@ -48,27 +48,9 @@ do-configure:
 	@${CP} -f ${WRKSRC}/libF77/signal1.h0 ${WRKSRC}/libF77/signal1.h
 	@${CP} -f ${WRKSRC}/f2c.h ${WRKSRC}/libF77/f2c.h
 	@${CP} -f ${WRKSRC}/f2c.h ${WRKSRC}/libI77/f2c.h
-	@${ECHO} "major=${F2CMAJOR}" > ${WRKSRC}/libF77/shlib_version
-	@${ECHO} "minor=${F2CMINOR}" >> ${WRKSRC}/libF77/shlib_version
-	@${ECHO} "major=${F2CMAJOR}" > ${WRKSRC}/libI77/shlib_version
-	@${ECHO} "minor=${F2CMINOR}" >> ${WRKSRC}/libI77/shlib_version
 
-# for OBJECT_FMT
 .include "../../mk/bsd.prefs.mk"
 MAKE_ENV+=	MACHINE_ARCH=${MACHINE_ARCH}
 
-pre-install:
-.if (${MACHINE_ARCH} == "mipsel")
-	${SED} '/lib.*_pic/d' ${PKGDIR}/PLIST > ${PLIST_SRC}
-.else
-	${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
-.endif
-
-.if (${OBJECT_FMT} == "ELF")
-post-install:
-	cd ${PREFIX}/lib && ${LN} -fs libf2c.so.${F2CMAJOR}.${F2CMINOR}  libf2c.so.${F2CMAJOR}
-	cd ${PREFIX}/lib && ${LN} -fs libf2c.so.${F2CMAJOR}.${F2CMINOR}  libf2c.so
-
-.endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/f2c/PLIST b/lang/f2c/PLIST
index 2f5605fbbc3..05bed7c0ca8 100644
--- a/lang/f2c/PLIST
+++ b/lang/f2c/PLIST
@@ -1,22 +1,14 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:23:09 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/09/14 22:09:40 dmcmahill Exp $
 bin/f2c
 bin/f2c-f77
 include/f2c.h
-lib/libf2c.a
-lib/libf2c_p.a
-lib/libf2c_pic.a
-lib/libf2c.so.${F2CMAJOR}.${F2CMINOR}
-lib/libf2c.so.${F2CMAJOR}
-lib/libf2c.so
 lib/libF77.a
-lib/libF77_p.a
-lib/libF77_pic.a
+lib/libF77.la
 lib/libF77.so.${F2CMAJOR}.${F2CMINOR}
 lib/libF77.so.${F2CMAJOR}
 lib/libF77.so
 lib/libI77.a
-lib/libI77_p.a
-lib/libI77_pic.a
+lib/libI77.la
 lib/libI77.so.${F2CMAJOR}.${F2CMINOR}
 lib/libI77.so.${F2CMAJOR}
 lib/libI77.so
diff --git a/lang/f2c/distinfo b/lang/f2c/distinfo
index d6ed5ab4fe0..83355bdb253 100644
--- a/lang/f2c/distinfo
+++ b/lang/f2c/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.9 2004/03/13 13:47:40 dmcmahill Exp $
+$NetBSD: distinfo,v 1.10 2004/09/14 22:09:40 dmcmahill Exp $
 
 SHA1 (f2c-20001205.tar.gz) = f3cc1653eb962fee45d850df50890fc53448a17f
 Size (f2c-20001205.tar.gz) = 988607 bytes
-SHA1 (patch-aa) = af1e3e1e04d5ab5f06eed0e031a9939d1f41150d
+SHA1 (patch-aa) = c3ac2f66a5707b5a4d06f134e867ee245fd76ac0
 SHA1 (patch-ab) = 97c676fa452daa674e11348412ccb26d38a7baa4
 SHA1 (patch-ac) = 6fc52f9257cdecd3784e7f8897cce8b5656b73e4
-SHA1 (patch-ad) = 0144d0cdf55ce8117d179a56acc4db64fe67c8e0
-SHA1 (patch-ae) = c0562da54ef93f167db928b526a96c74c8cabc72
-SHA1 (patch-ag) = 3e263188c46c356eecf876cbf29d44b17308078d
+SHA1 (patch-ad) = 7f204a45891e3632589ea8fb0e4e379a0a792dea
+SHA1 (patch-ae) = 037cc8aed72a3088771ab24077ff19b009e63ebf
+SHA1 (patch-ag) = 5f294e491ba4730aa7047ad53fa710a0698c2649
 SHA1 (patch-ai) = 641d3720c80cfb7d1c23981bb845b0a9bee3e6d7
 SHA1 (patch-aj) = c58361fbbfc06e033b2a47e1d1e370716c4b185c
diff --git a/lang/f2c/patches/patch-aa b/lang/f2c/patches/patch-aa
index 126af6db8da..e340d32730c 100644
--- a/lang/f2c/patches/patch-aa
+++ b/lang/f2c/patches/patch-aa
@@ -1,13 +1,11 @@
-$NetBSD: patch-aa,v 1.12 2002/08/25 19:23:02 jlam Exp $
+$NetBSD: patch-aa,v 1.13 2004/09/14 22:09:40 dmcmahill Exp $
 
-Add a top level Makefile
-
---- /dev/null	Thu Apr  5 17:09:09 2001
-+++ Makefile	Thu Apr  5 18:31:35 2001
-@@ -0,0 +1,64 @@
+--- Makefile.orig	Tue Sep 14 16:47:52 2004
++++ Makefile
+@@ -0,0 +1,43 @@
 +# Top level Makefile for f2c, libF77, and libI77
 +
-+all: f2c libf2c/libf2c.a f2c-f77 man
++all: f2c libF77/libF77.la libI77/libI77.la  f2c-f77 man
 +
 +
 +f2c:
@@ -15,29 +13,13 @@ Add a top level Makefile
 +	cd src; ${MAKE} all
 +	cp src/f2c f2c
 +
-+libF77/libF77.a:
++libF77/libF77.la:
 +	@echo Making all in 'libF77'
-+	cd libF77 &&  ${MAKE} all
++	cd libF77 &&  ${MAKE} all LIBDIR=${PREFIX}/lib
 +
-+libI77/libI77.a:
++libI77/libI77.la:
 +	@echo Making all in 'libI77'
-+	cd libI77 &&  ${MAKE} all
-+
-+libf2c/libf2c.a: libI77/libI77.a libF77/libF77.a
-+	-mkdir libf2c
-+	if [ -f libF77/libF77.a ]; then  cd libf2c && ar x ../libF77/libF77.a ; fi
-+	if [ -f libF77/libF77_p.a ]; then cd libf2c && ar x ../libF77/libF77_p.a ; fi
-+	if [ -f libF77/libF77_pic.a ]; then cd libf2c && ar x ../libF77/libF77_pic.a ; fi
-+	if [ -f libI77/libI77.a ]; then cd libf2c && ar x ../libI77/libI77.a ; fi
-+	if [ -f libI77/libI77_p.a ]; then cd libf2c && ar x ../libI77/libI77_p.a ; fi
-+	if [ -f libI77/libI77_pic.a ]; then cd libf2c && ar x ../libI77/libI77_pic.a ; fi
-+	if [ -f libF77/libF77.a ]; then cd libf2c && ar cruv libf2c.a *.o ; fi
-+	if [ -f libF77/libF77_p.a ]; then cd libf2c && ar cruv libf2c_p.a *.po ; fi
-+	if [ -f libF77/libF77_pic.a ]; then cd libf2c && ar cruv libf2c_pic.a *.so ; fi
-+	if [ -f libF77/libF77_pic.a ]; then cd libf2c && \
-+		ld -Bshareable -soname libf2c.so.${F2CMAJOR} -o libf2c.so.${F2CMAJOR}.${F2CMINOR} *.so ; fi
-+	if [ "${MACHINE_ARCH}" = "mipsel" ]; then cd libf2c && \
-+		ld -Bshareable -soname libf2c.so.${F2CMAJOR} -o libf2c.so.${F2CMAJOR}.${F2CMINOR} *.o ; fi
++	cd libI77 &&  ${MAKE} all LIBDIR=${PREFIX}/lib
 +
 +man: f2c.0
 +
@@ -54,11 +36,6 @@ Add a top level Makefile
 +	-@mkdir -p ${PREFIX}/lib
 +	@cd libI77 && ${MAKE} install LIBDIR=${PREFIX}/lib
 +	@cd libF77 && ${MAKE} install LIBDIR=${PREFIX}/lib
-+	${BSD_INSTALL_DATA} ./libf2c/libf2c.a ${PREFIX}/lib
-+	if [ -f ./libf2c/libf2c_p.a ]; then ${BSD_INSTALL_DATA} ./libf2c/libf2c_p.a ${PREFIX}/lib ; fi
-+	if [ -f ./libf2c/libf2c_pic.a ]; then ${BSD_INSTALL_DATA} ./libf2c/libf2c_pic.a ${PREFIX}/lib ; fi
-+	if [ -f ./libf2c/libf2c.so.${F2CMAJOR}.${F2CMINOR} ]; then \
-+		${BSD_INSTALL_DATA} ./libf2c/libf2c.so.${F2CMAJOR}.${F2CMINOR} ${PREFIX}/lib ; fi
 +	-@mkdir -p ${PREFIX}/include
 +	${BSD_INSTALL_DATA} ./f2c.h ${PREFIX}/include
 +	-@mkdir -p ${PREFIX}/share/doc/f2c
@@ -69,4 +46,3 @@ Add a top level Makefile
 +
 +f2c-f77: fc
 +	sed 's!@PREFIX@!${PREFIX}!g' fc > f2c-f77
-+
diff --git a/lang/f2c/patches/patch-ad b/lang/f2c/patches/patch-ad
index d3c115b3b9f..ac4a189c455 100644
--- a/lang/f2c/patches/patch-ad
+++ b/lang/f2c/patches/patch-ad
@@ -1,10 +1,10 @@
-$NetBSD: patch-ad,v 1.4 1999/12/16 00:58:27 dmcmahill Exp $
+$NetBSD: patch-ad,v 1.5 2004/09/14 22:09:40 dmcmahill Exp $
 
 Name libraries correctly
 
 --- f2c.1t.orig	Tue Sep  8 10:16:48 1998
 +++ f2c.1t	Tue Dec  7 17:24:23 1999
-@@ -334,12 +334,15 @@
+@@ -334,12 +334,12 @@
  output file
  .TP
 -.F /usr/include/f2c.h
@@ -14,14 +14,11 @@ Name libraries correctly
 -.F /usr/lib/libF77.a
 -intrinsic function library
 +.F .../lib/libF77.a
-+intrinsic function library.  May be replaced by libf2c.a
++intrinsic function library. 
  .TP
 -.F /usr/lib/libI77.a
 -Fortran I/O library
 +.F .../lib/libI77.a
-+Fortran I/O library.  May be replaced by libf2c.a
-+.TP
-+.F .../lib/libf2c.a
-+Combined Fortran library.  May be used in place of libF77.a and libI77.a
++Fortran I/O library. 
  .TP
  .F /lib/libc.a
diff --git a/lang/f2c/patches/patch-ae b/lang/f2c/patches/patch-ae
index 61d9f101c08..cd7a1e32c86 100644
--- a/lang/f2c/patches/patch-ae
+++ b/lang/f2c/patches/patch-ae
@@ -1,78 +1,81 @@
-$NetBSD: patch-ae,v 1.8 2002/03/14 22:09:35 dmcmahill Exp $
+$NetBSD: patch-ae,v 1.9 2004/09/14 22:09:40 dmcmahill Exp $
 
-use a bsd style makefile for building shared libs
-
---- libF77/makefile.orig	Fri Apr  6 22:20:09 2001
-+++ libF77/makefile	Fri Apr  6 22:20:40 2001
-@@ -1,26 +1,5 @@
+--- libF77/makefile.orig	Tue Sep 14 18:38:32 2004
++++ libF77/makefile
+@@ -1,7 +1,4 @@
 -.SUFFIXES: .c .o
 -CC = cc
 -SHELL = /bin/sh
 -CFLAGS = -O
--
--# If your system lacks onexit() and you are not using an
--# ANSI C compiler, then you should add -DNO_ONEXIT to CFLAGS,
--# e.g., by changing the above "CFLAGS =" line to
--# CFLAGS = -O -DNO_ONEXIT
--
--# On at least some Sun systems, it is more appropriate to change the
--# "CFLAGS =" line to
--# CFLAGS = -O -Donexit=on_exit
--
++.SUFFIXES: .c .lo
+ 
+ # If your system lacks onexit() and you are not using an
+ # ANSI C compiler, then you should add -DNO_ONEXIT to CFLAGS,
+@@ -12,11 +9,10 @@ CFLAGS = -O
+ # "CFLAGS =" line to
+ # CFLAGS = -O -Donexit=on_exit
+ 
 -# compile, then strip unnecessary symbols
 -.c.o:
 -	$(CC) -c -DSkip_f2c_Undefs $(CFLAGS) $*.c
 -	ld -r -x -o $*.xxx $*.o
 -	mv $*.xxx $*.o
--## Under Solaris (and other systems that do not understand ld -x),
--## omit -x in the ld line above.
--## If your system does not have the ld command, comment out
--## or remove both the ld and mv lines above.
--
-+CPPFLAGS+= -Wcast-align -DNO_ONEXIT -DSkip_f2c_Undefs
-+NOGCCERROR=	#defined
-+MKLINT=	no
- MISC =	F77_aloc.o Version.o main.o s_rnge.o abort_.o getarg_.o iargc_.o \
- 	getenv_.o signal_.o s_stop.o s_paus.o system_.o cabs.o\
-@@ -47,57 +25,11 @@
++# compile
++.c.lo:
++	${LIBTOOL} --mode=compile $(CC) -c -DSkip_f2c_Undefs $(CFLAGS) $*.c
++
+ ## Under Solaris (and other systems that do not understand ld -x),
+ ## omit -x in the ld line above.
+ ## If your system does not have the ld command, comment out
+@@ -41,12 +37,12 @@ INT =	i_abs.o i_dim.o i_dnnt.o i_indx.o 
+ HALF =	h_abs.o h_dim.o h_dnnt.o h_indx.o h_len.o h_mod.o  h_nint.o h_sign.o
+ CMP =	l_ge.o l_gt.o l_le.o l_lt.o hl_ge.o hl_gt.o hl_le.o hl_lt.o
+ EFL =	ef1asc_.o ef1cmc_.o
+-CHAR =	F77_aloc.o s_cat.o s_cmp.o s_copy.o
++CHAR =	s_cat.o s_cmp.o s_copy.o
+ F90BIT = lbitbits.o lbitshft.o
+ QINT =	pow_qq.o qbitbits.o qbitshft.o
  TIME =	dtime_.o etime_.o
  
 -all: signal1.h libF77.a
--
--# You may need to adjust signal1.h suitably for your system...
--signal1.h: signal1.h0
--	cp signal1.h0 signal1.h
--
--# If you get an error compiling dtime_.c or etime_.c, try adding
--# -DUSE_CLOCK to the CFLAGS assignment above; if that does not work,
--# omit $(TIME) from the dependency list for libF77.a below.
--
--# For INTEGER*8 support (which requires system-dependent adjustments to
--# f2c.h), add $(QINT) to the libf2c.a dependency list below...
--
++all: signal1.h libF77.la
+ 
+ # You may need to adjust signal1.h suitably for your system...
+ signal1.h: signal1.h0
+@@ -59,45 +55,26 @@ signal1.h: signal1.h0
+ # For INTEGER*8 support (which requires system-dependent adjustments to
+ # f2c.h), add $(QINT) to the libf2c.a dependency list below...
+ 
 -libF77.a : $(MISC) $(POW) $(CX) $(DCX) $(REAL) $(DBL) $(INT) \
-+OBJ=	$(MISC) $(POW) $(CX) $(DCX) $(REAL) $(DBL) $(INT) \
++OBJS = $(MISC) $(POW) $(CX) $(DCX) $(REAL) $(DBL) $(INT) \
  	$(HALF) $(CMP) $(EFL) $(CHAR) $(F90BIT) $(TIME)
 -	ar r libF77.a $?
 -	ranlib libF77.a || true
--
--### If your system lacks ranlib, you don't need it; see README.
--
++
++LTOBJS = ${OBJS:.o=.lo}
++
++libF77.la : $(LTOBJS)
++	${LIBTOOL} --mode=link ${CC} -o $@ ${LTOBJS} ${LDFLAGS} -rpath ${LIBDIR} -version-info ${F2CMAJOR}:${F2CMINOR}
+ 
+ ### If your system lacks ranlib, you don't need it; see README.
+ 
 -Version.o: Version.c
 -	$(CC) -c Version.c
++Version.lo: Version.c
++	${LIBTOOL} --mode=compile $(CC) ${CFLAGS} -c Version.c
  
--# To compile with C++, first "make f2c.h"
--f2c.h: f2ch.add
--	cat /usr/include/f2c.h f2ch.add >f2c.h
-+SRCS=${OBJ:.o=.c}
+ # To compile with C++, first "make f2c.h"
+ f2c.h: f2ch.add
+ 	cat /usr/include/f2c.h f2ch.add >f2c.h
  
 -install:	libF77.a
 -	mv libF77.a $(LIBDIR)/libF77.a
 -	ranlib $(LIBDIR)/libF77.a || true
-+LIB=F77
++install:	libF77.la
++	${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} libF77.la ${LIBDIR}
  
--clean:
--	rm -f libF77.a *.o
+ clean:
+ 	rm -f libF77.a *.o
  
 -check:
 -	xsum F77_aloc.c Notice README Version.c abort_.c c_abs.c c_cos.c \
@@ -95,4 +98,3 @@ use a bsd style makefile for building shared libs
 -	s_paus.c s_rnge.c s_stop.c sig_die.c signal1.h0 signal_.c system_.c \
 -	z_abs.c z_cos.c z_div.c z_exp.c z_log.c z_sin.c z_sqrt.c >zap
 -	cmp zap libF77.xsum && rm zap || diff libF77.xsum zap
-+.include <bsd.lib.mk>
diff --git a/lang/f2c/patches/patch-ag b/lang/f2c/patches/patch-ag
index 5c91fc6aa71..97498700516 100644
--- a/lang/f2c/patches/patch-ag
+++ b/lang/f2c/patches/patch-ag
@@ -1,10 +1,8 @@
-$NetBSD: patch-ag,v 1.8 2002/03/14 22:09:35 dmcmahill Exp $
+$NetBSD: patch-ag,v 1.9 2004/09/14 22:09:40 dmcmahill Exp $
 
-use a BSD style makefile for building shared libs
-
---- libI77/makefile.orig	Fri Apr  6 22:20:23 2001
-+++ libI77/makefile	Fri Apr  6 22:20:42 2001
-@@ -1,16 +1,5 @@
+--- libI77/makefile.orig	Tue Sep 14 17:11:44 2004
++++ libI77/makefile
+@@ -1,13 +1,11 @@
 -.SUFFIXES: .c .o
 -CC = cc
 -CFLAGS = -O
@@ -15,96 +13,47 @@ use a BSD style makefile for building shared libs
 -	$(CC) -c -DSkip_f2c_Undefs $(CFLAGS) $*.c
 -	ld -r -x -o $*.xxx $*.o
 -	mv $*.xxx $*.o
--## Under Solaris (and other systems that do not understand ld -x),
--## omit -x in the ld line above.
--## If your system does not have the ld command, comment out
--## or remove both the ld and mv lines above.
-+CPPFLAGS+= -Wcast-align -DSkip_f2c_Undefs
-+NOGCCERROR=	#defined
-+MKLINT=	no 
-
- OBJ =	Version.o backspace.o close.o dfe.o dolio.o due.o endfile.o err.o \
-@@ -18,87 +6,7 @@
++all: libI77.la
++
++.SUFFIXES: .c .lo
++
++# compile
++.c.lo:
++	${LIBTOOL} --mode=compile $(CC) -c -DSkip_f2c_Undefs $(CFLAGS) $*.c
++
+ ## Under Solaris (and other systems that do not understand ld -x),
+ ## omit -x in the ld line above.
+ ## If your system does not have the ld command, comment out
+@@ -17,18 +15,18 @@ OBJ =	Version.o backspace.o close.o dfe.
+ 	fmt.o fmtlib.o ftell_.o iio.o ilnw.o inquire.o lread.o lwrite.o \
  	open.o rdfmt.o rewind.o rsfe.o rsli.o rsne.o sfe.o sue.o typesize.o \
  	uio.o util.o wref.o wrtfmt.o wsfe.o wsle.o wsne.o xwsne.o
 -libI77.a:	$(OBJ)
 -		ar r libI77.a $?
 -		ranlib libI77.a || true
--
--### If your system lacks ranlib, you don't need it; see README.
--
++LTOBJ=	${OBJ:.o=.lo}
++
++libI77.la:	$(LTOBJ)
++	${LIBTOOL} --mode=link ${CC} ${CFLAGS} -o $@ ${LTOBJ} ${LDFLAGS} -rpath ${LIBDIR} -version-info ${F2CMAJOR}:${F2CMINOR}
+ 
+ ### If your system lacks ranlib, you don't need it; see README.
+ 
 -install:	libI77.a
 -	cp libI77.a $(LIBDIR)/libI77.a
 -	ranlib $(LIBDIR)/libI77.a || true
--
++install:	libI77.la
++	${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} libI77.la ${LIBDIR}
+ 
 -Version.o: Version.c
 -	$(CC) -c Version.c
--
--# To compile with C++, first "make f2c.h"
--f2c.h: f2ch.add
--	cat /usr/include/f2c.h f2ch.add >f2c.h
--
--
--clean:
--	rm -f $(OBJ) libI77.a
--
--clobber:	clean
--	rm -f libI77.a
++Version.lo: Version.c
++	${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -c Version.c
  
--backspace.o:	fio.h
--close.o:	fio.h
--dfe.o:		fio.h
--dfe.o:		fmt.h
--due.o:		fio.h
--endfile.o:	fio.h rawio.h
--err.o:		fio.h rawio.h
--fmt.o:		fio.h
--fmt.o:		fmt.h
--ftell_.o:	fio.h
--iio.o:		fio.h
--iio.o:		fmt.h
--ilnw.o:		fio.h
--ilnw.o:		lio.h
--inquire.o:	fio.h
--lread.o:	fio.h
--lread.o:	fmt.h
--lread.o:	lio.h
--lread.o:	fp.h
--lwrite.o:	fio.h
--lwrite.o:	fmt.h
--lwrite.o:	lio.h
--open.o:		fio.h rawio.h
--rdfmt.o:	fio.h
--rdfmt.o:	fmt.h
--rdfmt.o:	fp.h
--rewind.o:	fio.h
--rsfe.o:		fio.h
--rsfe.o:		fmt.h
--rsli.o:		fio.h
--rsli.o:		lio.h
--rsne.o:		fio.h
--rsne.o:		lio.h
--sfe.o:		fio.h
--sue.o:		fio.h
--uio.o:		fio.h
--util.o:		fio.h
--wref.o:		fio.h
--wref.o:		fmt.h
--wref.o:		fp.h
--wrtfmt.o:	fio.h
--wrtfmt.o:	fmt.h
--wsfe.o:		fio.h
--wsfe.o:		fmt.h
--wsle.o:		fio.h
--wsle.o:		fmt.h
--wsle.o:		lio.h
--wsne.o:		fio.h
--wsne.o:		lio.h
--xwsne.o:	fio.h
--xwsne.o:	lio.h
--xwsne.o:	fmt.h
-+SRCS=	${OBJ:.o=.c}
-+LIB=	I77
+ # To compile with C++, first "make f2c.h"
+ f2c.h: f2ch.add
+@@ -94,11 +92,3 @@ xwsne.o:	fio.h
+ xwsne.o:	lio.h
+ xwsne.o:	fmt.h
  
 -check:
 -	xsum Notice README Version.c backspace.c close.c dfe.c dolio.c \
@@ -114,4 +63,3 @@ use a BSD style makefile for building shared libs
 -	typesize.c uio.c util.c wref.c wrtfmt.c wsfe.c wsle.c wsne.c \
 -	xwsne.c >zap
 -	cmp zap libI77.xsum && rm zap || diff libI77.xsum zap
-+.include <bsd.lib.mk>