Split f2c into library (devel/libf2c) and translator packages.

Requested by <joerg>.

12 files changed, 22 insertions, 370 deletions

diff --git a/lang/f2c/Makefile b/lang/f2c/Makefile
index 88ff1bbc58c..9514c094f0d 100644
--- a/lang/f2c/Makefile
+++ b/lang/f2c/Makefile
@@ -1,22 +1,10 @@
-# $NetBSD: Makefile,v 1.48 2009/12/01 10:09:17 dsainty Exp $
+# $NetBSD: Makefile,v 1.49 2009/12/03 12:39:59 asau Exp $
 
-DISTNAME=	f2c-20090411
+DISTNAME=	f2c-20090411	# see notes below
+PKGREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 
-# Note.  the distfile is kept locally because it is
-# created "on the fly" by the real master site with
-# no version number included.  This makes it difficult
-# at best to use the real master site.  The distfile
-# was created by:
-#   ftp ftp://netlib.bell-labs.com/netlib/f2c.tar
-#   tar -xvf f2c.tar f2c/00lastchange.gz
-#   gzcat f2c/00lastchange.gz
-#
-#read what the last change date was.
-#
-#   mv f2c.tar 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
@@ -26,35 +14,16 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 CONFLICTS=	egcs-current-19980608
 
 WRKSRC=		${WRKDIR}/f2c
-USE_LIBTOOL=	yes
-USE_TOOLS+=	yacc unzip
 
+BUILD_DIRS=	src
 USE_BSD_MAKEFILE=	yes
-MAKE_FLAGS=	LIBF2CSRCDIR='$$(.CURDIR)/libf2c' MKLTARCHIVE=yes
-
-INSTALLATION_DIRS=	bin lib include share/doc/f2c ${PKGMANDIR}/man1 ${PKGMANDIR}/cat1
-INSTALL_MAKE_FLAGS=	BINDIR=$(PREFIX)/bin LIBDIR=$(PREFIX)/lib
+INSTALLATION_DIRS=	bin share/doc/f2c ${PKGMANDIR}/man1 ${PKGMANDIR}/cat1
 
 post-extract:
-	@${RM} ${WRKSRC}/index.html
-	@cd ${WRKSRC}; ${RM} -f libf77 libi77		# subsumed by libf2c...
-	@cd ${WRKSRC}; unzip -d libf2c libf2c.zip
-	@cd ${WRKSRC}; ${MKDIR} libF77 libI77		# ...but we recreate them for compatibility
-	@${CP} ${FILESDIR:Q}/libf77.mk ${WRKSRC}/libF77/Makefile
-	@${CP} ${FILESDIR:Q}/libi77.mk ${WRKSRC}/libI77/Makefile
 	@${CP} ${FILESDIR:Q}/f2c.mk ${WRKSRC}/src/Makefile
-	@${CP} ${FILESDIR:Q}/libtool.mk ${WRKSRC}/libtool.mk
-	@${CP} ${FILESDIR:Q}/main.mk ${WRKSRC}/Makefile
-	@${CP} ${FILESDIR:Q}/f2c-f77.in ${WRKSRC}/src
-	@${CP} ${FILESDIR:Q}/chktypes.c ${WRKSRC}
-	@${RM} ${WRKSRC}/src/index.html
 	@mv ${WRKSRC}/src/.depend  ${WRKSRC}/src/depend.orig
 	@mv ${WRKSRC}/src/f2c.1 ${WRKSRC}/src/f2c.1.orig
 
-do-configure:
-	@cd ${WRKSRC} && ${CC} -o chktypes chktypes.c
-	${WRKSRC}/chktypes -v
-
 # Handle f2c-f77 script:
 post-build:
 	${SED} -e 's;@PREFIX@;${PREFIX};g' \
@@ -70,8 +39,18 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/$f ${DESTDIR}${PREFIX}/share/doc/f2c/$f
 .endfor
 
-.include "../../mk/bsd.prefs.mk"
-MAKE_ENV+=	MACHINE_ARCH=${MACHINE_ARCH:Q}
-
+# Note.  the distfile is kept locally because it is
+# created "on the fly" by the real master site with
+# no version number included.  This makes it difficult
+# at best to use the real master site.  The distfile
+# was created by:
+#   ftp ftp://netlib.bell-labs.com/netlib/f2c.tar
+#   tar -xvf f2c.tar f2c/00lastchange.gz
+#   gzcat f2c/00lastchange.gz
+#
+#read what the last change date was.
+#
+#   mv f2c.tar f2c-yyyymmdd.tar
+#   gzip --best f2c-yyyymmdd.tar
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/f2c/PLIST b/lang/f2c/PLIST
index 72a5ac0eaf4..45fbd1b5d6b 100644
--- a/lang/f2c/PLIST
+++ b/lang/f2c/PLIST
@@ -1,9 +1,6 @@
-@comment $NetBSD: PLIST,v 1.5 2009/11/22 13:12:53 asau Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/12/03 12:39:59 asau Exp $
 bin/f2c
 bin/f2c-f77
-include/f2c.h
-lib/libF77.la
-lib/libI77.la
 man/cat1/f2c.0
 man/man1/f2c.1
 share/doc/f2c/changes
diff --git a/lang/f2c/buildlink3.mk b/lang/f2c/buildlink3.mk
deleted file mode 100644
index 06911d5efc2..00000000000
--- a/lang/f2c/buildlink3.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:48 joerg Exp $
-
-BUILDLINK_TREE+=	f2c
-
-.if !defined(F2C_BUILDLINK3_MK)
-F2C_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.f2c+=		f2c>=20001205nb3
-BUILDLINK_ABI_DEPENDS.f2c+=	f2c>=20001205nb8
-BUILDLINK_PKGSRCDIR.f2c?=	../../lang/f2c
-
-# The f2c-f77 script takes some environment variables to override hardcoded
-# values for the compiler and C preprocessor.
-#
-CONFIGURE_ENV+=         CC_f2c=${CC:Q}
-CONFIGURE_ENV+=         CPP=${CPP:Q}
-MAKE_ENV+=              CC_f2c=${CC:Q}
-MAKE_ENV+=              CPP=${CPP:Q}
-.endif # F2C_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-f2c
diff --git a/lang/f2c/distinfo b/lang/f2c/distinfo
index b7bda663ff4..86532bb4f63 100644
--- a/lang/f2c/distinfo
+++ b/lang/f2c/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.23 2009/11/23 15:30:29 tnn Exp $
+$NetBSD: distinfo,v 1.24 2009/12/03 12:39:59 asau Exp $
 
 SHA1 (f2c-20090411.tar.gz) = 949e832b84aaa912a99471a95c6fd449898d50e0
 RMD160 (f2c-20090411.tar.gz) = e86ff3de4564267a57f508a5a68e81af2b1a9468
 Size (f2c-20090411.tar.gz) = 1045385 bytes
 SHA1 (patch-aa) = f1224ff17cdc96f083a247dce88b690e8b939eb0
 SHA1 (patch-ad) = 7f204a45891e3632589ea8fb0e4e379a0a792dea
-SHA1 (patch-ai) = d8c1f731c18394e0953b6128d0bd597986ab910f
diff --git a/lang/f2c/files/chktypes.c b/lang/f2c/files/chktypes.c
deleted file mode 100644
index a4bdf3ce8e8..00000000000
--- a/lang/f2c/files/chktypes.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/* $NetBSD: chktypes.c,v 1.1 2009/11/22 12:52:54 asau 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.
-*/
-
-#include <stdio.h>
-#include <string.h>
-#include "f2c.h"
-
-int main(int argc, char *argv[])
-{
-
-  int err=0;
-  int pok=0;
-
-
-  if(argc > 1)
-    {
-      if(strncmp(argv[1],"-v",2)==0)
-	{
-	  pok=1;
-	}
-    }
-  if(sizeof(doublecomplex) == 2*sizeof(doublereal))
-    {
-      if(pok)
-	printf("sizeof(doublecomplex) = 2*sizeof(doublereal) = %d\n",sizeof(doublecomplex));
-    }
-  else
-    {
-      printf("ERROR:\tsizeof(doublecomplex) \t= %d\n\t2*sizeof(doublereal) \t= %d\n",
-	     sizeof(doublecomplex),2*sizeof(doublereal));
-      err=1;
-    }
-
-
-  if(sizeof(doublereal) == sizeof(complex))
-    {
-      if(pok)
-	printf("sizeof(doublereal)    = sizeof(complex)      = %d\n",sizeof(doublereal));
-    }
-  else
-    {
-      printf("ERROR:\tsizeof(doublereal) \t= %d\n\tsizeof(complex) \t= %d\n",
-	     sizeof(doublereal),sizeof(complex));
-      err=1;
-    }
-
-
-  if(sizeof(doublereal) == 2*sizeof(real))
-    {
-      if(pok)
-	printf("sizeof(doublereal)    = 2*sizeof(real)       = %d\n",sizeof(doublereal));
-    }
-  else
-    {
-      printf("ERROR:\tsizeof(doublereal) \t= %d\n\t2*sizeof(real)\t = %d\n",
-	     sizeof(doublereal),2*sizeof(real));
-      err=1;
-    }
-
-  if(sizeof(real) == sizeof(integer))
-    {
-      if(pok)
-	printf("sizeof(real)          = sizeof(integer)      = %d\n",sizeof(real));
-    }
-  else
-    {
-      printf("ERROR:\tsizeof(real) \t= %d\n\tsizeof(integer) \t= %d\n",
-	     sizeof(real),sizeof(integer));
-      err=1;
-    }
-
-  if(sizeof(real) == sizeof(logical))
-    {
-      if(pok)
-	printf("sizeof(real)          = sizeof(logical)      = %d\n",sizeof(real));
-    }
-  else
-    {
-      printf("ERROR:\tsizeof(real) \t= %d\n\tsizeof(logical) \t= %d\n",
-	     sizeof(real),sizeof(logical));
-      err=1;
-    }
-
-  if(sizeof(real) == 2*sizeof(shortint))
-    {
-      if(pok)
-	printf("sizeof(real)          = 2*sizeof(shortint)   = %d\n",sizeof(real));
-    }
-  else
-    {
-      printf("ERROR:\tsizeof(real) \t= %d\n\t2*sizeof() \t= %d\n",
-	     sizeof(real),2*sizeof(shortint));
-      err=1;
-    }
-
-  if(pok)
-    {
-      printf("\n\n-------------------\n");
-      printf("sizeof(short)  = %d\n",sizeof(short));
-      printf("sizeof(int)    = %d\n",sizeof(int));
-      printf("sizeof(float)  = %d\n",sizeof(float));
-      printf("sizeof(long)   = %d\n",sizeof(long));
-      printf("sizeof(double) = %d\n",sizeof(double));
-      printf("\n\n-------------------\n");
-    }
-
-  if(err)
-    {
-      printf("The header file f2c.h has the wrong typedef's for your machine\n");
-      printf("architecture.  Please contact the package maintainer.\n");
-    }
-
-  return(err);
-}
diff --git a/lang/f2c/files/f2c-f77.in b/lang/f2c/files/f2c-f77.in
index b251d3425e5..998e40bb4e9 100644
--- a/lang/f2c/files/f2c-f77.in
+++ b/lang/f2c/files/f2c-f77.in
@@ -161,7 +161,7 @@ ARGS=
 CPPFLAGS=
 CFLAGS=-I@PREFIX@/include 
 LIBS=
-FLIBS="-Wl,-R@PREFIX@/lib -L@PREFIX@/lib -lF77 -lI77 -lm"
+FLIBS="-Wl,-R@PREFIX@/lib -L@PREFIX@/lib -lf2c -lm"
 VERBOSE=no
 
 while
diff --git a/lang/f2c/files/f2c.mk b/lang/f2c/files/f2c.mk
index fc8a82521c3..7e81ac6d287 100644
--- a/lang/f2c/files/f2c.mk
+++ b/lang/f2c/files/f2c.mk
@@ -7,7 +7,7 @@ SRCS=	main.c init.c gram.y lex.c proc.c equiv.c data.c format.c \
 	output.c p1output.c pread.c put.c putpcc.c vax.c formatdata.c \
 	parse_args.c niceprintf.c cds.c sysdep.c version.c $(MALLOC)
 
-F2CSRCDIR=	$(.CURDIR)/../distrib/src
+F2CSRCDIR=	.
 .PATH:	$(F2CSRCDIR)
 
 # To use the malloc whose source accompanies the f2c source,
diff --git a/lang/f2c/files/libf77.mk b/lang/f2c/files/libf77.mk
deleted file mode 100644
index cde8ceacf3b..00000000000
--- a/lang/f2c/files/libf77.mk
+++ /dev/null
@@ -1,65 +0,0 @@
-LIB=	F77
-SHLIB_MAJOR=	0
-SHLIB_MINOR=	0
-
-# Simulate "bsd.init.mk" because pkgsrc doesn't provide it for some reason:
-.if !target(__initialized__)
-__initialized__:
-.if exists(${.CURDIR}/../Makefile.inc)
-.include "${.CURDIR}/../Makefile.inc"
-.endif
-.include <bsd.own.mk>
-.include <bsd.obj.mk>
-.include <bsd.dep.mk>
-.-include <bsd.depall.mk>
-.MAIN:		all
-.endif
-# .include <bsd.init.mk>
-.PATH:	$(LIBF2CSRCDIR)
-
-SRCS=	$(MISC) $(POW) $(CX) $(DCX) $(REAL) $(DBL) $(INT) \
-	$(HALF) $(CMP) $(EFL) $(CHAR) $(F90BIT) $(TIME)
-DPSRCS=		f2c.h signal1.h
-
-CPPFLAGS=	-I.	# for generated include files
-CPPFLAGS+=	-DSkip_f2c_Undefs
-
-MISC =	f77_aloc.c f77vers.c main.c s_rnge.c abort_.c getarg_.c iargc_.c \
-	getenv_.c signal_.c s_stop.c s_paus.c system_.c cabs.c \
-	derf_.c derfc_.c erf_.c erfc_.c sig_die.c exit_.c
-POW =	pow_ci.c pow_dd.c pow_di.c pow_hh.c pow_ii.c  pow_ri.c pow_zi.c pow_zz.c
-CX =	c_abs.c c_cos.c c_div.c c_exp.c c_log.c c_sin.c c_sqrt.c
-DCX =	z_abs.c z_cos.c z_div.c z_exp.c z_log.c z_sin.c z_sqrt.c
-REAL =	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
-DBL =	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
-INT =	i_abs.c i_dim.c i_dnnt.c i_indx.c i_len.c i_mod.c i_nint.c i_sign.c
-HALF =	h_abs.c h_dim.c h_dnnt.c h_indx.c h_len.c h_mod.c  h_nint.c h_sign.c
-CMP =	l_ge.c l_gt.c l_le.c l_lt.c hl_ge.c hl_gt.c hl_le.c hl_lt.c
-EFL =	ef1asc_.c ef1cmc_.c
-CHAR =	s_cat.c s_cmp.c s_copy.c
-F90BIT = lbitbits.c lbitshft.c
-QINT =	pow_qq.c qbitbits.c qbitshft.c
-TIME =	dtime_.c etime_.c
-
-
-f2c.h:	f2c.h0;		cp $> $@
-signal1.h: signal1.h0;	cp $> $@
-
-CLEANFILES=	$(DPSRCS)
-
-INCS=	f2c.h
-install:	incinstall
-
-.if defined(MKLTARCHIVE) && !empty(MKLTARCHIVE:M[Yy][Ee][Ss])
-.include "../libtool.mk"
-.include "bsd.inc.mk"
-.else
-.include "bsd.lib.mk"
-.endif
diff --git a/lang/f2c/files/libi77.mk b/lang/f2c/files/libi77.mk
deleted file mode 100644
index c92a27051e6..00000000000
--- a/lang/f2c/files/libi77.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-LIB=	I77
-SHLIB_MAJOR=	0
-SHLIB_MINOR=	0
-
-# Simulate "bsd.init.mk" because pkgsrc doesn't provide it for some reason:
-.if !target(__initialized__)
-__initialized__:
-.if exists(${.CURDIR}/../Makefile.inc)
-.include "${.CURDIR}/../Makefile.inc"
-.endif
-.include <bsd.own.mk>
-.include <bsd.obj.mk>
-.include <bsd.dep.mk>
-.-include <bsd.depall.mk>
-.MAIN:		all
-.endif
-# .include <bsd.init.mk>
-.PATH:	$(LIBF2CSRCDIR)
-
-SRCS =	backspac.c close.c dfe.c dolio.c due.c endfile.c err.c \
-	fmt.c fmtlib.c ftell_.c iio.c ilnw.c inquire.c lread.c lwrite.c \
-	open.c 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
-SRCS+=	i77vers.c	# previously known as "Version.c"
-# Previously there was "backspace.c" instead of "backspac.c".
-
-DPSRCS=		f2c.h sysdep1.h
-
-CPPFLAGS=	-I.	# for generated include files
-
-f2c.h:	f2c.h0;		cp $> $@
-sysdep1.h: sysdep1.h0;	cp $> $@
-
-CLEANFILES=	$(DPSRCS)
-
-CPPFLAGS+=	-DNO_My_ctype
-CPPFLAGS+=	-DSkip_f2c_Undefs
-
-i77vers.lo: i77vers.c
-	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $(.ALLSRC:M*.c)
-
-.if defined(MKLTARCHIVE) && !empty(MKLTARCHIVE:M[Yy][Ee][Ss])
-.include "../libtool.mk"
-.else
-.include "bsd.lib.mk"
-.endif
diff --git a/lang/f2c/files/libtool.mk b/lang/f2c/files/libtool.mk
deleted file mode 100644
index 4f692152e5f..00000000000
--- a/lang/f2c/files/libtool.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-# building library using libtool, simplified
-
-# Simulate "bsd.init.mk" because pkgsrc doesn't provide it for some reason:
-.if !target(__initialized__)
-__initialized__:
-.if exists(${.CURDIR}/../Makefile.inc)
-.include "${.CURDIR}/../Makefile.inc"
-.endif
-.include <bsd.own.mk>
-.include <bsd.obj.mk>
-.include <bsd.dep.mk>
-.-include <bsd.depall.mk>
-.MAIN:		all
-.endif
-# .include <bsd.init.mk>
-
-OBJS+=		$(SRCS:.c=.o)
-LTOBJS+=	$(SRCS:.c=.lo)
-
-.SUFFIXES:	.c .lo
-.c.lo:
-	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
-lib$(LIB).la:	$(LTOBJS)
-	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $(LTOBJS) $(LDFLAGS) -rpath $(LIBDIR) -version-info $(SHLIB_MAJOR):$(SHLIB_MINOR)
-
-$(LTOBJS):	$(DPSRCS)
-
-all:		lib$(LIB).la
-
-install:	lib$(LIB).la
-	$(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) -o $(LIBOWN) -g $(LIBGRP) -m $(LIBMODE) \
-		lib$(LIB).la $(DESTDIR)$(LIBDIR)
-
-clean cleandir:
-	rm -f $(CLEANFILES)
-	rm -f lib$(LIB).la $(LTOBJS) $(OBJS)
-	rm -rf .libs
-
-LIBTOOL?=	libtool
-LIBDIR?=	/usr/local/lib	# required
diff --git a/lang/f2c/files/main.mk b/lang/f2c/files/main.mk
deleted file mode 100644
index fb476b0563e..00000000000
--- a/lang/f2c/files/main.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIR=	libF77 libI77 src
-
-.include <bsd.subdir.mk>
diff --git a/lang/f2c/patches/patch-ai b/lang/f2c/patches/patch-ai
deleted file mode 100644
index a32653024c6..00000000000
--- a/lang/f2c/patches/patch-ai
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ai,v 1.8 2009/11/22 21:19:19 tnn Exp $
-
-required to make 
-sizeof(integer) == sizeof(real)
-and
-sizeof(logical) == sizeof(real)
-(per f2c/readme)
-
---- f2c.h.orig	Tue Sep  7 13:46:24 1999
-+++ f2c.h	Tue Dec  7 18:08:26 1999
-@@ -8,5 +8,9 @@
- #define F2C_INCLUDE
- 
-+#if defined(__alpha__) || defined(__sparc64__) || defined(__x86_64__) || defined(__sparcv8) || defined(__sparcv9)
-+typedef int integer;
-+#else
- typedef long int integer;
-+#endif
- typedef unsigned long int uinteger;
- typedef char *address;
-@@ -16,5 +20,9 @@
- typedef struct { real r, i; } complex;
- typedef struct { doublereal r, i; } doublecomplex;
-+#if defined(__alpha__) || defined(__sparc64__) || defined(__x86_64__) || defined(__sparcv8) || defined(__sparcv9)
-+typedef int logical;
-+#else
- typedef long int logical;
-+#endif
- typedef short int shortlogical;
- typedef char logical1;