BWK awk appears to work for world builds just fine now. We want to make

sparc64 the same as the other platforms -- so do it by moving the other
platforms toward the sparc64.

gnu/usr.bin/awk/Makefile

@@ -6,17 +6,10 @@
 
 .PATH:	${.CURDIR}/../../../contrib/awk
 
-.if ${MACHINE_ARCH} == "sparc64"
 PROG=	gawk
-.else
-PROG=	awk
-.endif
 SRCS=	array.c awkgram.y builtin.c eval.c field.c gawkmisc.c io.c main.c \
 	msg.c node.c re.c version.c dfa.c getopt.c getopt1.c ext.c profile.c
 MAN=	doc/gawk.1
-.if ${MACHINE_ARCH} != "sparc64"
-MLINKS=	gawk.1 awk.1
-.endif
 
 YFLAGS=
 

usr.bin/awk/Makefile

@@ -11,10 +11,8 @@ CFLAGS+= -I. -I${AWKSRC}
 DPADD=	${LIBM}
 LDADD=	-lm
 
-.if ${MACHINE_ARCH} == "sparc64"
 LINKS=	${BINDIR}/nawk ${BINDIR}/awk
 MLINKS=	nawk.1 awk.1
-.endif
 
 CLEANFILES= maketab proctab.c ytab.h