build and install shared libs as well as the static ones. add nb1 to the

version.

8 files changed, 266 insertions, 52 deletions

diff --git a/lang/f2c/Makefile b/lang/f2c/Makefile
index f2c8e29a158..179ea55b4bf 100644
--- a/lang/f2c/Makefile
+++ b/lang/f2c/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2001/03/05 16:41:58 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2001/04/07 12:43:47 dmcmahill Exp $
 
 DISTNAME=	f2c-20001205
+PKGNAME=	f2c-20001205nb1
 WRKSRC=		${WRKDIR}/f2c
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_LOCAL}
@@ -24,6 +25,11 @@ COMMENT=	Fortran to C compiler including a script to emulate f77
 
 CONFLICTS=	egcs-current-19980608
 
+F2CMAJOR=	0
+F2CMINOR=	0
+MAKE_ENV+=	F2CMAJOR=${F2CMAJOR} F2CMINOR=${F2CMINOR}
+PLIST_SUBST+=	F2CMAJOR=${F2CMAJOR} F2CMINOR=${F2CMINOR}
+
 post-extract:
 	@${RM} ${WRKSRC}/index.html
 	@${GUNZIP_CMD} ${WRKSRC}/*.gz
@@ -35,7 +41,12 @@ post-extract:
 post-patch:
 	@cd ${WRKSRC} && ${CC} -o chktypes chktypes.c
 	${WRKSRC}/chktypes -v
-	@${CP} ${WRKSRC}/f2c.h ${WRKSRC}/libF77/f2c.h
-	@${CP} ${WRKSRC}/f2c.h ${WRKSRC}/libI77/f2c.h
+	@${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
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/f2c/files/patch-sum b/lang/f2c/files/patch-sum
index d1575dadf9c..de391eabb58 100644
--- a/lang/f2c/files/patch-sum
+++ b/lang/f2c/files/patch-sum
@@ -1,10 +1,10 @@
-$NetBSD: patch-sum,v 1.5 2001/02/24 18:37:46 dmcmahill Exp $
+$NetBSD: patch-sum,v 1.6 2001/04/07 12:43:48 dmcmahill Exp $
 
-MD5 (patch-aa) = bacc4f81d3f1549b4f1bed03c922651c
-MD5 (patch-ab) = f3367ece1c03ae7f55efe25c9aa1a6f2
-MD5 (patch-ac) = 77d247f2f38a28934a2352c2ecb32af0
-MD5 (patch-ad) = 2fcc81cb41f650e25e2c093aa210a093
-MD5 (patch-ae) = 4485a92ce4eb02d939e4d09525abca13
-MD5 (patch-ag) = e16c417cea4b929213de4f925f8bf8d9
-MD5 (patch-ai) = 486f9733e4163555af42e98973c98f77
-MD5 (patch-aj) = 150ae4c9e4da26cd1a9d2743000e4ed8
+SHA1 (patch-aa) = 4992e64acb0d9c0c0bec7d84b79afe4853a512d1
+SHA1 (patch-ab) = ddd695d45ac7819578b22a8a8aed0f09803cd3a0
+SHA1 (patch-ac) = bc53ff9946e4ef7b072fd2440afddcda9967b2b9
+SHA1 (patch-ad) = 0144d0cdf55ce8117d179a56acc4db64fe67c8e0
+SHA1 (patch-ae) = 00278dbc3a8bf4d8a9e54f11c337cbaeb65e7016
+SHA1 (patch-ag) = 0229f503b2c7e22016d40c9de4a26f47cf315663
+SHA1 (patch-ai) = ccfa759c016e980ed05105833557215ef00c74de
+SHA1 (patch-aj) = c58361fbbfc06e033b2a47e1d1e370716c4b185c
diff --git a/lang/f2c/patches/patch-aa b/lang/f2c/patches/patch-aa
index b81390d4fee..db0e6ef4639 100644
--- a/lang/f2c/patches/patch-aa
+++ b/lang/f2c/patches/patch-aa
@@ -1,33 +1,30 @@
-$NetBSD: patch-aa,v 1.6 1999/12/16 00:58:27 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.7 2001/04/07 12:43:48 dmcmahill Exp $
 
 Add a top level Makefile
 
---- /dev/null	Mon Aug 24 13:53:09 1998
-+++ Makefile	Mon Aug 24 14:03:31 1998
-@@ -0,0 +1,51 @@
+--- /dev/null	Thu Apr  5 17:09:09 2001
++++ Makefile	Thu Apr  5 18:31:35 2001
+@@ -0,0 +1,48 @@
 +# Top level Makefile for f2c, libF77, and libI77
 +
 +all: f2c libf2c.a f2c-f77 man
 +
 +
 +f2c:
-+	#Making all in 'src'
-+	cd src; make all
++	@echo Making all in 'src'
++	cd src; ${MAKE} all
 +	cp src/f2c f2c
 +
-+libF77.a:
-+	#Making all in 'libF77'
-+	cd libF77;  make all
-+	cp libF77/libF77.a libF77.a
++libF77/libF77.a:
++	@echo Making all in 'libF77'
++	cd libF77 &&  ${MAKE} all
 +
-+libI77.a:
-+	#Making all in 'libI77'
-+	cd libI77; make libI77.a
-+	cp libI77/libI77.a libI77.a
++libI77/libI77.a:
++	@echo Making all in 'libI77'
++	cd libI77 &&  ${MAKE} all
 +
-+libf2c.a: libI77.a libF77.a
-+	cp libF77.a libf2c.a
-+	ar ruv libf2c.a libI77/*.o
++libf2c.a: libI77/libI77.a libF77/libF77.a
++	ar ruv libf2c.a libF77/libF77.a libI77/libI77.a
 +	ranlib libf2c.a
 +
 +man: f2c.0
@@ -38,14 +35,14 @@ Add a top level Makefile
 +	nroff -man f2c.1 > f2c.0
 +
 +
-+install:
++install::
 +	-@mkdir -p ${PREFIX}/bin
 +	${BSD_INSTALL_PROGRAM} ./src/f2c ${PREFIX}/bin
 +	${BSD_INSTALL_SCRIPT} ./f2c-f77 ${PREFIX}/bin
 +	-@mkdir -p ${PREFIX}/lib
++	@cd libI77 && ${MAKE} -f Makefile install LIBDIR=${PREFIX}/lib
++	@cd libF77 && ${MAKE} -f Makefile install LIBDIR=${PREFIX}/lib
 +	${BSD_INSTALL_DATA} ./libf2c.a ${PREFIX}/lib
-+	${BSD_INSTALL_DATA} ./libF77.a ${PREFIX}/lib
-+	${BSD_INSTALL_DATA} ./libI77.a ${PREFIX}/lib
 +	-@mkdir -p ${PREFIX}/include
 +	${BSD_INSTALL_DATA} ./f2c.h ${PREFIX}/include
 +	-@mkdir -p ${PREFIX}/share/doc/f2c
@@ -56,3 +53,4 @@ Add a top level Makefile
 +
 +f2c-f77: fc
 +	sed 's!@PREFIX@!${PREFIX}!g' fc > f2c-f77
++
diff --git a/lang/f2c/patches/patch-ac b/lang/f2c/patches/patch-ac
index dc9a2c7beee..7590d59c75b 100644
--- a/lang/f2c/patches/patch-ac
+++ b/lang/f2c/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.8 2001/02/24 18:37:46 dmcmahill Exp $
+$NetBSD: patch-ac,v 1.9 2001/04/07 12:43:48 dmcmahill Exp $
 
 Much cleanup of the script.  Added various options such as
 -O    for optimization
@@ -185,7 +185,7 @@ Much cleanup of the script.  Added various options such as
 +CPPFLAGS=
 +CFLAGS=-I@PREFIX@/include 
 +LIBS=
-+FLIBS="-L@PREFIX@/lib -lf2c -lm"
++FLIBS="-Wl,-R@PREFIX@/lib -L@PREFIX@/lib -lF77 -lI77 -lm"
 +VERBOSE=no
 +
  while
diff --git a/lang/f2c/patches/patch-ae b/lang/f2c/patches/patch-ae
index a753a53d751..c09dc83a022 100644
--- a/lang/f2c/patches/patch-ae
+++ b/lang/f2c/patches/patch-ae
@@ -1,11 +1,97 @@
-$NetBSD: patch-ae,v 1.5 2001/02/24 18:37:46 dmcmahill Exp $
+$NetBSD: patch-ae,v 1.6 2001/04/07 12:43:48 dmcmahill Exp $
 
---- ./libF77/makefile.orig	Tue Dec  7 17:52:36 1999
-+++ ./libF77/makefile	Tue Dec  7 18:03:51 1999
-@@ -2,5 +2,5 @@
- CC = cc
- SHELL = /bin/sh
+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,4 @@
+-.SUFFIXES: .c .o
+-CC = cc
+-SHELL = /bin/sh
 -CFLAGS = -O
-+CFLAGS = -fPIC -Wcast-align -O2 -DNO_ONEXIT 
+-
+-# 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
+-
+-# 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=	yes
+ 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 @@
+ 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...
+-
+-libF77.a : $(MISC) $(POW) $(CX) $(DCX) $(REAL) $(DBL) $(INT) \
++OBJ=	$(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.
+-
+-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
++SRCS=${OBJ:.o=.c}
+ 
+-install:	libF77.a
+-	mv libF77.a $(LIBDIR)/libF77.a
+-	ranlib $(LIBDIR)/libF77.a || true
++LIB=F77
+ 
+-clean:
+-	rm -f libF77.a *.o
  
- # If your system lacks onexit() and you are not using an
+-check:
+-	xsum F77_aloc.c Notice README Version.c abort_.c c_abs.c c_cos.c \
+-	c_div.c c_exp.c c_log.c c_sin.c c_sqrt.c cabs.c d_abs.c d_acos.c \
+-	d_asin.c d_atan.c d_atn2.c d_cnjg.c d_cos.c d_cosh.c d_dim.c \
+-	d_exp.c d_imag.c d_int.c d_lg10.c d_log.c d_mod.c d_nint.c \
+-	d_prod.c d_sign.c d_sin.c d_sinh.c d_sqrt.c d_tan.c d_tanh.c \
+-	derf_.c derfc_.c dtime_.c \
+-	ef1asc_.c ef1cmc_.c erf_.c erfc_.c etime_.c exit_.c f2ch.add \
+-	getarg_.c getenv_.c h_abs.c h_dim.c h_dnnt.c h_indx.c h_len.c \
+-	h_mod.c h_nint.c h_sign.c hl_ge.c hl_gt.c hl_le.c hl_lt.c \
+-	i_abs.c i_dim.c i_dnnt.c i_indx.c i_len.c i_mod.c i_nint.c \
+-	i_sign.c iargc_.c l_ge.c l_gt.c l_le.c l_lt.c lbitbits.c lbitshft.c \
+-	main.c makefile pow_ci.c pow_dd.c pow_di.c pow_hh.c pow_ii.c \
+-	pow_qq.c pow_ri.c pow_zi.c pow_zz.c qbitbits.c qbitshft.c \
+-	r_abs.c r_acos.c r_asin.c r_atan.c r_atn2.c \
+-	r_cnjg.c r_cos.c r_cosh.c r_dim.c r_exp.c r_imag.c r_int.c r_lg10.c \
+-	r_log.c r_mod.c r_nint.c r_sign.c r_sin.c r_sinh.c r_sqrt.c \
+-	r_tan.c r_tanh.c s_cat.c s_cmp.c s_copy.c \
+-	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 93673ee999c..10248b04db0 100644
--- a/lang/f2c/patches/patch-ag
+++ b/lang/f2c/patches/patch-ag
@@ -1,11 +1,116 @@
-$NetBSD: patch-ag,v 1.5 2001/02/24 18:37:46 dmcmahill Exp $
+$NetBSD: patch-ag,v 1.6 2001/04/07 12:43:48 dmcmahill Exp $
 
---- ./libI77/makefile.orig	Tue Dec  7 17:52:41 1999
-+++ ./libI77/makefile	Tue Dec  7 18:05:10 1999
-@@ -1,5 +1,5 @@
- .SUFFIXES: .c .o
- CC = cc
+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,4 @@
+-.SUFFIXES: .c .o
+-CC = cc
 -CFLAGS = -O
-+CFLAGS = -fPIC -Wcast-align -O2 
- SHELL = /bin/sh
+-SHELL = /bin/sh
+-
+-# 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 -DSkip_f2c_Undefs
++NOGCCERROR=	yes
+ 
+ OBJ =	Version.o backspace.o close.o dfe.o dolio.o due.o endfile.o err.o \
+@@ -18,87 +6,7 @@
+ 	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.
+-
+-install:	libI77.a
+-	cp libI77.a $(LIBDIR)/libI77.a
+-	ranlib $(LIBDIR)/libI77.a || true
+-
+-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
+ 
+-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
  
+-check:
+-	xsum Notice README Version.c backspace.c close.c dfe.c dolio.c \
+-	due.c endfile.c err.c f2ch.add fio.h fmt.c fmt.h fmtlib.c fp.h \
+-	ftell_.c iio.c ilnw.c inquire.c lio.h lread.c lwrite.c makefile \
+-	open.c rawio.h rdfmt.c rewind.c rsfe.c rsli.c rsne.c sfe.c sue.c \
+-	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>
diff --git a/lang/f2c/patches/patch-aj b/lang/f2c/patches/patch-aj
index b64ee44712b..e8e708a1656 100644
--- a/lang/f2c/patches/patch-aj
+++ b/lang/f2c/patches/patch-aj
@@ -1,4 +1,8 @@
-$NetBSD: patch-aj,v 1.1 1999/01/14 13:56:04 frueauf Exp $
+$NetBSD: patch-aj,v 1.2 2001/04/07 12:43:49 dmcmahill Exp $
+
+does a sanity check of the settings in f2c.h  If these settings
+are wrong, a message is printed asking that the package maintainer
+be contacted.
 
 --- /dev/null	Wed Jan 13 02:06:04 1999
 +++ chktypes.c	Wed Jan 13 18:12:34 1999
diff --git a/lang/f2c/pkg/PLIST b/lang/f2c/pkg/PLIST
index 2fec715d5ee..9a74987edc1 100644
--- a/lang/f2c/pkg/PLIST
+++ b/lang/f2c/pkg/PLIST
@@ -1,10 +1,20 @@
-@comment $NetBSD: PLIST,v 1.4 1998/08/25 15:22:47 tv Exp $
+@comment $NetBSD: PLIST,v 1.5 2001/04/07 12:43:49 dmcmahill Exp $
 bin/f2c
 bin/f2c-f77
 include/f2c.h
 lib/libf2c.a
 lib/libF77.a
+lib/libF77_p.a
+lib/libF77_pic.a
+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.so.${F2CMAJOR}.${F2CMINOR}
+lib/libI77.so.${F2CMAJOR}
+lib/libI77.so
 man/man1/f2c.1
 man/cat1/f2c.0
 share/doc/f2c/f2c.ps