pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang/f2c Split f2c into library (devel/libf2c) and tra...
details: https://anonhg.NetBSD.org/pkgsrc/rev/382d0f1c820e
branches: trunk
changeset: 568076:382d0f1c820e
user: asau <asau%pkgsrc.org@localhost>
date: Thu Dec 03 12:39:59 2009 +0000
description:
Split f2c into library (devel/libf2c) and translator packages.
Requested by <joerg>.
diffstat:
lang/f2c/Makefile | 57 +++++++---------------
lang/f2c/PLIST | 5 +-
lang/f2c/buildlink3.mk | 21 --------
lang/f2c/distinfo | 3 +-
lang/f2c/files/chktypes.c | 118 ----------------------------------------------
lang/f2c/files/f2c-f77.in | 2 +-
lang/f2c/files/f2c.mk | 2 +-
lang/f2c/files/libf77.mk | 65 -------------------------
lang/f2c/files/libi77.mk | 46 -----------------
lang/f2c/files/libtool.mk | 40 ---------------
lang/f2c/files/main.mk | 3 -
lang/f2c/patches/patch-ai | 30 -----------
12 files changed, 22 insertions(+), 370 deletions(-)
diffs (truncated from 491 to 300 lines):
diff -r 7cced07216a8 -r 382d0f1c820e lang/f2c/Makefile
--- a/lang/f2c/Makefile Thu Dec 03 12:05:23 2009 +0000
+++ b/lang/f2c/Makefile Thu Dec 03 12:39:59 2009 +0000
@@ -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@localhost
HOMEPAGE= http://www.netlib.org/f2c/index.html
COMMENT= Fortran to C compiler including a script to emulate f77
@@ -26,35 +14,16 @@
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 @@
${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 -r 7cced07216a8 -r 382d0f1c820e lang/f2c/PLIST
--- a/lang/f2c/PLIST Thu Dec 03 12:05:23 2009 +0000
+++ b/lang/f2c/PLIST Thu Dec 03 12:39:59 2009 +0000
@@ -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 -r 7cced07216a8 -r 382d0f1c820e lang/f2c/buildlink3.mk
--- a/lang/f2c/buildlink3.mk Thu Dec 03 12:05:23 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 7cced07216a8 -r 382d0f1c820e lang/f2c/distinfo
--- a/lang/f2c/distinfo Thu Dec 03 12:05:23 2009 +0000
+++ b/lang/f2c/distinfo Thu Dec 03 12:39:59 2009 +0000
@@ -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 -r 7cced07216a8 -r 382d0f1c820e lang/f2c/files/chktypes.c
--- a/lang/f2c/files/chktypes.c Thu Dec 03 12:05:23 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 7cced07216a8 -r 382d0f1c820e lang/f2c/files/f2c-f77.in
--- a/lang/f2c/files/f2c-f77.in Thu Dec 03 12:05:23 2009 +0000
+++ b/lang/f2c/files/f2c-f77.in Thu Dec 03 12:39:59 2009 +0000
@@ -161,7 +161,7 @@
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 -r 7cced07216a8 -r 382d0f1c820e lang/f2c/files/f2c.mk
--- a/lang/f2c/files/f2c.mk Thu Dec 03 12:05:23 2009 +0000
+++ b/lang/f2c/files/f2c.mk Thu Dec 03 12:39:59 2009 +0000
@@ -7,7 +7,7 @@
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 -r 7cced07216a8 -r 382d0f1c820e lang/f2c/files/libf77.mk
--- a/lang/f2c/files/libf77.mk Thu Dec 03 12:05:23 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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"
Home |
Main Index |
Thread Index |
Old Index