Toolchain upgrade and portability improvements.

upgrade to NetBSD CVS release from 2012/10/17 12:00:00 UTC

Makefiles updates to imporve portability

Made sure to be consistent in the usage of braces/parenthesis at
least on a per file basis. For variables, it is recommended to
continue to use braces.

usr.bin/Makefile

@@ -1,16 +1,75 @@
-# Makefile for usr.bin
+#	$NetBSD: Makefile,v 1.210 2012/08/08 14:13:46 christos Exp $
+#	from: @(#)Makefile	8.3 (Berkeley) 1/7/94
 
 .include <bsd.own.mk>
 
-# NetBSD imports
-SUBDIR= login indent cksum m4 make mktemp stat tic sed mkdep uniq seq du man \
-	apropos chpass newgrp passwd bzip2 bzip2recover gzip su genassym \
-	xinstall ldd/elf32 .WAIT ldd
+SUBDIR= \
+	 \
+	bzip2 bzip2recover \
+	 chpass cksum \
+	 \
+	 du \
+	genassym \
+	indent \
+	ldd \
+	login m4 \
+	make man \
+	mkdep mktemp \
+	newgrp \
+	passwd \
+	sed seq \
+	stat su \
+	tic \
+	uniq  \
+	xinstall 
 
+.if !defined(__MINIX)
+SUBDIR+= ../external/zlib/pigz/bin/pigz
+.else
 # Non-NetBSD imports
 SUBDIR+= ministat
 
 # Minix commands
 SUBDIR+= top 
 
+# LSC FIXME For now we compile unconditionnaly apropos even if we 
+# do not have whatis
+SUBDIR+= apropos
+.endif # defie
+
+.if (${MKMAKEMANDB} == "no")
+SUBDIR+= apropos whatis
+.endif
+
+.if (${MKRUMP} != "no")
+SUBDIR+= rump_allserver rump_dhcpclient rump_halt rump_server
+.endif
+
+.if (${MKBSDGREP} != "no")
+SUBDIR+= grep
+.endif
+
+.if (${MKPIGZGZIP} != "no")
+# nothing
+.else
+SUBDIR+= gzip 
+.endif
+
+.if (${MKHESIOD} != "no")
+SUBDIR+= hesinfo
+.endif
+
+.if (${MKSKEY} != "no")
+SUBDIR+= skey skeyinfo skeyinit
+.endif
+
+.if (${MKYP} != "no")
+SUBDIR+= ypcat ypmatch ypwhich
+.endif
+
+.if (${MKCRYPTO} != "no")
+SUBDIR+= bdes
+SUBDIR+= nbsvtool
+.endif
+
 .include <bsd.subdir.mk>