[src/trunk]: src/external/bsd/nvi/usr.bin/nvi Misc cleanups:

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

details:   https://anonhg.NetBSD.org/src/rev/7f1d15efe9b0
branches:  trunk
changeset: 981038:7f1d15efe9b0
user:      rin <rin%NetBSD.org@localhost>
date:      Fri Feb 26 02:54:21 2021 +0000

description:
Misc cleanups:

- built-in regex is required only when ${USE_WIDECHAR} == "yes"

- -DUSE_WIDECHAR cpp flag should be determined by ${USE_WIDECHAR},
  not ${USE_BUILTIN_REGEX}

- reduce .if -- .endif block for clarity

diffstat:

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

diffs (38 lines):

diff -r c3812c008a08 -r 7f1d15efe9b0 external/bsd/nvi/usr.bin/nvi/Makefile
--- a/external/bsd/nvi/usr.bin/nvi/Makefile     Fri Feb 26 02:45:43 2021 +0000
+++ b/external/bsd/nvi/usr.bin/nvi/Makefile     Fri Feb 26 02:54:21 2021 +0000
@@ -1,10 +1,15 @@
-#      $NetBSD: Makefile,v 1.24 2021/02/26 00:41:56 christos Exp $
+#      $NetBSD: Makefile,v 1.25 2021/02/26 02:54:21 rin Exp $
 
 .include <bsd.own.mk>
 
 USE_WIDECHAR?=yes
+
+.if ${USE_WIDECHAR} == "yes"
 USE_BUILTIN_REGEX?=yes # Although our regex supports widechar nvi requires
                        # a non-standard API
+.else
+USE_BUILTIN_REGEX?=no
+.endif
 
 WARNS= 5
 
@@ -55,12 +60,13 @@
        ip_run.c ip_send.c ip_trans.c ipc_cmd.c ipc_method.c
 
 # For wide char support
+.if ${USE_WIDECHAR} == "yes"
+CPPFLAGS+=-DUSE_WIDECHAR
+.endif
 .if ${USE_BUILTIN_REGEX} == "yes"
-.if ${ACTIVE_CC} == "gcc"
-COPTS.regexec.c+=      -Wno-old-style-definition
-.endif
 SRCS+= regcomp.c regerror.c regexec.c regfree.c
-CPPFLAGS+=-I${DIST}/regex -D__REGEX_PRIVATE -DUSE_WIDECHAR
+CPPFLAGS+=-I${DIST}/regex -D__REGEX_PRIVATE
+COPTS.regexec.c+= ${${ACTIVE_CC} == "gcc":? -Wno-old-style-definition :}
 .endif
 
 # For db3 db1 emulation