2 files changed, 24 insertions, 15 deletions

diff --git a/sysutils/heirloom/files/patch-nawk_Makefile.mk b/sysutils/heirloom/files/patch-nawk_Makefile.mk
index 346825a5f766..d57a1f0448c7 100644
--- a/sysutils/heirloom/files/patch-nawk_Makefile.mk
+++ b/sysutils/heirloom/files/patch-nawk_Makefile.mk
@@ -1,16 +1,15 @@
 --- nawk/Makefile.mk.orig	2005-02-09 23:58:39.000000000 +0800
 +++ nawk/Makefile.mk	2013-07-26 18:01:39.000000000 +0800
-@@ -12,14 +12,14 @@
+@@ -12,23 +12,22 @@
  	$(LD) $(LDFLAGS) awk.g.2001.o $(OBJ) version_su3.o $(LUXRE) -lm $(LCOMMON) $(LWCHAR) $(LIBS) -o awk_su3
  
  awk.g.c: awk.g.y
 -	$(YACC) -d awk.g.y
 -	mv -f y.tab.c awk.g.c
 +	$(YACC) -d awk.g.y && mv -f y.tab.c awk.g.c
-+
-+y.tab.h: awk.g.y | awk.g.c
  	(echo '1i'; echo '#include <inttypes.h>'; echo '.'; echo 'w';) | \
  		ed -s y.tab.h
++y.tab.h: awk.g.y | awk.g.c
  
  awk.g.2001.c: awk.g.2001.y awk.g.c
 -	$(YACC) awk.g.2001.y
@@ -19,3 +18,13 @@
  
  awk.g.2001.y: awk.g.y
  	sed -f rerule.sed <awk.g.y >awk.g.2001.y
+ 
+ maketab: maketab.o
+ 	$(HOSTCC) maketab.o -o maketab
+-	./maketab > proctab.c
+ 
+ proctab.c: maketab
++	./maketab > proctab.c
+ 
+ awk.g.o: awk.g.c
+ 	$(CC) $(CFLAGSS) $(CPPFLAGS) $(XO5FL) $(LARGEF) $(IWCHAR) $(ICOMMON) $(IUXRE) -c awk.g.c
diff --git a/sysutils/heirloom/pkg-descr b/sysutils/heirloom/pkg-descr
index da320af0a822..a99c3985a8c6 100644
--- a/sysutils/heirloom/pkg-descr
+++ b/sysutils/heirloom/pkg-descr
@@ -1,17 +1,17 @@
 The Heirloom Toolchest is a collection of standard Unix utilities.
 Highlights are:
 
-* Derived from original Unix material released as open source by Caldera. 
-* Up to four versions of each utility corresponding to SVID3/SVR4,
-  SVID4/SVR4.2MP, POSIX.2/SUSV2, and 4BSD (SVR4 /usr/ucb).
-* Support for lines of arbitrary length and in many cases binary input data. 
-* Support for multibyte character sets, especially UTF-8. 
-* More than 100 individual utilities including bc, cpio, diff, ed, file,
-  find, grep, man, nawk, oawk, pax, ps, sed, sort, spell, and tar.
-* The cpio utility can read and write zip files, GNU tar files, and
-  the cpio formats of Cray UNICOS, SGI IRIX (-K), SCO UnixWare (-c)
-  and Tru64 UNIX (-e). It is also available with the pax interface.
-* Extensive documentation including a manual page for any utility. 
-* Runs on Linux, Solaris, Open UNIX, and FreeBSD. 
+  * Derived from original Unix material released as open source by Caldera
+  * Up to four versions of each utility corresponding to SVID3/SVR4,
+    SVID4/SVR4.2MP, POSIX.2/SUSV2, and 4BSD (SVR4 /usr/ucb)
+  * Support for lines of arbitrary length and in many cases binary input data
+  * Support for multibyte character sets, especially UTF-8
+  * More than 100 individual utilities including bc, cpio, diff, ed, file,
+    find, grep, man, nawk, oawk, pax, ps, sed, sort, spell, and tar
+  * The cpio utility can read and write zip files, GNU tar files, and
+    the cpio formats of Cray UNICOS, SGI IRIX (-K), SCO UnixWare (-c)
+    and Tru64 UNIX (-e). It is also available with the pax interface
+  * Extensive documentation including a manual page for any utility
+  * Runs on Linux, Solaris, Open UNIX, and FreeBSD
 
 WWW: http://heirloom.sourceforge.net/