[src/trunk]: src/external/bsd/nvi/usr.bin/nvi Cosmetic changes. No functional...

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

details:   https://anonhg.NetBSD.org/src/rev/5bbe892bb437
branches:  trunk
changeset: 357665:5bbe892bb437
user:      rin <rin%NetBSD.org@localhost>
date:      Tue Nov 21 02:42:08 2017 +0000

description:
Cosmetic changes. No functional changes.

diffstat:

 external/bsd/nvi/usr.bin/nvi/Makefile |  17 +++++------------
 1 files changed, 5 insertions(+), 12 deletions(-)

diffs (48 lines):

diff -r cbd18ae304ef -r 5bbe892bb437 external/bsd/nvi/usr.bin/nvi/Makefile
--- a/external/bsd/nvi/usr.bin/nvi/Makefile     Tue Nov 21 02:36:45 2017 +0000
+++ b/external/bsd/nvi/usr.bin/nvi/Makefile     Tue Nov 21 02:42:08 2017 +0000
@@ -1,9 +1,13 @@
-#      $NetBSD: Makefile,v 1.12 2017/11/13 04:09:41 rin Exp $
+#      $NetBSD: Makefile,v 1.13 2017/11/21 02:42:08 rin Exp $
 
 .include <bsd.own.mk>
 
 USE_WIDECHAR?=yes
 
+WARNS= 4
+
+COPTS.exf.c+=          -Wno-format-nonliteral
+COPTS.msg.c+=          -Wno-format-nonliteral
 CWARNFLAGS.clang+=     -Wno-uninitialized -Wno-format-security
 .if ${USE_WIDECHAR} != "yes"
 CWARNFLAGS.gcc+=       -Wno-unused
@@ -23,12 +27,6 @@
 #CPPFLAGS+=-DDBDEBUG -DTRACE
 #CPPFLAGS+=-DQUEUEDEBUG
 
-#CWARNFLAGS+=-Wno-parentheses -Wno-unused -Wno-missing-prototypes
-#.if defined(HAVE_GCC)
-#CWARNFLAGS+=-Wno-pointer-sign
-#COPTS+=-fno-strict-aliasing
-#.endif
-
 LDADD+=        -lcurses -lterminfo -lutil
 DPADD+=        ${LIBCURSES} ${LIBTERMINFO} ${LIBUTIL}
 PROG=  vi
@@ -117,8 +115,6 @@
 
 .include "${.CURDIR}/../../Makefile.inc"
 
-WARNS= 4
-
 .PATH: ${DIST}/vi ${DIST}/ex ${DIST}/cl
 .PATH: ${DIST}/common
 .PATH: ${DIST}/ipc
@@ -126,7 +122,4 @@
 .PATH: ${DIST}/regex
 .PATH: ${DIST}/docs/vi.man
 
-COPTS.exf.c += -Wno-format-nonliteral
-COPTS.msg.c += -Wno-format-nonliteral
-
 .include <bsd.prog.mk>