From owner-freebsd-ports Sat Feb 12 14:51:13 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by builder.freebsd.org (Postfix) with ESMTP id A665F4156 for ; Sat, 12 Feb 2000 14:50:05 -0800 (PST) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id OAA78631; Sat, 12 Feb 2000 14:50:07 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from mailgw3.prontomail.com (mailgw3.prontomail.com [209.185.149.199]) by builder.freebsd.org (Postfix) with ESMTP id B17E740D4 for ; Sat, 12 Feb 2000 14:47:57 -0800 (PST) Received: from mail46.prontomail.com (209.185.149.146) by mailgw3.prontomail.com (NPlex 2.0.123) for FreeBSD-gnats-submit@freebsd.org; Sat, 12 Feb 2000 14:35:03 -0800 Received: from web04 (209.185.149.204) by mail46.prontomail.com (NPlex 2.0.123) for FreeBSD-gnats-submit@freebsd.org; Sat, 12 Feb 2000 14:40:20 -0800 Message-Id: Date: Sun, 13 Feb 2000 07:40:31 +0900 From: tkato@prontomail.ne.jp To: FreeBSD-gnats-submit@freebsd.org Subject: ports/16675: Update port: lang/Sather to 1.2.1 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 16675 >Category: ports >Synopsis: Update port: lang/Sather to 1.2.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Feb 12 14:50:07 PST 2000 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 3.4-RELEASE i386 >Organization: >Environment: >Description: - Update to version 1.2.1 - Remove BROKEN_ELF line - Add WWW: line into pkg/DESCR New files: patches/patch-ad patches/patch-ae patches/patch-af patches/patch-ag Remove file: patches/patch-02 patches/patch-aa patches/patch-ab patches/patch-ac >How-To-Repeat: >Fix: diff -urN /usr/ports/lang/Sather/Makefile lang/Sather/Makefile --- /usr/ports/lang/Sather/Makefile Wed Aug 25 19:18:51 1999 +++ lang/Sather/Makefile Wed Feb 2 23:14:12 2000 @@ -1,37 +1,42 @@ -# New ports collection makefile for: Sather -# Version required: 1.0.5 -# Date created: Mon Oct 31 22:04:12 PST 1994 -# Whom: hsu +# New ports collection makefile for: Sather +# Version required: 1.2.1 +# Date created: Mon Oct 31 22:04:12 PST 1994 +# Whom: hsu # # $FreeBSD: ports/lang/Sather/Makefile,v 1.16 1999/08/25 06:34:13 obrien Exp $ # -DISTNAME= Sather-1.0.5 -PKGNAME= sather-1.0.5 +DISTNAME= sather-1.2.1 CATEGORIES= lang -MASTER_SITES= ftp://ftp.icsi.berkeley.edu/pub/sather/ \ - ftp://ftp.sterling.com/programming/languages/sather/ \ - ftp://ftp.uni-muenster.de/pub/languages/sather/ \ - ftp://ftp.nis.co.jp/pub/lang/sather/ \ - ftp://ftp.th-darmstadt.de/pub/programming/languages/sather/ \ - ftp://ftp.sra.co.jp/pub/lang/sather/ \ - ftp://ftp.infomagic.com/pub/mirrors/.mirror14/languages/sather/ +MASTER_SITES= ${MASTER_SITE_GNU} +MASTER_SITE_SUBDIR= sather MAINTAINER= obrien@FreeBSD.org -BROKEN_ELF= gcc: ../../System/GC/gc.a: No such file or directory +BUILD_DEPENDS= ${LOCALBASE}/lib/libgc.a:${PORTSDIR}/devel/boehm-gc -WRKSRC= ${WRKDIR}/Sather -ALL_TARGET= testall -MAN1= cs.1 +USE_GMAKE= yes +ALL_TARGET= full +MAN1= sacomp.1 + +post-patch: + @${MV} ${WRKSRC}/System/Common/CONFIG.proto \ + ${WRKSRC}/System/Common/CONFIG.proto.in + @${SED} -e 's:%%CC%%:${CC}:g' \ + -e 's:%%CFLAGS%%:${CFLAGS}:g' \ + -e 's:%%LOCALBASE%%:${LOCALBASE}:g' \ + -e 's:%%GMAKE%%:${GMAKE}:g' \ + ${WRKSRC}/System/Common/CONFIG.proto.in \ + > ${WRKSRC}/System/Common/CONFIG.proto do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/Compiler/cs ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/Doc/man/man1/cs.1 ${PREFIX}/man/man1 - ${MKDIR} ${PREFIX}/share/doc/sather + ${INSTALL_PROGRAM} ${WRKSRC}/Bin/sacomp ${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/Doc/man/man1/sacomp.1 ${PREFIX}/man/man1 + @${MKDIR} ${PREFIX}/share/doc/sather ${INSTALL_DATA} ${WRKSRC}/Doc/License ${PREFIX}/share/doc/sather .if !defined(NOPORTDOCS) -.for file in Bugs Changes Contributing FAQ README manual.ps + ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/sather +.for file in Bugs Changes Contributing FAQ programmer-manual.ps ${INSTALL_DATA} ${WRKSRC}/Doc/${file} ${PREFIX}/share/doc/sather .endfor .endif diff -urN /usr/ports/lang/Sather/files/md5 lang/Sather/files/md5 --- /usr/ports/lang/Sather/files/md5 Sun Feb 26 06:34:33 1995 +++ lang/Sather/files/md5 Wed Feb 2 19:18:06 2000 @@ -1 +1 @@ -MD5 (Sather-1.0.5.tar.gz) = 4070ca2864c515270255decfaf29062c +MD5 (sather-1.2.1.tar.gz) = 1064827b117f6c930ad15fdb49b89e01 diff -urN /usr/ports/lang/Sather/patches/patch-02 lang/Sather/patches/patch-02 --- /usr/ports/lang/Sather/patches/patch-02 Sun Feb 26 06:34:33 1995 +++ lang/Sather/patches/patch-02 Thu Jan 1 09:00:00 1970 @@ -1,19 +0,0 @@ -*** System/CONFIG.proto.0 Mon Oct 31 03:55:23 1994 ---- System/CONFIG.proto Mon Oct 31 03:57:59 1994 -*************** -*** 13,19 **** - "#/System/base.a #/System/GC/gc.a -lm" - - -- extra args to pass to C compile if optimization turned on -! "-O" - - -- extra args to pass to C compile if debugging turned on - "-g" ---- 13,19 ---- - "#/System/base.a #/System/GC/gc.a -lm" - - -- extra args to pass to C compile if optimization turned on -! "-O2" - - -- extra args to pass to C compile if debugging turned on - "-g" diff -urN /usr/ports/lang/Sather/patches/patch-aa lang/Sather/patches/patch-aa --- /usr/ports/lang/Sather/patches/patch-aa Mon Feb 13 02:32:59 1995 +++ lang/Sather/patches/patch-aa Thu Jan 1 09:00:00 1970 @@ -1,53 +0,0 @@ -*** System/GC/Makefile.ORIG Wed Dec 21 18:54:03 1994 ---- System/GC/Makefile Sun Feb 12 04:30:07 1995 -*************** -*** 123,129 **** - - gc_cpp.o: $(srcdir)/gc_cpp.cc $(srcdir)/gc_cpp.h $(srcdir)/gc.h Makefile - $(CXX) -c -O $(srcdir)/gc_cpp.cc -! - test_gc_c++: $(srcdir)/test_cpp.cc $(srcdir)/gc_cpp.h gc_cpp.o $(srcdir)/gc.h gc.a - $(CXX) -O -o test_gc_c++ $(srcdir)/test_cpp.cc gc_cpp.o gc.a - ---- 123,129 ---- - - gc_cpp.o: $(srcdir)/gc_cpp.cc $(srcdir)/gc_cpp.h $(srcdir)/gc.h Makefile - $(CXX) -c -O $(srcdir)/gc_cpp.cc -! - test_gc_c++: $(srcdir)/test_cpp.cc $(srcdir)/gc_cpp.h gc_cpp.o $(srcdir)/gc.h gc.a - $(CXX) -O -o test_gc_c++ $(srcdir)/test_cpp.cc gc_cpp.o gc.a - -*************** -*** 222,228 **** - - gc.tar: $(SRCS) $(OTHER_FILES) - tar cvf gc.tar $(SRCS) $(OTHER_FILES) -! - pc_gc.tar: $(SRCS) $(OTHER_FILES) - tar cvfX pc_gc.tar pc_excludes $(SRCS) $(OTHER_FILES) - ---- 222,228 ---- - - gc.tar: $(SRCS) $(OTHER_FILES) - tar cvf gc.tar $(SRCS) $(OTHER_FILES) -! - pc_gc.tar: $(SRCS) $(OTHER_FILES) - tar cvfX pc_gc.tar pc_excludes $(SRCS) $(OTHER_FILES) - -*************** -*** 242,248 **** - - lint: $(CSRCS) test.c - lint -DLINT $(CSRCS) test.c | egrep -v "possible pointer alignment problem|abort|exit|sbrk|mprotect|syscall" -! - # BTL: added to test shared library version of collector. - # Currently works only under SunOS5. Requires GC_INIT call from statically - # loaded client code. ---- 242,248 ---- - - lint: $(CSRCS) test.c - lint -DLINT $(CSRCS) test.c | egrep -v "possible pointer alignment problem|abort|exit|sbrk|mprotect|syscall" -! - # BTL: added to test shared library version of collector. - # Currently works only under SunOS5. Requires GC_INIT call from statically - # loaded client code. diff -urN /usr/ports/lang/Sather/patches/patch-ab lang/Sather/patches/patch-ab --- /usr/ports/lang/Sather/patches/patch-ab Sun Feb 26 04:42:55 1995 +++ lang/Sather/patches/patch-ab Thu Jan 1 09:00:00 1970 @@ -1,35 +0,0 @@ -*** Makefile.0 Thu Feb 16 07:44:53 1995 ---- Makefile Sat Feb 25 01:12:57 1995 -*************** -*** 23,37 **** - # - # Don't forget to edit (or at least inspect) the file System/CONFIG.proto. - -! CPP= /lib/cpp -C -P - RANLIB= ranlib - CC= gcc -! CFLAGS= -O - GC_CC= ${CC} - MV= mv - CMP= cmp - CS= cs -! SHOME= /u/davids/Sather/Working - AR= ar - RM= rm -f - TEST= test ---- 23,37 ---- - # - # Don't forget to edit (or at least inspect) the file System/CONFIG.proto. - -! CPP= /usr/bin/cpp -C -P - RANLIB= ranlib - CC= gcc -! CFLAGS= -O2 - GC_CC= ${CC} - MV= mv - CMP= cmp - CS= cs -! SHOME= .. - AR= ar - RM= rm -f - TEST= test diff -urN /usr/ports/lang/Sather/patches/patch-ac lang/Sather/patches/patch-ac --- /usr/ports/lang/Sather/patches/patch-ac Thu Oct 17 12:52:33 1996 +++ lang/Sather/patches/patch-ac Thu Jan 1 09:00:00 1970 @@ -1,22 +0,0 @@ ---- ./Boot/cs.code/decs.h.org Thu Feb 16 07:44:03 1995 -+++ ./Boot/cs.code/decs.h Wed Oct 16 18:33:42 1996 -@@ -207,7 +207,7 @@ - - void UNIX_exit_INT(UNIX, INT); - void BE_LEX_barf_STR(BE_LEX, STR); --#if defined(__FreeBSD__) || defined(__NetBSD__) || (M_I386 && M_XENIX) -+#if defined(__NetBSD__) || (M_I386 && M_XENIX) - extern long ftell(const FILE *); - #else - extern long ftell(FILE *); ---- ./System/EXTERNS.org Wed Feb 15 12:16:38 1995 -+++ ./System/EXTERNS Wed Oct 16 18:49:06 1996 -@@ -230,7 +230,7 @@ - #endif" - - "ftell" --"#if defined(__FreeBSD__) || defined(__NetBSD__) || (M_I386 && M_XENIX) -+"#if defined(__NetBSD__) || (M_I386 && M_XENIX) - extern long ftell(const FILE *); - #else - extern long ftell(FILE *); diff -urN /usr/ports/lang/Sather/patches/patch-ad lang/Sather/patches/patch-ad --- /usr/ports/lang/Sather/patches/patch-ad Thu Jan 1 09:00:00 1970 +++ lang/Sather/patches/patch-ad Wed Feb 2 19:46:25 2000 @@ -0,0 +1,13 @@ +--- Makefile.orig Thu Nov 4 17:04:28 1999 ++++ Makefile Wed Feb 2 19:46:11 2000 +@@ -30,8 +30,8 @@ + LN=ln -s + CP=cp + +-CPP=/lib/cpp -C -P +-CC=gcc ++CPP=/usr/bin/cpp -C -P ++CC?=gcc + EXEC_SUFFIX= + # CC is only used for bootstrapping, check System/Common/CONFIG.proto if + # you want to change it for all Sather compilations diff -urN /usr/ports/lang/Sather/patches/patch-ae lang/Sather/patches/patch-ae --- /usr/ports/lang/Sather/patches/patch-ae Thu Jan 1 09:00:00 1970 +++ lang/Sather/patches/patch-ae Wed Feb 2 21:34:35 2000 @@ -0,0 +1,14 @@ +--- Boot/sacomp.code/Makefile.orig Thu Nov 4 17:04:49 1999 ++++ Boot/sacomp.code/Makefile Wed Feb 2 21:02:52 2000 +@@ -1,8 +1,8 @@ + SHOME =../.. +-CFLAGS = -I. -O2 -I../System/Common +-CC =gcc ++CFLAGS += -I. -I../System/Common -I${LOCALBASE}/include ++CC ?=gcc + HDR =sather.h tags.h +-LIBS = -lgc -lm ++LIBS = -lgc -lm -L${LOCALBASE}/lib + CS =sacomp + OBJ = a_stackA_STACK2014955575.o am_outAM_OUT1363671444.o am_outAM_OUT1363671444x.o arefFSETAM_ROU1518004496.o arefFSETIMMUTA2116029667.o arefFSETTUPSIG268064465.o arrayARRAYAM_I1084914261.o arrayARRAYTUPI1927875024.o as_outAS_OUT1429002792.o as_outAS_OUT1429002792x.o cgenCGEN1354269066.o cgenCGEN1354269066x.o cgenCGEN1354269066xx.o cgenCGEN1354269066xxx.o cgenCGEN1354269066xxxx.o cgenCGEN1354269066xxxxx.o cgenCGEN1354269066xxxxxx.o cgenCGEN1354269066xxxxxxx.o cgenCGEN1354269066xxxxxxxx.o cgenCGEN1354269066xxxxxxxxx.o cgenCGEN1354269066xxxxxxxxxx.o code_fileCODE_372141741.o configCONFIG_R422014871.o cs_optionsCS_O301318552.o cs_optionsCS_O301318552x.o cursorAM_CURSO1314676474.o cursorAM_CURSO1314676474x.o cursorAM_CURSO1314676474xx.o cursorAM_CURSO1314676474xxx.o dispatch.o eltELT742463773.o elt_algELT_ALG1548486913.o elt_algELT_ALG241706736.o elt_algELT_ALG433952755.o elt_algELT_ALG656599769.o elt_algELT_ALG987448979.o flistFLISTAM_C1171004157.o flistFLISTTUPA253333040.o fmapFM APAM_ROU1000508936.o fmapFMAPSTRFSE258056667.o fmapFMAPdTPCOD1051074108.o generate_amGEN60284023.o get_optionsCOD183550016.o globals.o get_optionsCOD183550016x.o implIMPL_CREAT99472218.o inlineINLINE_I1557365391.o intiINTI1462257232.o layoutCLASS_LA1330944056.o mangleMANGLE1705139666.o mangleNAMESPAC760510184.o o_localOPT_LOC907909712.o o_localOPT_LOC907909712x.o optimizeOPT_CO1177876774.o optimizeOPT_IT1193060919.o parsePARSER311504339.o parsePARSER311504339x.o parsePARSER311504339xx.o parsePARSER311504339xxx.o parsePARSER311504339xxxx.o progPROG_AS_TB824135997.o scanSCANNER1990933774.o side_effectSE_411721069.o strings.o stringsx.o stringsxx.o system.o stmtAM_FORK_ST1674905658.o tpTP_BUILTIN1142074570.o tpTP_ITER145455607.o transTRANS2123847391.o transTRANS2123847391x.o transTRANS2123847391xx.o transTRANS2123847391xxx.o transTRANS2123847391xxxx.o tupTUPAM_CURSO1313579705.o unbox.o unixUNIX1766692.o runtime.o + OTHER = diff -urN /usr/ports/lang/Sather/patches/patch-af lang/Sather/patches/patch-af --- /usr/ports/lang/Sather/patches/patch-af Thu Jan 1 09:00:00 1970 +++ lang/Sather/patches/patch-af Wed Feb 2 21:42:48 2000 @@ -0,0 +1,29 @@ +--- System/Common/CONFIG.proto.orig Thu Nov 4 03:48:17 1999 ++++ System/Common/CONFIG.proto Wed Feb 2 20:25:35 2000 +@@ -23,12 +23,12 @@ + ZONES: false; + TRACE: false; + LIBRARY: "SATHER_LIBRARY","Library/Library.module"; +-VERSION: "1.2b"; +-C_COMPILER: "gcc "; +-CC_OPTIONS: ""; +-GC_LINK: "-lgc"; ++VERSION: "1.2.1"; ++C_COMPILER: "%%CC%% "; ++CC_OPTIONS: "-I$%%LOCALBASE%%/include"; ++GC_LINK: "-lgc -L%%LOCALBASE%%/lib"; + LINK_OPTIONS: "-lm"; +-MAKE_COMMAND: "make"; ++MAKE_COMMAND: "%%GMAKE%%"; + OBJECT_EXT: ".o"; + LIB_EXT: ".a"; + C_EXT: ".c"; +@@ -38,7 +38,7 @@ + SEPARATE_POINTERS: false; + PSATHER_FLAG: "",""; + CC_DEBUG_FLAG: "","-g"; +-CC_OPTIMIZE_FLAG: "","-O2"; ++CC_OPTIMIZE_FLAG: "","%%CFLAGS%%"; + CC_PROLIX_FLAG: "",""; -- passed to the C compiler (prolix implies verbose) + MAKE_VERBOSE_FLAG: "-s","-s"; -- passed to make + diff -urN /usr/ports/lang/Sather/patches/patch-ag lang/Sather/patches/patch-ag --- /usr/ports/lang/Sather/patches/patch-ag Thu Jan 1 09:00:00 1970 +++ lang/Sather/patches/patch-ag Wed Feb 2 20:57:59 2000 @@ -0,0 +1,14 @@ +--- System/Platforms/unix/header.h.orig Sat Sep 11 23:33:03 1999 ++++ System/Platforms/unix/header.h Wed Feb 2 20:57:51 2000 +@@ -15,7 +15,11 @@ + #define _HEADER_H_ + + #ifndef ZONES ++# ifdef __FreeBSD__ ++# include ++# else + # include ++# endif + #endif + + #include "../../Common/c_header.h" diff -urN /usr/ports/lang/Sather/pkg/DESCR lang/Sather/pkg/DESCR --- /usr/ports/lang/Sather/pkg/DESCR Thu Mar 7 21:55:58 1996 +++ lang/Sather/pkg/DESCR Wed Feb 2 19:30:34 2000 @@ -15,3 +15,5 @@ higher-order routines and iters, exception handling, assertions, preconditions, postconditions, and class invariants. Sather code can be compiled into C code and can efficiently link with C object files. + +WWW: http://www.gnu.org/software/sather/ diff -urN /usr/ports/lang/Sather/pkg/PLIST lang/Sather/pkg/PLIST --- /usr/ports/lang/Sather/pkg/PLIST Wed Aug 19 07:41:25 1998 +++ lang/Sather/pkg/PLIST Wed Feb 2 23:14:36 2000 @@ -1,8 +1,8 @@ -bin/cs +bin/sacomp share/doc/sather/Bugs share/doc/sather/Changes share/doc/sather/Contributing share/doc/sather/FAQ share/doc/sather/License share/doc/sather/README -share/doc/sather/manual.ps +share/doc/sather/programmer-manual.ps Sent by Japanese ProntoMail >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message