Date: Mon, 23 Oct 2000 11:39:59 -0700 (PDT) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/22253: Update port: lang/ptoc to 3.50 Message-ID: <20001023183959.72D5037B4C5@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 22253 >Category: ports >Synopsis: Update port: lang/ptoc to 3.50 >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: Mon Oct 23 11:40:02 PDT 2000 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.1.1-RELEASE i386 >Organization: >Environment: >Description: - Update to version 3.50 >How-To-Repeat: >Fix: diff -urN /usr/ports/lang/ptoc/Makefile lang/ptoc/Makefile --- /usr/ports/lang/ptoc/Makefile Wed Apr 12 21:24:40 2000 +++ lang/ptoc/Makefile Sat Oct 21 05:56:34 2000 @@ -5,49 +5,51 @@ # $FreeBSD: ports/lang/ptoc/Makefile,v 1.12 2000/04/12 06:20:05 obrien Exp $ # -PORTNAME= ptoc -PORTVERSION= 3.41 -CATEGORIES= lang -MASTER_SITES= ftp://ftp.netsw.org/netsw/SoftEng/Lang/Pascal/ \ - ftp://ftp.u-aizu.ac.jp/pub/lang/netsw/Pascal/ \ - ftp://ftp.ecrc.net/pub/netsw/SoftEng/Lang/Pascal/ - -MAINTAINER= ports@FreeBSD.org - -MAKEFILE= makefile - -USE_XLIB= yes -WRKSRC= ${WRKDIR}/ptoc +PORTNAME= ptoc +PORTVERSION= 3.50 +CATEGORIES= lang +MASTER_SITES= http://www.ispras.ru/~knizhnik/ + +MAINTAINER= ports@FreeBSD.org + +WRKSRC= ${WRKDIR}/${PORTNAME} + +USE_XLIB= yes +USE_BISON= yes + +EXAMPLES= arr.pas bgidemo.pas ccall.pas coord.txt dos.h dos.pas \ + func.pas hello.pas impact.pas lister.pas makefile.bsd \ + nested.pas objpas.pas polut2.pas printer.pas q2.txt \ + random.txt rename.cxx rename.pas set.pas str.pas test.c \ + test.cxx test.pas test.txt tpascal.pas trinor.pas \ + vibrkinp.pas vibrkinp.txt vibrtabl.pas war2.pas war2.txt \ + xy2.txt xy2orig.txt pre-build: - @ ${MV} ${WRKSRC}/makefile.bsd ${WRKSRC}/makefile - @ ${MV} ${WRKSRC}/Xbgi/makefile.bsd ${WRKSRC}/Xbgi/makefile - @ ${MV} ${WRKSRC}/examples/makefile.bsd ${WRKSRC}/examples/makefile + @${LN} -sf makefile.bsd ${WRKSRC}/Makefile + @${LN} -sf makefile.bsd ${WRKSRC}/Xbgi/Makefile do-install: - @ ${INSTALL_PROGRAM} ${WRKSRC}/cganal ${PREFIX}/bin - @ ${INSTALL_PROGRAM} ${WRKSRC}/ptoc ${PREFIX}/bin - @ ${INSTALL_DATA} ${WRKSRC}/ptoc.cfg ${PREFIX}/etc - @ ${INSTALL_DATA} ${WRKSRC}/libptoc.a ${PREFIX}/lib - @ ${INSTALL_DATA} ${WRKSRC}/libXbgi.a ${PREFIX}/lib - @ ${MKDIR} ${PREFIX}/include/ptoc + ${INSTALL_PROGRAM} ${WRKSRC}/cganal ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/ptoc ${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/ptoc.cfg ${PREFIX}/etc + ${INSTALL_DATA} ${WRKSRC}/libptoc.a ${PREFIX}/lib + ${INSTALL_DATA} ${WRKSRC}/libXbgi.a ${PREFIX}/lib + @${MKDIR} ${PREFIX}/include/ptoc .for file in array.h graph.h io.h paslib.h ptoc.h set.h - @ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/include/ptoc + ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/include/ptoc .endfor - @ ${MKDIR} ${PREFIX}/share/ptoc + @${MKDIR} ${PREFIX}/share/ptoc .for file in graph.pas ptoc.pas tptoc.pas - @ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/ptoc + ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/ptoc .endfor - @ ${MKDIR} ${PREFIX}/share/examples/ptoc - @ ${INSTALL_DATA} ${WRKSRC}/examples/makefile ${PREFIX}/share/examples/ptoc/Makefile -.for file in bgidemo.pas coord.txt hello.pas impact.pas lister.pas polut2.pas printer.pas q2.txt random.txt rename.pas set.pas test.pas tpascal.pas trinor.pas vibrkinp.pas vibrkinp.txt vibrtabl.pas war2.pas war2.txt xy2orig.txt - @ ${INSTALL_DATA} ${WRKSRC}/examples/${file} ${PREFIX}/share/examples/ptoc + @${MKDIR} ${PREFIX}/share/examples/ptoc +.for file in ${EXAMPLES} + ${INSTALL_DATA} ${WRKSRC}/examples/${file} ${PREFIX}/share/examples/ptoc .endfor - -post-install: .if !defined(NOPORTDOCS) - @ ${MKDIR} ${PREFIX}/share/doc/ptoc - @ ${INSTALL_DATA} ${WRKSRC}/Readme.htm ${PREFIX}/share/doc/ptoc + @${MKDIR} ${PREFIX}/share/doc/ptoc + ${INSTALL_DATA} ${WRKSRC}/Readme.htm ${PREFIX}/share/doc/ptoc .endif .include <bsd.port.mk> diff -urN /usr/ports/lang/ptoc/distinfo lang/ptoc/distinfo --- /usr/ports/lang/ptoc/distinfo Mon Feb 22 13:02:47 1999 +++ lang/ptoc/distinfo Sat Oct 21 00:37:21 2000 @@ -1 +1 @@ -MD5 (ptoc-3.41.tar.gz) = 4db4d7730360264625fa293c361225b2 +MD5 (ptoc-3.50.tar.gz) = 8e371aa97d5432ea75cd4842c1df4d73 diff -urN /usr/ports/lang/ptoc/files/patch-aa lang/ptoc/files/patch-aa --- /usr/ports/lang/ptoc/files/patch-aa Sun Feb 13 05:54:53 2000 +++ lang/ptoc/files/patch-aa Sat Oct 21 04:23:19 2000 @@ -1,15 +1,6 @@ ---- main.cxx.orig Fri Nov 6 09:19:54 1998 -+++ main.cxx Sat Feb 12 17:25:53 2000 -@@ -279,7 +279,7 @@ - prog_path = (p != NULL) ? dprintf("%.*s", p + 1 - argv[0], argv[0]) : ""; - #else - char* p = strrchr(argv[0], '/'); -- prog_path = (p != NULL) ? dprintf("%.*s", p + 1 - argv[0], argv[0]) : ""; -+ prog_path = (p != NULL) ? dprintf("%.*s", p + 1 - argv[0], argv[0]) : (char *) ""; - #endif - #endif - i_path = dprintf("%s:%s", i_path, prog_path); -@@ -318,8 +318,8 @@ +--- main.cxx.orig Thu Sep 23 23:35:38 1999 ++++ main.cxx Sat Oct 21 04:11:00 2000 +@@ -326,8 +326,8 @@ compile_system_library = TRUE; #ifdef PREFIX token::input(turbo_pascal diff -urN /usr/ports/lang/ptoc/files/patch-ab lang/ptoc/files/patch-ab --- /usr/ports/lang/ptoc/files/patch-ab Sun Feb 13 05:54:54 2000 +++ lang/ptoc/files/patch-ab Sat Oct 21 04:45:50 2000 @@ -1,24 +1,24 @@ ---- trnod.cxx.old Sat Feb 12 17:13:58 2000 -+++ trnod.cxx Sat Feb 12 17:23:33 2000 -@@ -454,7 +454,7 @@ +--- trnod.cxx.orig Sat Oct 21 04:24:34 2000 ++++ trnod.cxx Sat Oct 21 04:45:38 2000 +@@ -460,7 +460,7 @@ if (language_c) { if (params) { - char* format = ""; -- char* newln = (t_read->tag == TKN_READLN) ? "\\n" : ""; -+ char* newln = (t_read->tag == TKN_READLN) ? (char *) "\\n" : (char *) ""; + char const* format = ""; +- char const* newln = (t_read->tag == TKN_READLN) ? "\\n" : ""; ++ char const* newln = (t_read->tag == TKN_READLN) ? (char *) "\\n" : ""; expr_node *prm = params->expr; l_tkn = params->rpar; -@@ -612,7 +612,7 @@ +@@ -618,7 +618,7 @@ write_param_node *prm = params->vals; l_tkn = params->rpar; -- char* newln = (t_write->tag == TKN_WRITELN) ? "\\n" : ""; -+ char* newln = (t_write->tag == TKN_WRITELN) ? (char *) "\\n" : (char *) ""; +- char const* newln = (t_write->tag == TKN_WRITELN) ? "\\n" : ""; ++ char const* newln = (t_write->tag == TKN_WRITELN) ? (char *) "\\n" : ""; write_format = NULL; if (prm->type->tag == tp_file) { prm->translate(ctx_value); -@@ -994,7 +994,7 @@ +@@ -1000,7 +1000,7 @@ from->translate(ctx_value); from->l_tkn->append(";"); t_to->set_trans(t_ident->out_text); @@ -27,7 +27,7 @@ till->translate(ctx_value); till->l_tkn->append(";"); if (t_to->name->tag == TKN_TO) { -@@ -1063,11 +1063,11 @@ +@@ -1069,11 +1069,11 @@ bool body_is_block = body != NULL && body->is_compound() && body->next == NULL; @@ -41,7 +41,7 @@ expr->translate(ctx_condition); f_tkn = t_repeat; l_tkn = expr->l_tkn; -@@ -1258,7 +1258,7 @@ +@@ -1264,7 +1264,7 @@ } else if (var->type->tag == tp_proc) { if (turbo_pascal && tkn->name->tag == TKN_HALT) { @@ -50,7 +50,7 @@ return; } proc_tp* prc = (proc_tp*)var->type->get_typedef(); -@@ -1280,8 +1280,8 @@ +@@ -1286,8 +1286,8 @@ if (prm->var->type->tag == tp_file || prm->var->type->tag == tp_text) { @@ -61,7 +61,7 @@ } else { t = t->append("0"); } -@@ -1328,7 +1328,7 @@ +@@ -1334,7 +1334,7 @@ if (with != NULL) { f_tkn = tkn->prepend(language_c && with->tag == symbol::s_ref @@ -70,7 +70,7 @@ ->prepend(with->out_name->text); } -@@ -1744,7 +1744,7 @@ +@@ -1750,7 +1750,7 @@ t_lbr->set_trans("set::of("); } } @@ -79,7 +79,7 @@ } idx_expr_node::idx_expr_node(expr_node* arr, token* t_lbr, expr_node* indices, -@@ -2173,7 +2173,7 @@ +@@ -2181,7 +2181,7 @@ case tn_and: op->set_trans(((left->type && left->type->tag != tp_bool) || (right->type && right->type->tag != tp_bool) || nological) @@ -88,7 +88,7 @@ if (parent_tag != tn_group && parent_tag != tn_and) { f_tkn = left->f_tkn->prepend("("); l_tkn = right->l_tkn->append(")"); -@@ -2193,12 +2193,12 @@ +@@ -2201,12 +2201,12 @@ if (parent_tag != tn_group) { f_tkn = left->f_tkn->prepend(left->type && left->type->get_typedef() == &longint_type @@ -98,12 +98,12 @@ } else { f_tkn = left->f_tkn->prepend(left->type && left->type->get_typedef() == &longint_type -- ? "(unsigned long)" : "((cardinal)"); -+ ? (char *) "(unsigned long)" : (char *) "((cardinal)"); +- ? "(unsigned long)" : "(cardinal)"); ++ ? (char *) "(unsigned long)" : (char *) "(cardinal)"); } op->set_trans(">>"); break; -@@ -2216,14 +2216,14 @@ +@@ -2224,14 +2224,14 @@ } op->set_trans(((left->type && left->type->tag != tp_bool) || (right->type && right->type->tag != tp_bool) || @@ -120,7 +120,7 @@ left->l_tkn->append(", "); l_tkn = right->l_tkn->append(")"); } else { -@@ -2245,14 +2245,14 @@ +@@ -2253,14 +2253,14 @@ if (language_c) { if (short_set && ((set_tp*)type)->is_short_set()) { f_tkn = left->f_tkn->prepend(tag == tn_add @@ -141,7 +141,7 @@ } l_tkn = right->l_tkn->append(")"); token::disable(left->l_tkn->next, right->f_tkn->prev); -@@ -2290,9 +2290,9 @@ +@@ -2298,9 +2298,9 @@ } else if (ltype->tag == tp_enum || rtype->size <= ltype->size) { @@ -154,7 +154,7 @@ } } else if (((rtype->tag == tp_range && rtype->min_value >= 0) || rtype->tag == tp_enum) && -@@ -2305,9 +2305,9 @@ +@@ -2313,9 +2313,9 @@ else if (rtype->tag == tp_enum || ltype->size <= rtype->size) { f_tkn = left->f_tkn->prepend( @@ -167,7 +167,7 @@ } } } -@@ -2431,7 +2431,7 @@ +@@ -2439,7 +2439,7 @@ op->set_trans(CMP_OP(tag)); break; case tn_not: @@ -176,7 +176,7 @@ break; } if ((unsigned(tag - tn_add) <= tn_div - tn_add) && type && type->tag == tp_longint) -@@ -3388,7 +3388,7 @@ +@@ -3406,7 +3406,7 @@ } } } else { @@ -185,7 +185,7 @@ enumeration = NULL; if (constant->type->tag == tp_string) { ident->prepend("char "); -@@ -3731,16 +3731,16 @@ +@@ -3749,16 +3749,16 @@ t = tkn->ident->copy(eltd->f_tkn, eltd->l_tkn); if (tp->tag == tp_dynarray) { tkn->ident->prepend(ctx == ctx_varpar @@ -206,7 +206,7 @@ copy(tpd->f_tkn, tpd->l_tkn); } } else { -@@ -3805,7 +3805,7 @@ +@@ -3823,7 +3823,7 @@ // initialize file structure tkn->ident->append( (tp->tag == tp_file || tp->tag == tp_text) @@ -215,7 +215,7 @@ } if (tkn->var->flags & symbol::f_static) { is_static = TRUE; -@@ -3836,8 +3836,8 @@ +@@ -3854,8 +3854,8 @@ { f_tkn = f_tkn->prepend("EXTERN "); } else if (scope != NULL) { @@ -226,7 +226,7 @@ } force_semicolon(); if (is_static) { -@@ -4188,7 +4188,7 @@ +@@ -4215,7 +4215,7 @@ if (qualifiers) { if (is_external) { f_tkn = f_tkn->prepend(type->is_extern_c && !language_c @@ -235,7 +235,7 @@ } else if (is_static) { f_tkn = f_tkn->prepend("static "); } else if (is_virtual) { -@@ -4801,7 +4801,7 @@ +@@ -4832,7 +4832,7 @@ t_array->set_trans("conf_matrix"); } else { t_array->set_trans(indices->next == NULL diff -urN /usr/ports/lang/ptoc/files/patch-ad lang/ptoc/files/patch-ad --- /usr/ports/lang/ptoc/files/patch-ad Thu Jan 1 09:00:00 1970 +++ lang/ptoc/files/patch-ad Sat Oct 21 05:55:39 2000 @@ -0,0 +1,11 @@ +--- makefile.bsd.orig Sat Nov 7 10:10:50 1998 ++++ makefile.bsd Sat Oct 21 05:54:55 2000 +@@ -131,7 +131,7 @@ + $(LD) $(LDFLAGS) -o $@ $(OBJS) + + libXbgi.a: +- (cd Xbgi; make) ++ (cd Xbgi; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" X11BASE="$(X11BASE)") + + all : $(BINS) $(LIBS) + diff -urN /usr/ports/lang/ptoc/files/patch-ae lang/ptoc/files/patch-ae --- /usr/ports/lang/ptoc/files/patch-ae Thu Jan 1 09:00:00 1970 +++ lang/ptoc/files/patch-ae Sat Oct 21 04:59:11 2000 @@ -0,0 +1,11 @@ +--- parser.y.orig Sat Nov 7 10:42:00 1998 ++++ parser.y Sat Oct 21 04:59:01 2000 +@@ -5,8 +5,6 @@ + #include <string.h> + #ifdef __DECCXX + #include <alloca.h> +-#else +-#include <malloc.h> + #endif + + #include "nmtbl.h" diff -urN /usr/ports/lang/ptoc/pkg-plist lang/ptoc/pkg-plist --- /usr/ports/lang/ptoc/pkg-plist Mon Nov 9 10:21:43 1998 +++ lang/ptoc/pkg-plist Sat Oct 21 06:01:27 2000 @@ -7,22 +7,34 @@ include/ptoc/paslib.h include/ptoc/ptoc.h include/ptoc/set.h -lib/libptoc.a lib/libXbgi.a +lib/libptoc.a share/doc/ptoc/Readme.htm -share/examples/ptoc/Makefile +share/examples/ptoc/arr.pas share/examples/ptoc/bgidemo.pas +share/examples/ptoc/ccall.pas share/examples/ptoc/coord.txt +share/examples/ptoc/dos.h +share/examples/ptoc/dos.pas +share/examples/ptoc/func.pas share/examples/ptoc/hello.pas share/examples/ptoc/impact.pas share/examples/ptoc/lister.pas +share/examples/ptoc/makefile.bsd +share/examples/ptoc/nested.pas +share/examples/ptoc/objpas.pas share/examples/ptoc/polut2.pas share/examples/ptoc/printer.pas share/examples/ptoc/q2.txt share/examples/ptoc/random.txt +share/examples/ptoc/rename.cxx share/examples/ptoc/rename.pas share/examples/ptoc/set.pas +share/examples/ptoc/str.pas +share/examples/ptoc/test.c +share/examples/ptoc/test.cxx share/examples/ptoc/test.pas +share/examples/ptoc/test.txt share/examples/ptoc/tpascal.pas share/examples/ptoc/trinor.pas share/examples/ptoc/vibrkinp.pas @@ -30,11 +42,12 @@ share/examples/ptoc/vibrtabl.pas share/examples/ptoc/war2.pas share/examples/ptoc/war2.txt +share/examples/ptoc/xy2.txt share/examples/ptoc/xy2orig.txt +share/ptoc/graph.pas share/ptoc/ptoc.pas share/ptoc/tptoc.pas -share/ptoc/graph.pas -@dirrm include/ptoc -@dirrm share/doc/ptoc @dirrm share/examples/ptoc @dirrm share/ptoc +@dirrm share/doc/ptoc +@dirrm include/ptoc >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20001023183959.72D5037B4C5>