Index: head/usr.bin/awk/Makefile =================================================================== --- head/usr.bin/awk/Makefile (revision 163694) +++ head/usr.bin/awk/Makefile (revision 163695) @@ -1,38 +1,38 @@ # $FreeBSD$ AWKSRC= ${.CURDIR}/../../contrib/one-true-awk .PATH: ${AWKSRC} PROG= nawk SRCS= awkgram.y b.c lex.c lib.c main.c parse.c proctab.c run.c tran.c ytab.h CFLAGS+= -DHAS_ISBLANK -I. -I${AWKSRC} DPADD= ${LIBM} LDADD= -lm LINKS= ${BINDIR}/nawk ${BINDIR}/awk MLINKS= nawk.1 awk.1 CLEANFILES= maketab proctab.c ytab.h ytab.h: awkgram.h ln -sf ${.ALLSRC} ${.TARGET} proctab.c: maketab ./maketab > proctab.c build-tools: maketab maketab: ytab.h ${AWKSRC}/maketab.c CLEANFILES+= nawk.1 nawk.1: awk.1 cat ${.ALLSRC} > ${.TARGET} -.for f in b.c lib.c main.c run.c +.for f in b.c lib.c main.c run.c tran.c ${f}: ${AWKSRC}/${f} ${.CURDIR}/${f}.diff patch -s -b .orig -o ${.TARGET} < ${.CURDIR}/${f}.diff ${AWKSRC}/${f} CLEANFILES+= ${f} .endfor .include Index: head/usr.bin/awk/tran.c.diff =================================================================== --- head/usr.bin/awk/tran.c.diff (nonexistent) +++ head/usr.bin/awk/tran.c.diff (revision 163695) @@ -0,0 +1,22 @@ +$FreeBSD$ + +Index: tran.c +=================================================================== +RCS file: /home/ncvs/src/contrib/one-true-awk/tran.c,v +retrieving revision 1.1.1.4 +diff -u -p -r1.1.1.4 tran.c +--- tran.c 16 May 2005 19:11:35 -0000 1.1.1.4 ++++ tran.c 25 Oct 2006 20:56:18 -0000 +@@ -332,10 +332,10 @@ char *setsval(Cell *vp, const char *s) / + donerec = 1; + } + t = tostring(s); /* in case it's self-assign */ +- vp->tval &= ~NUM; +- vp->tval |= STR; + if (freeable(vp)) + xfree(vp->sval); ++ vp->tval &= ~NUM; ++ vp->tval |= STR; + vp->tval &= ~DONTFREE; + dprintf( ("setsval %p: %s = \"%s (%p) \", t=%o r,f=%d,%d\n", + vp, NN(vp->nval), t,t, vp->tval, donerec, donefld) ); Property changes on: head/usr.bin/awk/tran.c.diff ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property