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.sbin/Makefile

@@ -3,7 +3,6 @@
 
 .include <bsd.own.mk>
 
-# NetBSD imports
 SUBDIR= \
 	chroot \
 	installboot \
@@ -17,4 +16,48 @@ SUBDIR= \
 SUBDIR+= mkfs.mfs \
 	mkproto
 
+.if !defined(__MINIX)
+.if ${MKMAKEMANDB} != "no"
+SUBDIR+= makemandb
+.endif
+.endif # !defined(__MINIX)
+
+.if (${MKYP} != "no")
+SUBDIR+= rpc.yppasswdd ypbind yppoll ypserv ypset
+.endif
+
+.if (${MKRUMP} != "no")
+SUBDIR+= puffs
+.endif
+
+.if ${TOOLCHAIN_MISSING} != "no"
+SUBDIR+= mdsetimage
+.endif
+
+.if (${MKINET6} != "no")
+SUBDIR+=faithd ifmcstat ndp rip6query rtsold
+.endif
+.if (${USE_INET6} != "no")
+SUBDIR+=mld6query route6d rtadvd traceroute6 
+.endif
+
+.if !defined(__MINIX)
+# ATM PVC
+SUBDIR+=pvcsif pvctxctl
+.endif
+
+.if (${MKCRYPTO} != "no")
+SUBDIR+= racoon racoonctl
+.endif
+
+# NPF
+.if (${MKNPF} != "no")
+SUBDIR+=npf
+.endif
+
+# PF
+.if (${MKPF} != "no")
+SUBDIR+=pf
+.endif
+
 .include <bsd.subdir.mk>

usr.sbin/mtree/Makefile

@@ -3,7 +3,6 @@
 
 .include <bsd.own.mk>
 
-
 PROG=	mtree
 #CPPFLAGS+=-DDEBUG
 CPPFLAGS+= -DMTREE
@@ -11,7 +10,9 @@ MAN=	mtree.8
 SRCS=	compare.c crc.c create.c excludes.c misc.c mtree.c spec.c specspec.c \
 	verify.c getid.c pack_dev.c
 .if (${HOSTPROG:U} == "")
+.if defined(__MINIX)
 CPPFLAGS+= -Dlchown=chown -Dlchmod=chmod 
+.endif
 DPADD+= ${LIBUTIL}
 LDADD+= -lutil
 .endif

usr.sbin/postinstall/postinstall

@@ -2069,7 +2069,7 @@ main()
 			[ "$MACHINE" = "$(uname -m)" ] && m= || m=" -m $MACHINE"
 			cat <<_Fix_me_
 To fix, run:
-    ${0} ${SRC_ARGLIST} -d ${DEST_DIR:-/}$m fix${items_failed}
+    ${HOST_SH} ${0} ${SRC_ARGLIST} -d ${DEST_DIR:-/}$m fix${items_failed}
 Note that this may overwrite local changes.
 _Fix_me_
 		    fi