[PATCH] remove gawk in favor of nawk

ibotty bsd at ibotty.net
Thu Apr 8 16:59:26 PDT 2004

netbsd recently removed gawk in base.
that indicates, that nawk is not worse than gawk.

this has finally driven me to take the effort and write this 2lines patch to
remove gawk and make nawk as awk.

well, make build{world,kernel} works as expected.

anything more to add.. i guess no :)


btw: this increases transparency (as in esr) significantly, as nawk and gawk
were filed as awk (nawk at usr.bin, gawk at gnu/usr.bin). most people will
expect the source for the awk executable to be usr.bin/awk, and only if not
found will look at gnu/usr.bin/awk. so building usr.bin/awk as awk seems
right.Index: usr.bin/awk/Makefile
RCS file: /home/src/dcvs/src/usr.bin/awk/Makefile,v
retrieving revision 1.3
diff -u -3 -p -r1.3 Makefile
--- usr.bin/awk/Makefile	22 Mar 2004 20:58:25 -0000	1.3
+++ usr.bin/awk/Makefile	8 Apr 2004 23:49:50 -0000
@@ -4,7 +4,8 @@
 AWKSRC=	${.CURDIR}/../../contrib/one-true-awk
-PROG=	nawk
+PROG=	awk
+MAN=	awk.1
 SRCS=	awkgram.y b.c lex.c lib.c main.c parse.c proctab.c run.c tran.c ytab.h
@@ -24,8 +25,4 @@ build-tools: maketab.nx
 maketab.nx: ytab.h ${AWKSRC}/maketab.c
-CLEANFILES+=	nawk.1
-nawk.1: awk.1
-	ln -sf ${.ALLSRC} ${.TARGET}
 .include <bsd.prog.mk>
Index: gnu/usr.bin/Makefile
RCS file: /home/src/dcvs/src/gnu/usr.bin/Makefile,v
retrieving revision 1.7
diff -u -3 -p -r1.7 Makefile
--- gnu/usr.bin/Makefile	22 Mar 2004 20:57:37 -0000	1.7
+++ gnu/usr.bin/Makefile	8 Apr 2004 23:40:32 -0000
@@ -4,7 +4,7 @@
 # Note that gcc2 is only built under the i386 architecture.  Other
 # architectures require gcc3.
-SUBDIR= awk bc cpio dc dialog diff diff3 gperf \
+SUBDIR= bc cpio dc dialog diff diff3 gperf \
 	grep groff gzip man patch ptx rcs sdiff send-pr sort tar texinfo
 .if !defined(NO_CVS)

More information about the Submit mailing list