From a1a8c36c7c09ec78fe15e79f7eb85473782c71dc Mon Sep 17 00:00:00 2001 From: Greg Lewis Date: Mon, 8 Sep 2003 21:04:36 +0000 Subject: . Update to 4-20030825. PR: 56430 Submitted by: Stefan Farfeleder (maintainer) --- lang/TenDRA/Makefile | 9 +- lang/TenDRA/distinfo | 2 +- lang/TenDRA/files/patch-aligned | 34 +- lang/TenDRA/files/patch-common::default | 16 + lang/TenDRA/files/patch-default-gcc_dependency | 7 - lang/TenDRA/files/patch-freebsd::default.extra | 26 + lang/TenDRA/files/patch-install | 154 +++++- lang/TenDRA/files/patch-tcc_diag | 26 + lang/TenDRA/files/patch-tcc_time | 41 -- lang/TenDRA/pkg-plist | 645 +++++++++++++------------ 10 files changed, 584 insertions(+), 376 deletions(-) create mode 100644 lang/TenDRA/files/patch-common::default delete mode 100644 lang/TenDRA/files/patch-default-gcc_dependency create mode 100644 lang/TenDRA/files/patch-freebsd::default.extra create mode 100644 lang/TenDRA/files/patch-tcc_diag delete mode 100644 lang/TenDRA/files/patch-tcc_time (limited to 'lang/TenDRA') diff --git a/lang/TenDRA/Makefile b/lang/TenDRA/Makefile index d70bdeb8f092..f5b9a53549e3 100644 --- a/lang/TenDRA/Makefile +++ b/lang/TenDRA/Makefile @@ -7,9 +7,9 @@ # PORTNAME= TenDRA -PORTVERSION= 4.20030526 +PORTVERSION= 4.20030825 CATEGORIES= lang -MASTER_SITES= ftp://ftp.tendra.org/pub/snapshot/ +MASTER_SITES= ftp://ftp.allbsd.org/pub/TenDRA/snapshots/ DISTNAME= ${PORTNAME:L}-${PORTVERSION:S/4.//} MAINTAINER= stefan@fafoe.narf.at @@ -17,13 +17,14 @@ COMMENT= A portable BSD-licensed compiler suite ONLY_FOR_ARCHS= i386 -WRKSRC= ${WRKDIR}/${PORTNAME:L} +DIST_SUBDIR= ${PKGBASE} USE_BZIP2= yes USE_PERL5_BUILD= yes ALL_TARGET= # nada +MAKE_ARGS= BIN_CC="${CC}" TENDRA_OSREL!= uname -r -TENDRA_ARCH= 80x86 +TENDRA_ARCH= ${ARCH:S/i386/80x86/} TENDRA_VER= 5.0.0 TENDRA_PATH= ${TENDRA_VER}/FreeBSD/${TENDRA_OSREL}/${TENDRA_ARCH} PLIST_SUB+= TENDRA_VER=${TENDRA_VER} TENDRA_OSREL=${TENDRA_OSREL} \ diff --git a/lang/TenDRA/distinfo b/lang/TenDRA/distinfo index f11236e93c00..5a1e02011e6a 100644 --- a/lang/TenDRA/distinfo +++ b/lang/TenDRA/distinfo @@ -1 +1 @@ -MD5 (tendra-20030526.tar.bz2) = 277d6b5efd9358c8aa75382d6934c4c2 +MD5 (TenDRA/tendra-20030825.tar.bz2) = 7ea9716d04d4f6bf8df11d55ca37659b diff --git a/lang/TenDRA/files/patch-aligned b/lang/TenDRA/files/patch-aligned index 2c907477e889..b498c0ff680a 100644 --- a/lang/TenDRA/files/patch-aligned +++ b/lang/TenDRA/files/patch-aligned @@ -1,17 +1,33 @@ -Index: src/lib/machines/freebsd/80x86/include/gcc_dependency.h +Index: src/lib/machines/freebsd/80x86/startup/ansi.h =================================================================== -RCS file: /usr/home/stefan/tendra/cvsup/tendra/src/lib/machines/freebsd/80x86/include/gcc_dependency.h,v +RCS file: /usr/home/stefan/tendra/cvsup/tendra/src/lib/machines/freebsd/80x86/startup/ansi.h,v retrieving revision 1.1 -diff -c -u -r1.1 gcc_dependency.h ---- src/lib/machines/freebsd/80x86/include/gcc_dependency.h 18 Feb 2003 07:35:09 -0000 1.1 -+++ src/lib/machines/freebsd/80x86/include/gcc_dependency.h 25 Feb 2003 10:32:53 -0000 -@@ -17,4 +17,9 @@ - - #pragma TenDRA unknown directive warning +diff -u -r1.1 ansi.h +--- src/lib/machines/freebsd/80x86/startup/ansi.h 26 Jan 2002 21:31:47 -0000 1.1 ++++ src/lib/machines/freebsd/80x86/startup/ansi.h 16 Aug 2003 19:50:55 -0000 +@@ -28,3 +28,8 @@ + #ifndef __signed + #define __signed signed + #endif ++ ++/* Work around __aligned() */ ++#ifndef __aligned ++#define __aligned(x) /* nothing */ ++#endif +Index: src/lib/machines/freebsd/80x86/startup/system.h +=================================================================== +RCS file: /usr/home/stefan/tendra/cvsup/tendra/src/lib/machines/freebsd/80x86/startup/system.h,v +retrieving revision 1.1 +diff -u -r1.1 system.h +--- src/lib/machines/freebsd/80x86/startup/system.h 26 Jan 2002 21:31:47 -0000 1.1 ++++ src/lib/machines/freebsd/80x86/startup/system.h 4 Aug 2003 21:07:05 -0000 +@@ -36,4 +36,9 @@ + #define __signed signed + #endif +/* Work around __aligned() */ +#ifndef __aligned +#define __aligned(x) /* nothing */ +#endif + - #endif /* __FREEBSD_GCC_DEPENDENCY_H__ */ + #endif diff --git a/lang/TenDRA/files/patch-common::default b/lang/TenDRA/files/patch-common::default new file mode 100644 index 000000000000..eedec340abee --- /dev/null +++ b/lang/TenDRA/files/patch-common::default @@ -0,0 +1,16 @@ +Index: src/lib/env/common/default +=================================================================== +RCS file: /usr/home/stefan/tendra/cvsup/tendra/src/lib/env/common/default,v +retrieving revision 1.5 +diff -u -r1.5 default +--- src/lib/env/common/default 17 Aug 2003 20:20:28 -0000 1.5 ++++ src/lib/env/common/default 19 Aug 2003 14:42:23 -0000 +@@ -51,7 +51,7 @@ + +STARTUP_CPP_DIR "-I/Bounds.ansi -I/Modes.cpp" + +STARTUP_CPP "-f/Modes.cpp/Xc" + +PORTABILITY "/Bounds.ansi/default.pf" +-+LINK "-L" +++LINK "-L" + +LIB "-lansi" + + +SYS_LIB "" diff --git a/lang/TenDRA/files/patch-default-gcc_dependency b/lang/TenDRA/files/patch-default-gcc_dependency deleted file mode 100644 index 1e041d0d3d63..000000000000 --- a/lang/TenDRA/files/patch-default-gcc_dependency +++ /dev/null @@ -1,7 +0,0 @@ ---- src/lib/env/common/default.orig Tue May 13 01:35:23 2003 -+++ src/lib/env/common/default Tue May 13 01:35:42 2003 -@@ -55,3 +55,4 @@ - - /* Extra information */ - -++FLAG "-f/include/gcc_dependency.h" diff --git a/lang/TenDRA/files/patch-freebsd::default.extra b/lang/TenDRA/files/patch-freebsd::default.extra new file mode 100644 index 000000000000..8c5d180e7a15 --- /dev/null +++ b/lang/TenDRA/files/patch-freebsd::default.extra @@ -0,0 +1,26 @@ +Index: src/lib/env/freebsd/common/80x86/default.extra +=================================================================== +RCS file: /usr/home/stefan/tendra/cvsup/tendra/src/lib/env/freebsd/common/80x86/default.extra,v +retrieving revision 1.3 +diff -u -r1.3 default.extra +--- src/lib/env/freebsd/common/80x86/default.extra 17 Aug 2003 20:20:51 -0000 1.3 ++++ src/lib/env/freebsd/common/80x86/default.extra 19 Aug 2003 15:13:31 -0000 +@@ -13,11 +13,17 @@ + /* Libraries */ + + +LIB_CRT0 "-LIB_CRT0-" +++LIB_CRT1 "-LIB_CRT1-" +++LIB_CRTI "-LIB_CRTI-" +++LIB_CRTN "-LIB_CRTN-" + +LIB_GCRT0 "-LIB_GCRT0-" + + + +MACHINE "freebsd-*-80x86" + +AS "" +-+LD " -e start -dc -dp" +++LD "" + +CC "" + +CRT0 "" +++CRT1 "" +++CRTI "" +++CRTN "" diff --git a/lang/TenDRA/files/patch-install b/lang/TenDRA/files/patch-install index 2d0a32c6745b..d147fe8c9288 100644 --- a/lang/TenDRA/files/patch-install +++ b/lang/TenDRA/files/patch-install @@ -1,12 +1,142 @@ ---- mk/base/tendra.install.mk.orig Mon Mar 31 10:00:01 2003 -+++ mk/base/tendra.install.mk Mon May 12 21:20:53 2003 -@@ -60,6 +60,9 @@ - for i in ${.OBJDIR}.api/*.h; do \ - ${INSTALL} $$i ${INSTALL_PREFIX}/lib/include/${API}.api; \ - done -+ for i in `${FIND} ${.OBJDIR}.api/ -type d -mindepth 1` ; do \ -+ ${CP} -pR $$i ${INSTALL_PREFIX}/lib/include/${API}.api; \ -+ done - for i in ${.OBJDIR:C/apis/apis\/shared/}.api/*.h; do \ - ${INSTALL} $$i ${INSTALL_PREFIX}/lib/include/shared/${API}.api; \ - done +Index: mk/base/tendra.install.mk +=================================================================== +RCS file: /usr/home/stefan/tendra/cvsup/tendra/mk/base/tendra.install.mk,v +retrieving revision 1.19 +diff -u -r1.19 tendra.install.mk +--- mk/base/tendra.install.mk 18 Aug 2003 04:35:26 -0000 1.19 ++++ mk/base/tendra.install.mk 19 Aug 2003 14:23:00 -0000 +@@ -21,7 +21,6 @@ + + .if defined(API) + INSTALL_TARGETS+= install-api +-INSTALL_SUB+= lib/include/${API}.api lib/include/shared/${API}.api + .endif + + .if defined(INSTALL_ENV) +@@ -70,14 +69,9 @@ + + # lib/apis: our api files. + install-api: +- for i in ${.OBJDIR}.api/*.h; do \ +- ${BIN_INSTALL} $$i ${INSTALL_PREFIX}/lib/include/${API}.api; \ +- done +- for i in ${.OBJDIR:C/apis/apis\/shared/}.api/*.h; do \ +- ${BIN_INSTALL} $$i ${INSTALL_PREFIX}/lib/include/shared/${API}.api; \ +- done +- ${BIN_INSTALL} ${.OBJDIR:C/apis/apis\/lib/}/${API}.tl \ +- ${INSTALL_PREFIX}/lib ++ env MAKEOBJDIR=${OBJ_DIR}.api INSTALL=${BIN_INSTALL} \ ++ MKDIR=${BIN_MKDIR} ARGS_MKDIR=${ARGS_MKDIR} \ ++ INSTALL_PREFIX=${INSTALL_PREFIX} make install + + # lib/env: our environment files. + install-env: +Index: src/tools/tspec/makefile.c +=================================================================== +RCS file: /usr/home/stefan/tendra/cvsup/tendra/src/tools/tspec/makefile.c,v +retrieving revision 1.3 +diff -u -r1.3 makefile.c +--- src/tools/tspec/makefile.c 12 Dec 2002 05:54:55 -0000 1.3 ++++ src/tools/tspec/makefile.c 10 Jun 2003 12:36:12 -0000 +@@ -71,10 +71,10 @@ + */ + + static boolean +-need_info(info *i, char *api) ++need_info(info *i, char *api, boolean lax) + { + if (restrict_depth && !streq (api, i->api)) return (0); +- return (i->implemented && i->tokens && i->src); ++ return (i->implemented && (lax || (i->tokens && i->src))); + } + + +@@ -95,6 +95,8 @@ + char *api2 = hack_name (api, "_Aa0"); + int li = output_incl_len; + int ls = output_src_len; ++ hash_table *subdirs = make_hash_table("Subdirs"); ++ int i; + + /* Open output file */ + nm = (whole ? MAKEFILE_API : MAKEFILE); +@@ -135,11 +137,47 @@ + } + IGNORE fputs ("SHELL=/bin/sh\n\n", output); + ++ /* Print all headers we want to install */ ++ IGNORE fprintf (output, "HEADERS="); ++ for (e = f ; e != null ; e = e->next) { ++ info *i = e->obj->u.u_info; ++ char *p; ++ object *o; ++ ++ if (!need_info(i, api, 1)) ++ continue; ++ ++ if (i->file == NULL || strstr(i->file, "dummy") != NULL || ++ i->api == NULL || strstr(i->api, "dummy") != NULL) ++ continue; ++ ++ IGNORE fprintf (output, "\\\n %s", i->incl + ls); ++ ++ buffer[0] = '\0'; ++ IGNORE strncat(buffer, i->incl + ls, buffsize); ++ if ((p = strrchr(buffer, '/')) != NULL) { ++ *p = '\0'; ++ /* Add the directory if it isn't in the subdirs hash table yet */ ++ if (search_hash(subdirs, buffer, 0) == NULL) { ++ p = xalloc(strlen(buffer) + 1); ++ IGNORE strcpy(p, buffer); ++ o = make_object(p, TYPE_VOID); ++ IGNORE add_hash(subdirs, o, 0); ++ } ++ } ++ } ++ ++ /* Print the list of subdirectories we have to create */ ++ IGNORE fputs ("\n\nDIRS=", output); ++ for (i = 0; i < sizeof (subdirs->array) / sizeof (*subdirs->array); i++) ++ for (e = subdirs->array[i]; e != null; e = e->next) ++ IGNORE fprintf (output, "\\\n %s", e->obj->name); ++ + /* Print the list of files */ +- IGNORE fputs ("JFILES=", output); ++ IGNORE fputs ("\n\nJFILES=", output); + for (e = f ; e != null ; e = e->next) { + info *i = e->obj->u.u_info; +- if (need_info (i, api)) { ++ if (need_info (i, api, 0)) { + int m; + char *a = i->api; + if (strneq (a, "shared/", 7)) a += 7; +@@ -159,7 +197,7 @@ + /* Print the construction for each file */ + for (e = f ; e != null ; e = e->next) { + info *i = e->obj->u.u_info; +- if (need_info (i, api)) { ++ if (need_info (i, api, 0)) { + int m; + char *a = i->api; + if (strneq (a, "shared/", 7)) a += 7; +@@ -192,7 +230,19 @@ + + /* End of makefile */ + IGNORE fputs ("clean :\n\trm -f ${JFILES}\n\n", output); +- IGNORE fputs ("clobber : clean\n\trm -f ${LIB}\n", output); ++ IGNORE fputs ("clobber : clean\n\trm -f ${LIB}\n\n", output); ++ ++ IGNORE fprintf (output, "install : \n" ++ ".for i in ${DIRS}\n" ++ "\t${MKDIR} ${ARGS_MKDIR} ${INSTALL_PREFIX}/lib/include/${i}\n" ++ ".endfor\n" ++ ".for i in ${HEADERS}\n" ++ "\t${INSTALL} ../${i} ${INSTALL_PREFIX}/lib/include/" ++ "${i:H}\n" ++ ".endfor\n" ++ "\t${INSTALL} ../lib/%s/%s.tl ${INSTALL_PREFIX}/lib\n", ++ api, api); ++ + IGNORE fclose (output); + return; + } diff --git a/lang/TenDRA/files/patch-tcc_diag b/lang/TenDRA/files/patch-tcc_diag new file mode 100644 index 000000000000..d62bb12f8dd4 --- /dev/null +++ b/lang/TenDRA/files/patch-tcc_diag @@ -0,0 +1,26 @@ +Index: src/lib/env/freebsd/common/80x86/tcc_diag +=================================================================== +RCS file: /usr/home/stefan/ten15/cvsup/tendra/src/lib/env/freebsd/common/80x86/tcc_diag,v +retrieving revision 1.3 +diff -u -r1.3 tcc_diag +--- src/lib/env/freebsd/common/80x86/tcc_diag 17 Aug 2003 20:22:09 -0000 1.3 ++++ src/lib/env/freebsd/common/80x86/tcc_diag 1 Sep 2003 23:42:59 -0000 +@@ -4,4 +4,4 @@ + + +CRT0 "" + /diag" +->SYS_LIB "-static -lg" ++>SYS_LIB "-static" +Index: src/lib/env/freebsd/common/alpha/tcc_diag +=================================================================== +RCS file: /usr/home/stefan/ten15/cvsup/tendra/src/lib/env/freebsd/common/alpha/tcc_diag,v +retrieving revision 1.2 +diff -u -r1.2 tcc_diag +--- src/lib/env/freebsd/common/alpha/tcc_diag 17 Aug 2003 20:22:09 -0000 1.2 ++++ src/lib/env/freebsd/common/alpha/tcc_diag 1 Sep 2003 23:43:07 -0000 +@@ -5,4 +5,4 @@ + + +CRT0 "" + /diag" +->SYS_LIB "-static -lg" ++>SYS_LIB "-static" diff --git a/lang/TenDRA/files/patch-tcc_time b/lang/TenDRA/files/patch-tcc_time deleted file mode 100644 index 1f654b20f7c8..000000000000 --- a/lang/TenDRA/files/patch-tcc_time +++ /dev/null @@ -1,41 +0,0 @@ ---- src/lib/env/common/tcc_time.orig Sat Jan 17 07:57:02 1998 -+++ src/lib/env/common/tcc_time Sun Mar 19 02:17:20 2000 -@@ -1,20 +1,20 @@ - /* tcc environment implementing the -time option */ - --