CVS commit: src/external/bsd/nvi/usr.bin/nvi
Module Name:src
Committed By: rin
Date: Fri Feb 26 02:54:21 UTC 2021
Modified Files:
src/external/bsd/nvi/usr.bin/nvi: Makefile
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 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.24 src/external/bsd/nvi/usr.bin/nvi/Makefile:1.25
--- src/external/bsd/nvi/usr.bin/nvi/Makefile:1.24 Fri Feb 26 00:41:56 2021
+++ src/external/bsd/nvi/usr.bin/nvi/Makefile Fri Feb 26 02:54:21 2021
@@ -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
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 @@ NOTUSED=ip_funcs.c ip_read.c ip_screen.c
ip_run.c ip_send.c ip_trans.c ipc_cmd.c ipc_method.c
# For wide char support
-.if ${USE_BUILTIN_REGEX} == "yes"
-.if ${ACTIVE_CC} == "gcc"
-COPTS.regexec.c+= -Wno-old-style-definition
+.if ${USE_WIDECHAR} == "yes"
+CPPFLAGS+=-DUSE_WIDECHAR
.endif
+.if ${USE_BUILTIN_REGEX} == "yes"
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
CVS commit: src/external/bsd/nvi/usr.bin/nvi
Module Name:src Committed By: christos Date: Fri Feb 26 00:41:56 UTC 2021 Modified Files: src/external/bsd/nvi/usr.bin/nvi: Makefile Log Message: Put back local regex (thanks Rin) To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 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.23 src/external/bsd/nvi/usr.bin/nvi/Makefile:1.24 --- src/external/bsd/nvi/usr.bin/nvi/Makefile:1.23 Thu Feb 25 16:56:35 2021 +++ src/external/bsd/nvi/usr.bin/nvi/Makefile Thu Feb 25 19:41:56 2021 @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.23 2021/02/25 21:56:35 christos Exp $ +# $NetBSD: Makefile,v 1.24 2021/02/26 00:41:56 christos Exp $ .include USE_WIDECHAR?=yes -USE_BUILTIN_REGEX?=no # Our regex supports widechar +USE_BUILTIN_REGEX?=yes # Although our regex supports widechar nvi requires + # a non-standard API WARNS= 5
CVS commit: src/external/bsd/nvi/usr.bin/nvi
Module Name:src
Committed By: christos
Date: Thu Feb 25 21:56:35 UTC 2021
Modified Files:
src/external/bsd/nvi/usr.bin/nvi: Makefile
Log Message:
we don't need the extra copy wide-regex anymore.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 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.22 src/external/bsd/nvi/usr.bin/nvi/Makefile:1.23
--- src/external/bsd/nvi/usr.bin/nvi/Makefile:1.22 Mon Apr 20 09:04:10 2020
+++ src/external/bsd/nvi/usr.bin/nvi/Makefile Thu Feb 25 16:56:35 2021
@@ -1,18 +1,15 @@
-# $NetBSD: Makefile,v 1.22 2020/04/20 13:04:10 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2021/02/25 21:56:35 christos Exp $
.include
USE_WIDECHAR?=yes
+USE_BUILTIN_REGEX?=no # Our regex supports widechar
WARNS= 5
COPTS.exf.c+= -Wno-format-nonliteral
COPTS.msg.c+= -Wno-format-nonliteral
-.if ${USE_WIDECHAR} == "yes"
-.if ${ACTIVE_CC} == "gcc"
-COPTS.regexec.c+= -Wno-old-style-definition
-.endif
-.else
+.if ${USE_WIDECHAR} != "yes"
COPTS.v_increment.c+= -Wno-format-nonliteral
CWARNFLAGS.gcc+= -Wno-unused
CWARNFLAGS.clang+= -Wno-unsequenced
@@ -57,7 +54,10 @@ NOTUSED=ip_funcs.c ip_read.c ip_screen.c
ip_run.c ip_send.c ip_trans.c ipc_cmd.c ipc_method.c
# For wide char support
-.if ${USE_WIDECHAR} == "yes"
+.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
.endif
CVS commit: src/external/bsd/nvi/usr.bin/nvi
Module Name:src
Committed By: martin
Date: Sun Apr 12 17:28:57 UTC 2020
Modified Files:
src/external/bsd/nvi/usr.bin/nvi: Makefile
Log Message:
Remove no longer needed workaround for PR/54656.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 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.20 src/external/bsd/nvi/usr.bin/nvi/Makefile:1.21
--- src/external/bsd/nvi/usr.bin/nvi/Makefile:1.20 Tue Oct 29 21:14:37 2019
+++ src/external/bsd/nvi/usr.bin/nvi/Makefile Sun Apr 12 17:28:57 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2019/10/29 21:14:37 christos Exp $
+# $NetBSD: Makefile,v 1.21 2020/04/12 17:28:57 martin Exp $
.include
@@ -114,10 +114,6 @@ version.h: ../../Makefile.inc
# ${_MKTARGET_CREATE}
# ${TOOL_PERL} -n ${.ALLSRC} > ${.TARGET}
-.if ${MACHINE_ARCH} == "aarch64"
-COPTS.ex_filter.c+=-O0
-.endif
-
.include "${.CURDIR}/../../Makefile.inc"
CVS commit: src/external/bsd/nvi/usr.bin/nvi
Module Name:src
Committed By: rin
Date: Tue Nov 21 02:47:14 UTC 2017
Modified Files:
src/external/bsd/nvi/usr.bin/nvi: Makefile
Log Message:
Bump WARNS to 5. Add -Wno-old-style-definition to regex.c for gcc.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 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.15 src/external/bsd/nvi/usr.bin/nvi/Makefile:1.16
--- src/external/bsd/nvi/usr.bin/nvi/Makefile:1.15 Tue Nov 21 02:45:03 2017
+++ src/external/bsd/nvi/usr.bin/nvi/Makefile Tue Nov 21 02:47:14 2017
@@ -1,14 +1,18 @@
-# $NetBSD: Makefile,v 1.15 2017/11/21 02:45:03 rin Exp $
+# $NetBSD: Makefile,v 1.16 2017/11/21 02:47:14 rin Exp $
.include
USE_WIDECHAR?=yes
-WARNS= 4
+WARNS= 5
COPTS.exf.c+= -Wno-format-nonliteral
COPTS.msg.c+= -Wno-format-nonliteral
-.if ${USE_WIDECHAR} != "yes"
+.if ${USE_WIDECHAR} == "yes"
+.if ${ACTIVE_CC} == "gcc"
+COPTS.regexec.c+= -Wno-old-style-definition
+.endif
+.else
COPTS.v_increment.c+= -Wno-format-nonliteral
CWARNFLAGS.gcc+= -Wno-unused
CWARNFLAGS.clang+= -Wno-unsequenced
CVS commit: src/external/bsd/nvi/usr.bin/nvi
Module Name:src
Committed By: rin
Date: Tue Nov 21 02:45:03 UTC 2017
Modified Files:
src/external/bsd/nvi/usr.bin/nvi: Makefile
Log Message:
Enable -Wuninitialized -Wformat-security for clang.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 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.14 src/external/bsd/nvi/usr.bin/nvi/Makefile:1.15
--- src/external/bsd/nvi/usr.bin/nvi/Makefile:1.14 Tue Nov 21 02:44:13 2017
+++ src/external/bsd/nvi/usr.bin/nvi/Makefile Tue Nov 21 02:45:03 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2017/11/21 02:44:13 rin Exp $
+# $NetBSD: Makefile,v 1.15 2017/11/21 02:45:03 rin Exp $
.include
@@ -8,7 +8,6 @@ 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"
COPTS.v_increment.c+= -Wno-format-nonliteral
CWARNFLAGS.gcc+= -Wno-unused
CVS commit: src/external/bsd/nvi/usr.bin/nvi
Module Name:src
Committed By: rin
Date: Tue Nov 21 02:44:13 UTC 2017
Modified Files:
src/external/bsd/nvi/usr.bin/nvi: Makefile
Log Message:
We always need -Wno-format-nonliteral for v_increment.c whether compiler is
gcc or clang.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 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.13 src/external/bsd/nvi/usr.bin/nvi/Makefile:1.14
--- src/external/bsd/nvi/usr.bin/nvi/Makefile:1.13 Tue Nov 21 02:42:08 2017
+++ src/external/bsd/nvi/usr.bin/nvi/Makefile Tue Nov 21 02:44:13 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2017/11/21 02:42:08 rin Exp $
+# $NetBSD: Makefile,v 1.14 2017/11/21 02:44:13 rin Exp $
.include
@@ -10,11 +10,9 @@ COPTS.exf.c+= -Wno-format-nonliteral
COPTS.msg.c+= -Wno-format-nonliteral
CWARNFLAGS.clang+= -Wno-uninitialized -Wno-format-security
.if ${USE_WIDECHAR} != "yes"
+COPTS.v_increment.c+= -Wno-format-nonliteral
CWARNFLAGS.gcc+= -Wno-unused
CWARNFLAGS.clang+= -Wno-unsequenced
-.ifdef HAVE_GCC
-COPTS.v_increment.c+= -Wno-format-nonliteral
-.endif
.endif
CPPFLAGS+=-I${DIST}/include -I${.CURDIR} -I. -DGTAGS
CVS commit: src/external/bsd/nvi/usr.bin/nvi
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
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
CVS commit: src/external/bsd/nvi/usr.bin/nvi
Module Name:src
Committed By: rin
Date: Mon Nov 13 04:09:42 UTC 2017
Modified Files:
src/external/bsd/nvi/usr.bin/nvi: Makefile
Log Message:
Sorry, remove illegal indents. Real fix for build with USE_WIDECHAR != "yes".
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 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.11 src/external/bsd/nvi/usr.bin/nvi/Makefile:1.12
--- src/external/bsd/nvi/usr.bin/nvi/Makefile:1.11 Mon Nov 13 02:33:13 2017
+++ src/external/bsd/nvi/usr.bin/nvi/Makefile Mon Nov 13 04:09:41 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2017/11/13 02:33:13 rin Exp $
+# $NetBSD: Makefile,v 1.12 2017/11/13 04:09:41 rin Exp $
.include
@@ -8,9 +8,9 @@ CWARNFLAGS.clang+= -Wno-uninitialized -W
.if ${USE_WIDECHAR} != "yes"
CWARNFLAGS.gcc+= -Wno-unused
CWARNFLAGS.clang+= -Wno-unsequenced
- .ifdef HAVE_GCC
+.ifdef HAVE_GCC
COPTS.v_increment.c+= -Wno-format-nonliteral
- .endif
+.endif
.endif
CPPFLAGS+=-I${DIST}/include -I${.CURDIR} -I. -DGTAGS
CVS commit: src/external/bsd/nvi/usr.bin/nvi
Module Name:src
Committed By: rin
Date: Mon Nov 13 02:33:13 UTC 2017
Modified Files:
src/external/bsd/nvi/usr.bin/nvi: Makefile
Log Message:
- Add -Wno-unused and -Wno-unsequenced for gcc and clang, respectively.
This is because encoding conversion macros yield such like:
#define FILE2INT5(sp,buf,n,nlen,w,wlen) (w = n, wlen = nlen, 0)
- Silence gcc warnings on nonliteral arguments for snprintf(3) in v_increment.c,
that are overlooked for swprintf(3) in the case of USE_WIDECHAR == "yes".
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 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.10 src/external/bsd/nvi/usr.bin/nvi/Makefile:1.11
--- src/external/bsd/nvi/usr.bin/nvi/Makefile:1.10 Mon Nov 13 01:51:47 2017
+++ src/external/bsd/nvi/usr.bin/nvi/Makefile Mon Nov 13 02:33:13 2017
@@ -1,10 +1,17 @@
-# $NetBSD: Makefile,v 1.10 2017/11/13 01:51:47 rin Exp $
+# $NetBSD: Makefile,v 1.11 2017/11/13 02:33:13 rin Exp $
.include
USE_WIDECHAR?=yes
CWARNFLAGS.clang+= -Wno-uninitialized -Wno-format-security
+.if ${USE_WIDECHAR} != "yes"
+CWARNFLAGS.gcc+= -Wno-unused
+CWARNFLAGS.clang+= -Wno-unsequenced
+ .ifdef HAVE_GCC
+COPTS.v_increment.c+= -Wno-format-nonliteral
+ .endif
+.endif
CPPFLAGS+=-I${DIST}/include -I${.CURDIR} -I. -DGTAGS
CPPFLAGS+=-DHAVE_OPENPTY -DHAVE_UTIL_H
CVS commit: src/external/bsd/nvi/usr.bin/nvi
Module Name:src
Committed By: rin
Date: Mon Nov 6 03:37:52 UTC 2017
Modified Files:
src/external/bsd/nvi/usr.bin/nvi: Makefile
Log Message:
No need to compile in ip_*.c and ipc_*.c to nvi, although they are
necessary for generation of header files.
Reduce 5% of binary size on amd64.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 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.8 src/external/bsd/nvi/usr.bin/nvi/Makefile:1.9
--- src/external/bsd/nvi/usr.bin/nvi/Makefile:1.8 Mon Nov 6 03:27:34 2017
+++ src/external/bsd/nvi/usr.bin/nvi/Makefile Mon Nov 6 03:37:52 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2017/11/06 03:27:34 rin Exp $
+# $NetBSD: Makefile,v 1.9 2017/11/06 03:37:52 rin Exp $
.include
@@ -34,8 +34,6 @@ SRCS= api.c cl_bsd.c cl_funcs.c cl_main.
ex_shift.c ex_source.c ex_stop.c ex_subst.c ex_tag.c ex_tcl.c \
ex_txt.c ex_undo.c ex_usage.c ex_util.c ex_version.c ex_visual.c \
ex_write.c ex_yank.c ex_z.c exf.c getc.c gs.c \
- ip_funcs.c ip_read.c ip_screen.c ip_term.c \
- ip_run.c ip_send.c ip_trans.c ipc_cmd.c ipc_method.c \
key.c trace.c \
main.c mark.c msg.c nothread.c options.c options_f.c put.c recover.c \
screen.c search.c seq.c util.c v_at.c v_ch.c v_cmd.c v_delete.c \
@@ -46,6 +44,9 @@ SRCS= api.c cl_bsd.c cl_funcs.c cl_main.
v_z.c v_zexit.c vi.c vs_line.c vs_msg.c vs_refresh.c \
vs_relative.c vs_smap.c vs_split.c
+NOTUSED=ip_funcs.c ip_read.c ip_screen.c ip_term.c \
+ ip_run.c ip_send.c ip_trans.c ipc_cmd.c ipc_method.c
+
# For wide char support
.if ${USE_WIDECHAR} == "yes"
SRCS+= regcomp.c regerror.c regexec.c regfree.c
@@ -85,7 +86,7 @@ DPSRCS+=${i}_extern.h
CLEANFILES+=${i}_extern.h
# does not work, DIST isn't set yet here
#_${i}_SRCS != echo ${DIST}/${i}/*.c ${DIST}/${i}/*.xs
-${i}_extern.h: ${SRCS}
+${i}_extern.h: ${SRCS} ${NOTUSED}
${_MKTARGET_CREATE}
@${TOOL_SED} -n "s/^ \* PUBLIC: \(.*\)/\1/p" ${.ALLSRC:M${DIST}/$i/*} > ${.TARGET}.tmp
@if cmp -s ${.TARGET}.tmp ${.TARGET}; then \
CVS commit: src/external/bsd/nvi/usr.bin/nvi
Module Name:src
Committed By: christos
Date: Fri Jan 23 03:04:06 UTC 2015
Modified Files:
src/external/bsd/nvi/usr.bin/nvi: Makefile
Log Message:
add QUEUEDEBUG commented out
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 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.5 src/external/bsd/nvi/usr.bin/nvi/Makefile:1.6
--- src/external/bsd/nvi/usr.bin/nvi/Makefile:1.5 Fri May 23 15:59:17 2014
+++ src/external/bsd/nvi/usr.bin/nvi/Makefile Thu Jan 22 22:04:06 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2014/05/23 19:59:17 dholland Exp $
+# $NetBSD: Makefile,v 1.6 2015/01/23 03:04:06 christos Exp $
.include bsd.own.mk
@@ -10,6 +10,7 @@ CPPFLAGS+=-I${DIST}/include -I${.CURDIR}
#DBG=-g
#CPPFLAGS+=-DLOGDEBUG -DTRACE
#CPPFLAGS+=-DDBDEBUG -DTRACE
+#CPPFLAGS+=-DQUEUEDEBUG
#CWARNFLAGS+=-Wno-parentheses -Wno-unused -Wno-missing-prototypes
#.if defined(HAVE_GCC)
CVS commit: src/external/bsd/nvi/usr.bin/nvi
Module Name:src
Committed By: dholland
Date: Fri May 23 19:59:17 UTC 2014
Modified Files:
src/external/bsd/nvi/usr.bin/nvi: Makefile
Log Message:
PR toolchain/48833: Ilia Zykov: nvi build fails if under /common
When autogenerating headers from source (yuck) use a more selective
pattern to avoid selecting anything if part of the current absolute
path happens to match part of the nvi source tree.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 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.4 src/external/bsd/nvi/usr.bin/nvi/Makefile:1.5
--- src/external/bsd/nvi/usr.bin/nvi/Makefile:1.4 Sat Nov 30 14:52:40 2013
+++ src/external/bsd/nvi/usr.bin/nvi/Makefile Fri May 23 19:59:17 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2013/11/30 14:52:40 christos Exp $
+# $NetBSD: Makefile,v 1.5 2014/05/23 19:59:17 dholland Exp $
.include bsd.own.mk
@@ -79,10 +79,11 @@ ipc_def.h: ipc.awk vipc.awk ipc_cmd.c ip
.for i in cl common ex ip ipc vi
DPSRCS+=${i}_extern.h
CLEANFILES+=${i}_extern.h
-_${i}_SRCS != echo ${DIST}/${i}/*.c ${DIST}/${i}/*.xs
+# does not work, DIST isn't set yet here
+#_${i}_SRCS != echo ${DIST}/${i}/*.c ${DIST}/${i}/*.xs
${i}_extern.h: ${SRCS}
${_MKTARGET_CREATE}
- @${TOOL_SED} -n s/^ \* PUBLIC: \(.*\)/\1/p ${.ALLSRC:M*/$i/*} ${.TARGET}.tmp
+ @${TOOL_SED} -n s/^ \* PUBLIC: \(.*\)/\1/p ${.ALLSRC:M${DIST}/$i/*} ${.TARGET}.tmp
@if cmp -s ${.TARGET}.tmp ${.TARGET}; then \
rm -f ${.TARGET}.tmp; \
else \
CVS commit: src/external/bsd/nvi/usr.bin/nvi
Module Name:src
Committed By: christos
Date: Sat Nov 30 14:52:40 UTC 2013
Modified Files:
src/external/bsd/nvi/usr.bin/nvi: Makefile
Log Message:
Don't rebuild the header files all the time if they did not change
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 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.3 src/external/bsd/nvi/usr.bin/nvi/Makefile:1.4
--- src/external/bsd/nvi/usr.bin/nvi/Makefile:1.3 Fri Nov 29 17:56:19 2013
+++ src/external/bsd/nvi/usr.bin/nvi/Makefile Sat Nov 30 09:52:40 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/11/29 22:56:19 christos Exp $
+# $NetBSD: Makefile,v 1.4 2013/11/30 14:52:40 christos Exp $
.include bsd.own.mk
@@ -82,7 +82,12 @@ CLEANFILES+=${i}_extern.h
_${i}_SRCS != echo ${DIST}/${i}/*.c ${DIST}/${i}/*.xs
${i}_extern.h: ${SRCS}
${_MKTARGET_CREATE}
- ${TOOL_SED} -n s/^ \* PUBLIC: \(.*\)/\1/p ${.ALLSRC:M*/$i/*} ${.TARGET}
+ @${TOOL_SED} -n s/^ \* PUBLIC: \(.*\)/\1/p ${.ALLSRC:M*/$i/*} ${.TARGET}.tmp
+ @if cmp -s ${.TARGET}.tmp ${.TARGET}; then \
+ rm -f ${.TARGET}.tmp; \
+ else \
+ mv -f ${.TARGET}.tmp ${.TARGET}; \
+ fi
.endfor
DPSRCS+=version.h
CVS commit: src/external/bsd/nvi/usr.bin/nvi
Module Name:src
Committed By: christos
Date: Fri Nov 29 16:37:36 UTC 2013
Modified Files:
src/external/bsd/nvi/usr.bin/nvi: Makefile
Log Message:
fix tracing.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 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.1 src/external/bsd/nvi/usr.bin/nvi/Makefile:1.2
--- src/external/bsd/nvi/usr.bin/nvi/Makefile:1.1 Fri Nov 22 11:00:45 2013
+++ src/external/bsd/nvi/usr.bin/nvi/Makefile Fri Nov 29 11:37:35 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/11/22 16:00:45 christos Exp $
+# $NetBSD: Makefile,v 1.2 2013/11/29 16:37:35 christos Exp $
.include bsd.own.mk
@@ -8,6 +8,7 @@ CWARNFLAGS.clang+= -Wno-uninitialized -W
CPPFLAGS+=-I${DIST}/include -I${.CURDIR} -I. -DGTAGS -DUSE_BUNDLED_DB
#DBG=-g
+#CPPFLAGS+=-DLOGDEBUG -DTRACE
#CWARNFLAGS+=-Wno-parentheses -Wno-unused -Wno-missing-prototypes
#.if defined(HAVE_GCC)
@@ -30,7 +31,7 @@ SRCS= api.c cl_bsd.c cl_funcs.c cl_main.
ex_write.c ex_yank.c ex_z.c exf.c getc.c gs.c \
ip_funcs.c ip_read.c ip_screen.c ip_term.c \
ip_run.c ip_send.c ip_trans.c ipc_cmd.c ipc_method.c \
- key.c log1.c \
+ key.c log1.c trace.c \
main.c mark.c msg.c nothread.c options.c options_f.c put.c recover.c \
screen.c search.c seq.c util.c v_at.c v_ch.c v_cmd.c v_delete.c \
v_event.c v_ex.c v_increment.c v_init.c v_itxt.c v_left.c v_mark.c \
CVS commit: src/external/bsd/nvi/usr.bin/nvi
Module Name:src Committed By: christos Date: Mon Nov 25 23:04:40 UTC 2013 Modified Files: src/external/bsd/nvi/usr.bin/nvi: config.h Log Message: fix SSP build To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/bsd/nvi/usr.bin/nvi/config.h 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/config.h diff -u src/external/bsd/nvi/usr.bin/nvi/config.h:1.1 src/external/bsd/nvi/usr.bin/nvi/config.h:1.2 --- src/external/bsd/nvi/usr.bin/nvi/config.h:1.1 Fri Nov 22 11:00:45 2013 +++ src/external/bsd/nvi/usr.bin/nvi/config.h Mon Nov 25 18:04:39 2013 @@ -79,6 +79,9 @@ /* Define to 1 if you have the `memchr' function. */ #define HAVE_MEMCHR 1 +/* Define to 1 if you have the `memcpy' function. */ +#define HAVE_MEMCPY 1 + /* Define to 1 if you have the memory.h header file. */ #define HAVE_MEMORY_H 1
