[src/trunk]: src/external/bsd/ntp Update warning flags to reflect the fixes. ...

[joerg <joerg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/55cdbf67a022
branches:  trunk
changeset: 792406:55cdbf67a022
user:      joerg <joerg%NetBSD.org@localhost>
date:      Thu Jan 02 21:38:38 2014 +0000

description:
Update warning flags to reflect the fixes. Restrict GCC flags to GCC.

diffstat:

 external/bsd/ntp/Makefile.inc           |   3 +--
 external/bsd/ntp/bin/ntpd/Makefile      |   6 ++----
 external/bsd/ntp/lib/libiscntp/Makefile |   4 ++--
 external/bsd/ntp/lib/libntp/Makefile    |   6 ++----
 external/bsd/ntp/lib/libopts/Makefile   |  16 ++++------------
 5 files changed, 11 insertions(+), 24 deletions(-)

diffs (112 lines):

diff -r 9d300d2ee64c -r 55cdbf67a022 external/bsd/ntp/Makefile.inc
--- a/external/bsd/ntp/Makefile.inc     Thu Jan 02 21:37:00 2014 +0000
+++ b/external/bsd/ntp/Makefile.inc     Thu Jan 02 21:38:38 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.12 2013/09/21 22:28:12 joerg Exp $
+#      $NetBSD: Makefile.inc,v 1.13 2014/01/02 21:38:38 joerg Exp $
 
 .if !defined(NTP_MAKEFILE_INC)
 NTP_MAKEFILE_INC=yes
@@ -7,7 +7,6 @@
 
 CWARNFLAGS+=   -Wno-missing-noreturn
 CWARNFLAGS.clang+=     -Wno-unneeded-internal-declaration \
-                       -Wno-format-security \
                        -Wno-parentheses -Wno-constant-logical-operand \
                        -Wno-error=unused-const-variable
 
diff -r 9d300d2ee64c -r 55cdbf67a022 external/bsd/ntp/bin/ntpd/Makefile
--- a/external/bsd/ntp/bin/ntpd/Makefile        Thu Jan 02 21:37:00 2014 +0000
+++ b/external/bsd/ntp/bin/ntpd/Makefile        Thu Jan 02 21:38:38 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.14 2013/12/30 17:48:13 christos Exp $
+#      $NetBSD: Makefile,v 1.15 2014/01/02 21:38:38 joerg Exp $
 
 .include <bsd.own.mk>
 
@@ -73,7 +73,7 @@
 LDADD+=                -L${LIBPARSE} -lparse -L${LIBISC} -liscntp -lm -lutil
 DPADD+=                ${LIBPARSE}/libparse.a ${LIBISC}/libiscntp.a ${LIBOPTS}/libopts.a  ${LIBNTP}/libntp.a ${LIBM} ${LIBUTIL}
 
-CWARNFLAGS.clang+=     -Wno-strncat-size
+COPTS.ntp_control.c+=  ${${ACTIVE_CC} == "gcc":? -Wno-error=format-nonliteral :}
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -83,8 +83,6 @@
 
 .PATH: ${DIST}
 
-COPTS.ntp_control.c+= -Wno-format-nonliteral
-
 .include <bsd.prog.mk>
 
 # kill default .y.c rule - to rebuild ntp_parser.c we need bison which is not part of the toolchain
diff -r 9d300d2ee64c -r 55cdbf67a022 external/bsd/ntp/lib/libiscntp/Makefile
--- a/external/bsd/ntp/lib/libiscntp/Makefile   Thu Jan 02 21:37:00 2014 +0000
+++ b/external/bsd/ntp/lib/libiscntp/Makefile   Thu Jan 02 21:38:38 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2013/12/28 03:19:43 christos Exp $
+#      $NetBSD: Makefile,v 1.6 2014/01/02 21:38:38 joerg Exp $
 
 LIBISPRIVATE=yes
 
@@ -43,6 +43,6 @@
         time.c                     \
         sockaddr.c
 
-COPTS.log.c+=  -Wno-format-nonliteral
+COPTS.log.c+=  -Wno-error=format-nonliteral
 
 .include <bsd.lib.mk>
diff -r 9d300d2ee64c -r 55cdbf67a022 external/bsd/ntp/lib/libntp/Makefile
--- a/external/bsd/ntp/lib/libntp/Makefile      Thu Jan 02 21:37:00 2014 +0000
+++ b/external/bsd/ntp/lib/libntp/Makefile      Thu Jan 02 21:38:38 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2013/12/28 03:19:43 christos Exp $
+#      $NetBSD: Makefile,v 1.7 2014/01/02 21:38:38 joerg Exp $
 
 LIBISPRIVATE=yes
 
@@ -75,10 +75,8 @@
 work_thread.c \
 ymd2yd.c
 
-COPTS.msyslog.c+= -Wno-format-nonliteral
-COPTS.prettydate.c=-Wno-format-nonliteral
-COPTS.timetoa.c=-Wno-format-nonliteral
 CPPFLAGS+= -I${IDIST}/sntp/libopts
 
+COPTS.msyslog.c+=      -Wno-error=format-nonliteral
 
 .include <bsd.lib.mk>
diff -r 9d300d2ee64c -r 55cdbf67a022 external/bsd/ntp/lib/libopts/Makefile
--- a/external/bsd/ntp/lib/libopts/Makefile     Thu Jan 02 21:37:00 2014 +0000
+++ b/external/bsd/ntp/lib/libopts/Makefile     Thu Jan 02 21:38:38 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.7 2013/12/29 03:32:00 christos Exp $
+#      $NetBSD: Makefile,v 1.8 2014/01/02 21:38:38 joerg Exp $
 
 LIBISPRIVATE=yes
 
@@ -16,17 +16,9 @@
 
 SRCS=libopts.c
 
-COPTS.libopts.c += -Wno-format-nonliteral -Wno-error -DPOSIX_SHELL="\"/bin/sh\""
-
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 45
-COPTS.libopts.c += -Wno-format-contains-nul
-COPTS.find.c += -Wno-format-contains-nul
-COPTS.makeshell.c += -Wno-format-contains-nul
-COPTS.nested.c += -Wno-format-contains-nul
-COPTS.pgusage.c += -Wno-format-contains-nul
-COPTS.putshell.c += -Wno-format-contains-nul
-COPTS.save.c += -Wno-format-contains-nul
-COPTS.usage.c += -Wno-format-contains-nul
+COPTS.libopts.c += -DPOSIX_SHELL="\"/bin/sh\"" -Wno-format-nonliteral
+.if ${HAVE_GCC:U} >= 45
+COPTS.libopts.c+=      ${${ACTIVE_CC} == "gcc":? -Wno-format-contains-nul :}
 .endif
 
 .include <bsd.lib.mk>