Module Name: src
Committed By: rin
Date: Tue Nov 21 02:42:08 UTC 2017
Modified Files:
src/external/bsd/nvi/usr.bin/nvi: Makefile
Log Message:
Cosmetic changes. No functional changes.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/nvi/usr.bin/nvi/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/nvi/usr.bin/nvi/Makefile
diff -u src/external/bsd/nvi/usr.bin/nvi/Makefile:1.12 src/external/bsd/nvi/usr.bin/nvi/Makefile:1.13
--- src/external/bsd/nvi/usr.bin/nvi/Makefile:1.12 Mon Nov 13 04:09:41 2017
+++ src/external/bsd/nvi/usr.bin/nvi/Makefile Tue Nov 21 02:42:08 2017
@@ -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+=-DHAVE_MVWCHGAT
#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 @@ version.h: ../../Makefile.inc
.include "${.CURDIR}/../../Makefile.inc"
-WARNS= 4
-
.PATH: ${DIST}/vi ${DIST}/ex ${DIST}/cl
.PATH: ${DIST}/common
.PATH: ${DIST}/ipc
@@ -126,7 +122,4 @@ WARNS= 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>
