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.
2012-10-26 15:22:39 +02:00
parent 9152e1c5a7
commit d19d7d58aa
369 changed files with 56599 additions and 27810 deletions
--- a/usr.bin/Makefile
+++ b/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>
--- a/usr.bin/bzip2/Makefile
+++ b/usr.bin/bzip2/Makefile
@@ -1,14 +1,13 @@
-#	$NetBSD: Makefile,v 1.10 2007/05/28 12:06:24 tls Exp $
+#	$NetBSD: Makefile,v 1.12 2012/05/07 08:51:47 wiz Exp $

 .include <bsd.own.mk>		# for MKDYNAMICROOT definition

 .if defined(__MINIX)
 MKDYNAMICROOT= no
 SMALLPROG= yes
-USE_FORT=no		# __SSP_FORTIFY_LEVEL=0
-.else
-USE_FORT?= yes	# data-driven bugs?
 .endif
+USE_FORT?= yes	# data-driven bugs?
+

 PROG=	   bzip2
 LDDIR!=	   cd ${NETBSDSRCDIR}/lib/libbz2 && ${PRINTOBJDIR}
--- a/usr.bin/bzip2recover/Makefile
+++ b/usr.bin/bzip2recover/Makefile
@@ -1,18 +1,10 @@
-#	$NetBSD: Makefile,v 1.8 2007/05/28 12:06:25 tls Exp $
+#	$NetBSD: Makefile,v 1.10 2012/05/07 08:51:48 wiz Exp $

-.if defined(__MINIX)
-USE_FORT=no		# __SSP_FORTIFY_LEVEL=0
-.else
 USE_FORT?= yes	# data-driven bugs?
-.endif
 NOMAN=	   # defined

 .include <bsd.own.mk>		# for MKDYNAMICROOT definition

-.if defined(__MINIX)
-MKDYNAMICROOT= no
-.endif
-
 PROG=       bzip2recover

 .if (${MKDYNAMICROOT} == "no")
--- a/usr.bin/chpass/Makefile
+++ b/usr.bin/chpass/Makefile
@@ -14,10 +14,6 @@ MLINKS=	chpass.1 chfn.1 chpass.1 chsh.1

 CPPFLAGS+=-I${NETBSDSRCDIR}/lib/libc/include

-.if defined(__MINIX)
-USE_YP=	no
-.endif
-
 .if (${USE_YP} != "no")
 SRCS+=	pw_yp.c
 CPPFLAGS+=-DYP
--- a/usr.bin/gzip/Makefile
+++ b/usr.bin/gzip/Makefile
@@ -3,7 +3,7 @@
 # LSC Until it compiles cleanly...
 NOGCCERROR:=yes

-USE_FORT?= no	# data-driven bugs?
+USE_FORT?= yes	# data-driven bugs?

 PROG=		gzip
 MAN=		gzip.1 gzexe.1 zdiff.1 zforce.1 zmore.1 znew.1
--- a/usr.bin/indent/indent.1
+++ b/usr.bin/indent/indent.1
@@ -1,4 +1,4 @@
-.\"	$NetBSD: indent.1,v 1.20 2011/01/12 06:17:52 wiz Exp $
+.\"	$NetBSD: indent.1,v 1.22 2012/10/13 14:18:17 njoly Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -69,68 +69,36 @@
 .Nd indent and format C program source
 .Sh SYNOPSIS
 .Nm
-.Bk -words
 .Op Ar input-file Op Ar output-file
-.Ek
-.Bk -words
 .Op Fl bacc | Fl nbacc
-.Ek
-.Bk -words
 .Op Fl bad | Fl nbad
-.Ek
-.Bk -words
 .Op Fl bap | Fl nbap
-.Ek
-.Bk -words
 .Op Fl bbb | Fl nbbb
-.Ek
-.Bk -words
 .Op Fl \&bc | Fl nbc
-.Ek
 .Op Fl \&bl
 .Op Fl \&br
 .Op Fl c Ns Ar n
 .Op Fl \&cd Ns Ar n
-.Bk -words
 .Op Fl cdb | Fl ncdb
-.Ek
-.Bk -words
 .Op Fl \&ce | Fl nce
-.Ek
 .Op Fl \&ci Ns Ar n
 .Op Fl cli Ns Ar n
 .Op Fl d Ns Ar n
 .Op Fl \&di Ns Ar n
-.Bk -words
 .Op Fl fc1 | Fl nfc1
-.Ek
 .Op Fl i Ns Ar n
-.Bk -words
 .Op Fl \&ip | Fl nip
-.Ek
 .Op Fl l Ns Ar n
 .Op Fl \&lc Ns Ar n
-.Bk -words
 .Op Fl \&lp | Fl nlp
-.Ek
 .Op Fl npro
-.Bk -words
 .Op Fl pcs | Fl npcs
-.Ek
-.Bk -words
 .Op Fl psl | Fl npsl
-.Ek
-.Bk -words
 .Op Fl \&sc | Fl nsc
-.Ek
-.Bk -words
 .Op Fl sob | Fl nsob
-.Ek
 .Op Fl \&st
 .Op Fl troff
-.Bk -words
 .Op Fl v | Fl \&nv
-.Ek
 .Sh DESCRIPTION
 .Nm
 is a
@@ -225,7 +193,6 @@ if (...) {
  code
 }
 .Ed
-.Pp
 .It Fl bs , Fl nbs
 If
 .Fl bs
--- a/usr.bin/login/Makefile
+++ b/usr.bin/login/Makefile
@@ -1,14 +1,11 @@
 #	$NetBSD: Makefile,v 1.55 2012/04/24 16:52:26 christos Exp $
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93

-WARNS?=	2	# XXX -Wcast-qual issues
-
-USE_PAM?= no
-USE_KERBEROS?= no
+WARNS?=	5

 .include <bsd.own.mk>

-USE_FORT?= no	# setuid
+USE_FORT?= yes	# setuid
 PROG=	login
 SRCS=	copyrightstr.c
 DPADD+=	${LIBUTIL} ${LIBCRYPT}
--- a/usr.bin/m4/Makefile
+++ b/usr.bin/m4/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.15 2009/10/26 21:11:28 christos Exp $
+#	$NetBSD: Makefile,v 1.17 2011/08/14 12:59:25 christos Exp $
 #
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93

--- a/usr.bin/make/Makefile
+++ b/usr.bin/make/Makefile
@@ -24,7 +24,7 @@ COPTS.meta.c += -DHAVE_FILEMON_H -I${FILEMON_H:H}
 .endif
 .endif

-# For MINIX
+.if defined(__MINIX)
 CPPFLAGS+=	-DHAVE_SETENV -DHAVE_STRERROR -DHAVE_STRDUP \
 		-DHAVE_STRFTIME -DHAVE_VSNPRINTF -DUSE_SELECT

@@ -32,12 +32,14 @@ CPPFLAGS+= -DMAKE_MACHINE=\"${MACHINE}\" -DMAKE_MACHINE_ARCH=\"${MACHINE_ARCH}\"

 # LSC Until it compiles cleanly...
 NOGCCERROR:=yes
-
+.endif #defined(__MINIX)

 .PATH:	${.CURDIR}/lst.lib
-#.if make(install)
-#SUBDIR=	PSD.doc
-#.endif
+.if !defined(__MINIX)
+.if make(install)
+SUBDIR=	PSD.doc
+.endif
+.endif #!defined(__MINIX)
 .if make(obj) || make(clean)
 SUBDIR+= unit-tests
 .endif
--- a/usr.bin/newgrp/Makefile
+++ b/usr.bin/newgrp/Makefile
@@ -3,10 +3,6 @@

 .include <bsd.own.mk>

-.if defined(__MINIX)
-USE_KERBEROS= no
-.endif
-
 PROG=	newgrp
 SRCS=	newgrp.c grutil.c
 BINOWN=	root
@@ -14,7 +10,9 @@ BINMODE=4555

 CPPFLAGS+=-DGRUTIL_ACCEPT_GROUP_NUMBERS
 CPPFLAGS+=-DGRUTIL_ALLOW_GROUP_ERRORS	# for POSIX.1 compliance
-#CPPFLAGS+=-DLOGIN_CAP
+.if !defined(__MINIX)
+CPPFLAGS+=-DLOGIN_CAP
+.endif

 DPADD+=	${LIBCRYPT} ${LIBUTIL}
 LDADD+= -lcrypt -lutil
--- a/usr.bin/passwd/Makefile
+++ b/usr.bin/passwd/Makefile
@@ -1,13 +1,9 @@
-#	$NetBSD: Makefile,v 1.41 2007/05/28 12:06:29 tls Exp $
+#	$NetBSD: Makefile,v 1.42 2011/04/24 21:42:06 elric Exp $
 #	from: @(#)Makefile    8.3 (Berkeley) 4/2/94

 .include <bsd.own.mk>

 .if defined(__MINIX)
-USE_YP= no
-USE_KERBEROS= no
-USE_PAM= no
-
 # LSC Until it compiles cleanly...
 NOGCCERROR:=yes
 .endif
@@ -35,7 +31,7 @@ BINOWN=	root
 BINMODE=4555

 .if (${USE_KERBEROS} != "no")
-CPPFLAGS+= -DKERBEROS5 -I${DESTDIR}/usr/include/krb5
+CPPFLAGS+= -DKERBEROS5
 SRCS+=	krb5_passwd.c

 DPADD+=	${LIBKRB5} ${LIBCRYPTO} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN} ${LIBCRYPT}
--- a/usr.bin/seq/Makefile
+++ b/usr.bin/seq/Makefile
@@ -1,10 +1,9 @@
-#       $NetBSD: Makefile,v 1.3 2009/04/14 22:15:26 lukem Exp $
+#       $NetBSD: Makefile,v 1.4 2011/08/17 13:19:09 christos Exp $

 PROG=	seq
 DPADD=	${LIBMATH}
 LDADD=	-lm

-# LSC Until it compiles cleanly...
-NOGCCERROR:=yes
+COPTS.seq.c += -Wno-format-nonliteral

 .include <bsd.prog.mk>
--- a/usr.bin/su/Makefile
+++ b/usr.bin/su/Makefile
@@ -3,9 +3,6 @@

 .include <bsd.own.mk>

-USE_PAM=no
-USE_KERBEROS=no
-
 USE_FORT?= yes	# setuid
 PROG=	su
 BINOWN=	root