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.

external/bsd/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.32 2012/03/23 21:31:27 christos Exp $
+#	$NetBSD: Makefile,v 1.33 2012/10/08 01:45:11 jkoshy Exp $
 
 .include <bsd.own.mk>
 
@@ -7,6 +7,13 @@ SUBDIR= byacc file flex mdocml \
 .if (${MKATF} != "no")
 SUBDIR+= atf
 .endif
+.if (${MKCRYPTO} != "no")
+SUBDIR+= pkg_install ../../crypto/external/bsd
+.endif
+# IP Filter
+.if (${MKIPFILTER} != "no")
+SUBDIR+=ipf
+.endif
 .if (${MKISCSI} != "no")
 SUBDIR+= iscsi 
 .endif
@@ -16,15 +23,8 @@ SUBDIR+= openldap
 .if (${MKLLVM} != "no")
 SUBDIR+= llvm
 .endif
-.if (${MKCRYPTO} != "no")
-SUBDIR+= pkg_install ../../crypto/external/bsd
-.endif
 .if (${MKPCC} != "no")
 SUBDIR+= pcc
 .endif
-# IP Filter
-.if (${MKIPFILTER} != "no")
-SUBDIR+=ipf
-.endif
 
 .include <bsd.subdir.mk>

external/bsd/file/Makefile.inc

@@ -4,7 +4,11 @@ DIST=${.CURDIR}/../dist
 WARNS=4
 
 BINDIR?= /usr/bin
+.if defined(__MINIX)
 USE_FORT?= no	# data-driven bugs?
+.else
+USE_FORT?= yes	# data-driven bugs?
+.endif
 
 TOOL_MKMAGIC?=	${.OBJDIR}/file
 
@@ -12,7 +16,7 @@ MFILESDIR?=	/usr/share/misc
 MFILES?=	magic.mgc
 MAGIC?=		${MFILESDIR}/magic
 
-#-DQUICK
+#LSC FIXME Is this still needed ? -DQUICK
 CPPFLAGS+=	-DMAGIC='"${MAGIC}"' -DHAVE_CONFIG_H  -DBUILTIN_ELF \
 		-DELFCORE
 CPPFLAGS+=	-I${.CURDIR}/../include -I${DIST}/src

external/bsd/file/bin/Makefile

@@ -11,7 +11,9 @@ FILES=		${MFILES}
 .endif
 
 PROG=		file
+.if defined(__MINIX)
 LDADD+=		-L../lib
+.endif
 LDADD+=		-lmagic -lz
 DPADD+=		${LIBMAGIC} ${LIBZ}
 MAN=		file.1 magic.5

external/bsd/file/file2netbsd

@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-#	$NetBSD: file2netbsd,v 1.2 2011/10/08 19:28:39 christos Exp $
+#	$NetBSD: file2netbsd,v 1.3 2012/02/22 17:47:25 christos Exp $
 #
 # Copyright (c) 2003, 2011 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -47,7 +47,7 @@ file_vers="$(awk -F', ' '/AC_INIT\(/ { print $2 }' "$FILE/configure.ac")"
 find "$FILE" -name .cvsignore -delete
 
 ### Remove the $'s around RCS tags
-cleantags $d
+cleantags "$FILE"
 
 ### Add NetBSD RCS Id
 find "$FILE" -type f -name '*.[chly]' -print | while read c; do
@@ -99,6 +99,6 @@ wq' | ed Makefile.in > /dev/null 2>&1
 echo done
 
 echo You can import now.  Use the following command:
-echo cvs import src/external/bsd/file/dist CHRISTOS FILE${file_vers%.*}_${file_vers#*.}
+echo cvs -d cvs.netbsd.org:/cvsroot import src/external/bsd/file/dist CHRISTOS FILE${file_vers%.*}_${file_vers#*.}
 
 exit 0

external/bsd/file/lib/Makefile

@@ -1,7 +1,11 @@
 #	$NetBSD: Makefile,v 1.2 2011/08/14 09:06:12 christos Exp $
 #
 
+.if defined(__MINIX)
 USE_FORT?= no	# data driven bugs?
+.else
+USE_FORT?= yes	# data driven bugs?
+.endif
 
 .include <bsd.own.mk>
 

external/bsd/libarchive/Makefile.inc

@@ -6,7 +6,9 @@ USE_FORT?=	yes # complex string handling
 
 LIBARCHIVEDIR=	${NETBSDSRCDIR}/external/bsd/libarchive/dist
 
+.if defined(__MINIX)
 CPPFLAGS+=	-I${DESTDIR}/usr/include
+.endif
 CPPFLAGS+=	-I${NETBSDSRCDIR}/external/bsd/libarchive/include
 CPPFLAGS+=	-DPLATFORM_CONFIG_H=\"config_netbsd.h\"