1 files changed, 34 insertions, 86 deletions
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>