Module Name: src
Committed By: simonb
Date: Fri Oct 6 05:57:16 UTC 2023
Modified Files:
src/external/bsd/less: Makefile.inc
src/external/bsd/less/bin: Makefile.inc
src/external/bsd/less/bin/less: Makefile
src/external/bsd/less/bin/lesskey: Makefile
Log Message:
Handle new /include/ dir for defines.h, add extra .c files for less, lesskey.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/less/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/less/bin/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/less/bin/less/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/less/bin/lesskey/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/less/Makefile.inc
diff -u src/external/bsd/less/Makefile.inc:1.1 src/external/bsd/less/Makefile.inc:1.2
--- src/external/bsd/less/Makefile.inc:1.1 Sun Jul 3 18:02:00 2011
+++ src/external/bsd/less/Makefile.inc Fri Oct 6 05:57:16 2023
@@ -1,4 +1,5 @@
-# $NetBSD: Makefile.inc,v 1.1 2011/07/03 18:02:00 tron Exp $
+# $NetBSD: Makefile.inc,v 1.2 2023/10/06 05:57:16 simonb Exp $
-LESS_DISTDIR= ${NETBSDSRCDIR}/external/bsd/less/dist
+LESS_SRCDIR= ${NETBSDSRCDIR}/external/bsd/less
+LESS_DISTDIR= ${LESS_SRCDIR}/dist
.PATH: ${LESS_DISTDIR}
Index: src/external/bsd/less/bin/Makefile.inc
diff -u src/external/bsd/less/bin/Makefile.inc:1.1 src/external/bsd/less/bin/Makefile.inc:1.2
--- src/external/bsd/less/bin/Makefile.inc:1.1 Sun Jul 3 18:02:01 2011
+++ src/external/bsd/less/bin/Makefile.inc Fri Oct 6 05:57:16 2023
@@ -1,7 +1,10 @@
-# $NetBSD: Makefile.inc,v 1.1 2011/07/03 18:02:01 tron Exp $
+# $NetBSD: Makefile.inc,v 1.2 2023/10/06 05:57:16 simonb Exp $
.include "../Makefile.inc"
BINDIR= /usr/bin
-CPPFLAGS+= -I${LESS_DISTDIR} -DBINDIR=\"${BINDIR}\" -DSYSDIR=\"/etc\"
+CPPFLAGS+= -I${LESS_DISTDIR} \
+ -I${LESS_SRCDIR}/include \
+ -DBINDIR=\"${BINDIR}\" \
+ -DSYSDIR=\"/etc\"
Index: src/external/bsd/less/bin/less/Makefile
diff -u src/external/bsd/less/bin/less/Makefile:1.3 src/external/bsd/less/bin/less/Makefile:1.4
--- src/external/bsd/less/bin/less/Makefile:1.3 Sat Dec 10 13:44:51 2016
+++ src/external/bsd/less/bin/less/Makefile Fri Oct 6 05:57:16 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/12/10 13:44:51 rin Exp $
+# $NetBSD: Makefile,v 1.4 2023/10/06 05:57:16 simonb Exp $
.include <bsd.own.mk>
@@ -6,10 +6,10 @@ PROG= less
SRCS= main.c screen.c brac.c ch.c charset.c cmdbuf.c \
command.c cvt.c decode.c edit.c filename.c forwback.c \
- help.c ifile.c input.c jump.c line.c linenum.c \
+ help.c ifile.c input.c jump.c lesskey_parse.c line.c linenum.c \
lsystem.c mark.c optfunc.c option.c opttbl.c os.c \
output.c pattern.c position.c prompt.c search.c signal.c \
- tags.c ttyin.c version.c
+ tags.c ttyin.c version.c xbuf.c
LDADD+= -lterminfo
DPADD+= ${LIBTERMINFO}
Index: src/external/bsd/less/bin/lesskey/Makefile
diff -u src/external/bsd/less/bin/lesskey/Makefile:1.2 src/external/bsd/less/bin/lesskey/Makefile:1.3
--- src/external/bsd/less/bin/lesskey/Makefile:1.2 Sat Dec 10 13:44:51 2016
+++ src/external/bsd/less/bin/lesskey/Makefile Fri Oct 6 05:57:16 2023
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2016/12/10 13:44:51 rin Exp $
+# $NetBSD: Makefile,v 1.3 2023/10/06 05:57:16 simonb Exp $
.include <bsd.own.mk>
PROG= lesskey
-SRCS= lesskey version.c
+SRCS= lesskey.c lesskey_parse.c version.c xbuf.c
.include "bsd.prog.mk"
