From owner-svn-ports-all@freebsd.org Fri Mar 4 06:46:29 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D331D9DAFD0; Fri, 4 Mar 2016 06:46:29 +0000 (UTC) (envelope-from wen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B0926A68; Fri, 4 Mar 2016 06:46:29 +0000 (UTC) (envelope-from wen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u246kSut058070; Fri, 4 Mar 2016 06:46:28 GMT (envelope-from wen@FreeBSD.org) Received: (from wen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u246kR2G058060; Fri, 4 Mar 2016 06:46:27 GMT (envelope-from wen@FreeBSD.org) Message-Id: <201603040646.u246kR2G058060@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wen set sender to wen@FreeBSD.org using -f From: Wen Heping Date: Fri, 4 Mar 2016 06:46:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r410087 - in head/lang/p2c: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Mar 2016 06:46:29 -0000 Author: wen Date: Fri Mar 4 06:46:27 2016 New Revision: 410087 URL: https://svnweb.freebsd.org/changeset/ports/410087 Log: - Update to 2.01 PR: 205212 Submitted by: tkato432@yahoo.com Deleted: head/lang/p2c/files/patch-comment.c head/lang/p2c/files/patch-lex.c head/lang/p2c/files/patch-out.c head/lang/p2c/files/patch-parse.c Modified: head/lang/p2c/Makefile head/lang/p2c/distinfo head/lang/p2c/files/patch-Makefile head/lang/p2c/files/patch-loc.p2clib.c head/lang/p2c/files/patch-makeproto.c head/lang/p2c/files/patch-p2clib.c head/lang/p2c/files/patch-trans.c head/lang/p2c/files/patch-trans.h head/lang/p2c/pkg-descr head/lang/p2c/pkg-plist Modified: head/lang/p2c/Makefile ============================================================================== --- head/lang/p2c/Makefile Fri Mar 4 06:44:17 2016 (r410086) +++ head/lang/p2c/Makefile Fri Mar 4 06:46:27 2016 (r410087) @@ -2,27 +2,29 @@ # $FreeBSD$ PORTNAME= p2c -PORTVERSION= 1.21a -PORTREVISION= 3 +PORTVERSION= 2.01 CATEGORIES= lang -MASTER_SITES= http://darkstar.ist.utl.pt/slackware/slackware_source/d/p2c/ \ - http://www.slackware.at/data/slackware-10.0/source/d/p2c/ -DISTFILES= p2c-1.21alpha2.tar.gz +MASTER_SITES= https://schneider.ncifcrf.gov/p2c/ MAINTAINER= ports@FreeBSD.org COMMENT= Pascal to C translator -BROKEN= unfetchable - LICENSE= GPLv2 -WRKSRC= ${WRKDIR}/p2c-1.21alpha-07.Dec.93/src +WRKSRC_SUBDIR= src USES= perl5 shebangfix SHEBANG_FILES= p2cc.perl perl_OLD_CMD= /bin/perl +USE_PERL5= run ALL_TARGET= all p2cc +pre-build: + @${RM} -f ${WRKSRC}/p2c.man.inst + +post-build: + @${LN} -sf p2c.man.inst ${WRKSRC}/p2c.1 + do-install: (cd ${WRKSRC} && ${INSTALL_PROGRAM} p2c \ ${STAGEDIR}${PREFIX}/bin) @@ -40,5 +42,7 @@ do-install: (cd ${WRKSRC} && ${INSTALL_DATA} ${i} \ ${STAGEDIR}${PREFIX}/lib/p2c) .endfor + (cd ${WRKSRC} && ${INSTALL_MAN} p2c.1 \ + ${STAGEDIR}${MANPREFIX}/man/man1) .include Modified: head/lang/p2c/distinfo ============================================================================== --- head/lang/p2c/distinfo Fri Mar 4 06:44:17 2016 (r410086) +++ head/lang/p2c/distinfo Fri Mar 4 06:46:27 2016 (r410087) @@ -1,2 +1,2 @@ -SHA256 (p2c-1.21alpha2.tar.gz) = 5e7874a46d6ac58b1d3ecc0409b5458733cbca8abb12e33d68b23a72910d5c29 -SIZE (p2c-1.21alpha2.tar.gz) = 423399 +SHA256 (p2c-2.01.tar.gz) = a05635e6b0b40bee9617771ba628deefae13369cd7d49bb880cc8590495fcf60 +SIZE (p2c-2.01.tar.gz) = 586605 Modified: head/lang/p2c/files/patch-Makefile ============================================================================== --- head/lang/p2c/files/patch-Makefile Fri Mar 4 06:44:17 2016 (r410086) +++ head/lang/p2c/files/patch-Makefile Fri Mar 4 06:46:27 2016 (r410087) @@ -1,4 +1,4 @@ ---- Makefile.orig +--- Makefile.orig 2015-11-18 20:12:06 UTC +++ Makefile @@ -19,29 +19,30 @@ SHELL = /bin/sh @@ -39,13 +39,13 @@ +CC ?= cc # you may wish to use gcc here instead OPT = # -O # uncomment this for optimization DEB = # -g # uncomment this for debugging - DEFS = # place other -D types of things here + DEFS = -DTEST_MALLOC # place other -D types of things here # TDS 2015nov18 -CFLAGS = $(OPT) $(DEB) $(DEFS) +CFLAGS += $(OPT) $(DEB) $(DEFS) LFLAGS = -@@ -64,9 +65,9 @@ +@@ -64,9 +65,9 @@ LIBSRCS = p2clib.c loc.p2clib.c LIBOBJS = p2clib.o loc.p2clib.o OTHERLIBOBJS = @@ -58,7 +58,7 @@ MISCSRCS = makeproto.c PROTOS = p2c.proto p2c.hdrs -@@ -128,7 +129,6 @@ +@@ -128,7 +129,6 @@ p2cc: p2cc.perl sed -e "s;--HOMEDIR--;$(ABSHOMEDIR);" \ -e "s;--INCDIR--;$(ABSINCDIR);" \ -e "s;--LIBDIR--;$(ABSLIBDIR);" \ Modified: head/lang/p2c/files/patch-loc.p2clib.c ============================================================================== --- head/lang/p2c/files/patch-loc.p2clib.c Fri Mar 4 06:44:17 2016 (r410086) +++ head/lang/p2c/files/patch-loc.p2clib.c Fri Mar 4 06:46:27 2016 (r410087) @@ -1,4 +1,4 @@ ---- loc.p2clib.c.orig +--- loc.p2clib.c.orig 1993-12-08 05:36:53 UTC +++ loc.p2clib.c @@ -4,3 +4,42 @@ * the symbol LOCAL_INIT when you compile p2clib.c. Modified: head/lang/p2c/files/patch-makeproto.c ============================================================================== --- head/lang/p2c/files/patch-makeproto.c Fri Mar 4 06:44:17 2016 (r410086) +++ head/lang/p2c/files/patch-makeproto.c Fri Mar 4 06:46:27 2016 (r410087) @@ -1,4 +1,4 @@ ---- makeproto.c.orig +--- makeproto.c.orig 1993-12-08 05:36:53 UTC +++ makeproto.c @@ -7,6 +7,7 @@ @@ -8,7 +8,7 @@ #include #include -@@ -157,7 +158,7 @@ +@@ -157,7 +158,7 @@ char **argv; char argdecls[MAXARGS][256], argnames[MAXARGS][80]; char *cp, *cp2, *cp3; int i, j, pos, len, thistab, numstars, whichf, nargs, incomment, errors = 0; Modified: head/lang/p2c/files/patch-p2clib.c ============================================================================== --- head/lang/p2c/files/patch-p2clib.c Fri Mar 4 06:44:17 2016 (r410086) +++ head/lang/p2c/files/patch-p2clib.c Fri Mar 4 06:46:27 2016 (r410087) @@ -1,6 +1,6 @@ ---- p2clib.c.orig +--- p2clib.c.orig 1993-12-08 05:36:53 UTC +++ p2clib.c -@@ -890,7 +890,7 @@ +@@ -890,7 +890,7 @@ int *Day, *Month, *Year, *Hour, *Min, *S { #ifndef NO_TIME struct tm *tm; @@ -9,7 +9,7 @@ time(&clock); tm = localtime(&clock); -@@ -908,7 +908,7 @@ +@@ -908,7 +908,7 @@ int *Day, *Month, *Year, *Hour, *Min, *S Void VAXdate(s) char *s; { @@ -18,7 +18,7 @@ char *c; int i; static int where[] = {8, 9, 0, 4, 5, 6, 0, 20, 21, 22, 23}; -@@ -924,7 +924,7 @@ +@@ -924,7 +924,7 @@ char *s; Void VAXtime(s) char *s; { Modified: head/lang/p2c/files/patch-trans.c ============================================================================== --- head/lang/p2c/files/patch-trans.c Fri Mar 4 06:44:17 2016 (r410086) +++ head/lang/p2c/files/patch-trans.c Fri Mar 4 06:46:27 2016 (r410087) @@ -1,6 +1,6 @@ ---- trans.c.orig +--- trans.c.orig 2015-10-02 17:52:53 UTC +++ trans.c -@@ -23,6 +23,8 @@ +@@ -23,6 +23,8 @@ the Free Software Foundation, Inc., 675 #include "trans.h" #include @@ -9,7 +9,7 @@ -@@ -575,7 +577,7 @@ +@@ -575,7 +577,7 @@ extern char *getenv PP((char *)); # endif #endif @@ -18,65 +18,12 @@ Static void openlogfile() { -@@ -588,17 +590,17 @@ - if (!name) - name = format_s("%s.log", codefname); - saveoldfile(name); -- logf = fopen(name, "w"); -- if (logf) { -- fprintf(logf, "\nTranslation of %s to %s by p2c %s\n", -+ p2c_logf = fopen(name, "w"); -+ if (p2c_logf) { -+ fprintf(p2c_logf, "\nTranslation of %s to %s by p2c %s\n", - infname, codefname, P2C_VERSION); -- fprintf(logf, "Translated"); -+ fprintf(p2c_logf, "Translated"); - uname = getenv("USER"); - if (uname) -- fprintf(logf, " by %s", uname); -+ fprintf(p2c_logf, " by %s", uname); - time(&starting_time); -- fprintf(logf, " on %s", ctime(&starting_time)); -- fprintf(logf, "\n\n"); -+ fprintf(p2c_logf, " on %s", ctime(&starting_time)); -+ fprintf(p2c_logf, "\n\n"); - } else { - perror(name); - verbose = 0; -@@ -608,20 +610,20 @@ +@@ -608,7 +610,7 @@ Static void openlogfile() void closelogfile() { - long ending_time; + time_t ending_time; -- if (logf) { -- fprintf(logf, "\n\n"); -+ if (p2c_logf) { -+ fprintf(p2c_logf, "\n\n"); - #if defined(unix) || defined(__unix) -- fprintf(logf, "Total memory used: %ld bytes.\n", (long)sbrk(0)); -+ fprintf(p2c_logf, "Total memory used: %ld bytes.\n", (long)sbrk(0)); - #endif - time(&ending_time); -- fprintf(logf, "Processed %d source lines in %ld:%ld seconds.\n", -+ fprintf(p2c_logf, "Processed %d source lines in %ld:%ld seconds.\n", - inf_ltotal, - (ending_time - starting_time) / 60, - (ending_time - starting_time) % 60); -- fprintf(logf, "\n\nTranslation completed on %s", ctime(&ending_time)); -- fclose(logf); -+ fprintf(p2c_logf, "\n\nTranslation completed on %s", ctime(&ending_time)); -+ fclose(p2c_logf); - } - } - -@@ -949,7 +951,7 @@ - setbuf(codef, NULL); /* for debugging */ - outf = codef; - outf_lnum = 1; -- logf = NULL; -+ p2c_logf = NULL; - if (verbose) - openlogfile(); - setup_complete = 0; + if (logfile) { + fprintf(logfile, "\n\n"); Modified: head/lang/p2c/files/patch-trans.h ============================================================================== --- head/lang/p2c/files/patch-trans.h Fri Mar 4 06:44:17 2016 (r410086) +++ head/lang/p2c/files/patch-trans.h Fri Mar 4 06:46:27 2016 (r410087) @@ -1,15 +1,6 @@ ---- trans.h.orig +--- trans.h.orig 2015-10-05 23:04:46 UTC +++ trans.h -@@ -1773,7 +1773,7 @@ - - extern char *infname, *outfname, *codefname, *hdrfname; - extern char *requested_module; --extern FILE *inf, *outf, *codef, *hdrf, *logf; -+extern FILE *inf, *outf, *codef, *hdrf, *p2c_logf; - extern short setup_complete, found_module; - extern short regression, verbose, conserve_mem; - extern int inf_lnum, inf_ltotal; -@@ -1861,8 +1861,10 @@ +@@ -1863,8 +1863,10 @@ extern Expr *new_array_size; /* Our library omits declarations for these functions! */ Modified: head/lang/p2c/pkg-descr ============================================================================== --- head/lang/p2c/pkg-descr Fri Mar 4 06:44:17 2016 (r410086) +++ head/lang/p2c/pkg-descr Fri Mar 4 06:46:27 2016 (r410087) @@ -1,21 +1,21 @@ -P2c is a tool for translating Pascal programs into C. The input -consists of a set of source files in any of the following Pascal -dialects: HP Pascal, Turbo/UCSD Pascal, DEC VAX Pascal, Oregon -Software Pascal/2, Macintosh Programmer's Workshop Pascal, -Sun/Berkeley Pascal, Texas Instruments Pascal, Apollo Domain Pascal. -Modula-2 syntax is also supported. Output is a set of .c and .h files -that comprise an equivalent program in any of several dialects of -C. Output code may be kept machine- and dialect independent, or it may -be targeted to a specific machine and compiler. Most reasonable Pascal -programs are converted into fully functional C which will compile and -run with no further modifications, although p2c sometimes chooses to -generate readable code at the expense of absolute generality. P2c -endeavors to insert notes and warning messages into the output code to -point out areas which may require human intervention. Output code is -arranged to be readable and efficient, and to make use of C idioms -wherever possible. The main goal of the translation is to produce C -files which are pleasant and "natural" enough to be acceptable as the -new source files for a program. In a pinch, p2c will also serve as an -ad hoc Pascal compiler. The p2cc script makes it easy to use p2c as a -compiler. +P2c is a tool for translating Pascal programs into C. The input consists +of a set of source files in any of the following Pascal dialects: HP +Pascal, Turbo/UCSD Pascal, DEC VAX Pascal, Oregon Software Pascal/2, +Macintosh Programmer's Workshop Pascal, Sun/Berkeley Pascal, Texas +Instruments Pascal, Apollo Domain Pascal. Modula-2 syntax is also +supported. Output is a set of .c and .h files that comprise an +equivalent program in any of several dialects of C. Output code may be +kept machine- and dialect independent, or it may be targeted to a +specific machine and compiler. Most reasonable Pascal programs are +converted into fully functional C which will compile and run with no +further modifications, although p2c sometimes chooses to generate +readable code at the expense of absolute generality. P2c endeavors to +insert notes and warning messages into the output code to point out +areas which may require human intervention. Output code is arranged to +be readable and efficient, and to make use of C idioms wherever +possible. The main goal of the translation is to produce C files which +are pleasant and "natural" enough to be acceptable as the new source +files for a program. In a pinch, p2c will also serve as an ad hoc Pascal +compiler. The p2cc script makes it easy to use p2c as a compiler. +WWW: https://schneider.ncifcrf.gov/p2c/ Modified: head/lang/p2c/pkg-plist ============================================================================== --- head/lang/p2c/pkg-plist Fri Mar 4 06:44:17 2016 (r410086) +++ head/lang/p2c/pkg-plist Fri Mar 4 06:46:27 2016 (r410087) @@ -1,10 +1,11 @@ bin/p2c bin/p2cc -lib/libp2c.a include/p2c/p2c.h -lib/p2c/p2crc +lib/libp2c.a lib/p2c/loc.p2crc +lib/p2c/p2crc +lib/p2c/string.pas lib/p2c/system.imp lib/p2c/system.m2 lib/p2c/turbo.imp -lib/p2c/string.pas +man/man1/p2c.1.gz