Date: Tue, 6 Feb 2001 18:30:52 +0100 (CET) From: tobez@tobez.org To: FreeBSD-gnats-submit@freebsd.org Cc: eivind@freebsd.org Subject: ports/24906: [UPGRADE PORT] devel/re2c 0.5 -> 0.9.1 Message-ID: <20010206173052.AE65C54EC@heechee.tobez.org>
next in thread | raw e-mail | index | archive | help
>Number: 24906 >Category: ports >Synopsis: [UPGRADE PORT] devel/re2c 0.5 -> 0.9.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: Tue Feb 06 09:40:00 PST 2001 >Closed-Date: >Last-Modified: >Originator: Anton Berezin >Release: FreeBSD 5.0-CURRENT i386 >Organization: N/A >Environment: >Description: - newer version; - respects CFLAGS; - installs documentation; - required fewer (well, zero) patches. Four files were deleted: files/patch-aa files/patch-ab files/patch-ac files/patch-ad >How-To-Repeat: >Fix: diff -u -ruN re2c.bak/Makefile re2c/Makefile --- re2c.bak/Makefile Tue Feb 6 17:49:12 2001 +++ re2c/Makefile Tue Feb 6 18:08:54 2001 @@ -6,21 +6,29 @@ # PORTNAME= re2c -PORTVERSION= 0.5 +PORTVERSION= 0.9.1 CATEGORIES= devel -MASTER_SITES= ftp://csg.uwaterloo.ca/pub/peter/ \ - ftp://ftp.uni-trier.de/pub/unix/compiler-toolkit/re2c/ \ - ftp://ftp.tut.ac.jp/.h3/UNIX/lib/ -DISTNAME= ${PORTNAME}.${PORTVERSION} +MASTER_SITES= http://www.tildeslash.org/re2c/ \ + http://freesoftware.missouri.edu/pub/NetSW/SoftEng/CompilerConstruct/re2c/ \ + http://www.tobez.org/download/port-mirrors/devel/re2c/ MAINTAINER= eivind@FreeBSD.org +USE_GMAKE= yes + MAN1= re2c.1 ALL_TARGET= default +pre-patch: + @${PERL} -pi -e 's|^CFLAGS.*$$|CFLAGS+=-Wall -I. -Wno-unused -Wno-parentheses|' ${WRKSRC}/Makefile + @${PERL} -pi -e 's|<malloc.h>|<stdlib.h>|' ${WRKSRC}/parser.cc ${WRKSRC}/parser.y + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/re2c ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/re2c.1 ${PREFIX}/man/man1 + ${MKDIR} ${PREFIX}/share/doc/re2c + ${INSTALL_DATA} ${WRKSRC}/doc/loplas.ps.gz ${WRKSRC}/doc/sample.bib \ + ${PREFIX}/share/doc/re2c .include <bsd.port.mk> diff -u -ruN re2c.bak/distinfo re2c/distinfo --- re2c.bak/distinfo Tue Feb 6 17:49:12 2001 +++ re2c/distinfo Tue Feb 6 18:11:58 2001 @@ -1 +1 @@ -MD5 (re2c.0.5.tar.gz) = 5c00e8e554d4b650895ecfc3e63338b2 +MD5 (re2c-0.9.1.tar.gz) = 574dc153ac4edd7ccbf712721af23040 diff -u -ruN re2c.bak/files/patch-aa re2c/files/patch-aa --- re2c.bak/files/patch-aa Tue Feb 6 17:49:12 2001 +++ re2c/files/patch-aa Thu Jan 1 01:00:00 1970 @@ -1,13 +0,0 @@ ---- basics.h.orig Thu May 14 16:35:56 1998 -+++ basics.h Thu May 14 16:36:18 1998 -@@ -6,10 +6,6 @@ - //Initial revision - // - --typedef unsigned int bool; --const bool true = (0 == 0); --const bool false = (!true); -- - typedef unsigned int uint; - typedef unsigned char uchar, byte; - typedef unsigned short ushort, word; diff -u -ruN re2c.bak/files/patch-ab re2c/files/patch-ab --- re2c.bak/files/patch-ab Tue Feb 6 17:49:12 2001 +++ re2c/files/patch-ab Thu Jan 1 01:00:00 1970 @@ -1,20 +0,0 @@ ---- Makefile.orig Fri Apr 15 20:23:55 1994 -+++ Makefile Sun Sep 26 09:42:57 1999 -@@ -15,7 +15,7 @@ - OBJS = code.o dfa.o main.o parser.o actions.o scanner.o substr.o\ - translate.o - --CC = gcc -+CC = c++ - CFLAGS = -O2 -Wall -I. - YFLAGS = -d - LDFLAGS = -@@ -30,7 +30,7 @@ - mv -f y.tab.c parser.cc - - re2c: $(OBJS) -- $(CC) -o $@ $(OBJS) $(LDFLAGS) -lg++ -+ $(CC) -o $@ $(OBJS) $(LDFLAGS) #-lg++ - - # - # generated with "gcc -I. -MM -x c++ *.cc *.y *.re" diff -u -ruN re2c.bak/files/patch-ac re2c/files/patch-ac --- re2c.bak/files/patch-ac Tue Feb 6 17:49:12 2001 +++ re2c/files/patch-ac Thu Jan 1 01:00:00 1970 @@ -1,72 +0,0 @@ ---- dfa.cc.old Fri Feb 4 15:18:55 2000 -+++ dfa.cc Fri Feb 4 15:22:57 2000 -@@ -109,6 +109,7 @@ - uint nc = ub - lb; - GoTo *goTo = new GoTo[nc]; - Span *span = new Span[nc]; -+ uint j; - memset((char*) goTo, 0, nc*sizeof(GoTo)); - tail = &head; - head = NULL; -@@ -123,7 +124,7 @@ - uint nGoTos = 0; - - s->rule = NULL; -- for(iP = s->kernel; i = *iP; ++iP){ -+ for(iP = s->kernel; (i = *iP) != NULL; ++iP){ - if(i->i.tag == CHAR){ - for(Ins *j = i + 1; j < (Ins*) i->i.link; ++j){ - if(!(j->c.link = goTo[j->c.value - lb].to)) -@@ -136,7 +137,7 @@ - } - } - -- for(uint j = 0; j < nGoTos; ++j){ -+ for(j = 0; j < nGoTos; ++j){ - GoTo *go = &goTo[goTo[j].ch - lb]; - i = (Ins*) go->to; - for(cP = work; i; i = (Ins*) i->c.link) -@@ -169,7 +170,7 @@ - - DFA::~DFA(){ - State *s; -- while(s = head){ -+ while((s = head) != NULL){ - head = s->next; - delete s; - } -@@ -185,11 +186,12 @@ - - State *DFA::findState(Ins **kernel, uint kCount){ - Ins **cP, **iP, *i; -+ State *s; - - kernel[kCount] = NULL; - - cP = kernel; -- for(iP = kernel; i = *iP; ++iP){ -+ for(iP = kernel; (i = *iP) != NULL; ++iP){ - if(i->i.tag == CHAR || i->i.tag == TERM){ - *cP++ = i; - } else { -@@ -199,9 +201,9 @@ - kCount = cP - kernel; - kernel[kCount] = NULL; - -- for(State *s = head; s; s = s->next){ -+ for(s = head; s; s = s->next){ - if(s->kCount == kCount){ -- for(iP = s->kernel; i = *iP; ++iP) -+ for(iP = s->kernel; (i = *iP) != NULL; ++iP) - if(!isMarked(i)) - goto nextState; - goto unmarkAll; -@@ -218,7 +220,7 @@ - toDo = s; - - unmarkAll: -- for(iP = kernel; i = *iP; ++iP) -+ for(iP = kernel; (i = *iP) != NULL; ++iP) - unmark(i); - - return s; diff -u -ruN re2c.bak/files/patch-ad re2c/files/patch-ad --- re2c.bak/files/patch-ad Tue Feb 6 17:49:12 2001 +++ re2c/files/patch-ad Thu Jan 1 01:00:00 1970 @@ -1,13 +0,0 @@ ---- actions.cc.old Fri Feb 4 15:23:32 2000 -+++ actions.cc Fri Feb 4 15:24:14 2000 -@@ -460,8 +460,9 @@ - - void genCode(ostream& o, RegExp *re){ - CharSet cs; -+ uint j; - memset(&cs, 0, sizeof(cs)); -- for(uint j = 0; j < nChars; ++j){ -+ for(j = 0; j < nChars; ++j){ - cs.rep[j] = &cs.ptn[0]; - cs.ptn[j].nxt = &cs.ptn[j+1]; - } diff -u -ruN re2c.bak/pkg-plist re2c/pkg-plist --- re2c.bak/pkg-plist Tue Feb 6 17:49:12 2001 +++ re2c/pkg-plist Tue Feb 6 18:11:49 2001 @@ -1 +1,4 @@ bin/re2c +share/doc/re2c/loplas.ps.gz +share/doc/re2c/sample.bib +@dirrm share/doc/re2c >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?20010206173052.AE65C54EC>