From 10941c4b8a03b8b4cca8ffbbf95e89c96b026649 Mon Sep 17 00:00:00 2001 From: Peter Avalos Date: Sat, 30 Apr 2011 12:13:13 -1000 Subject: [PATCH] Update files for less-443 import. --- contrib/less/README.DRAGONFLY | 3 --- usr.bin/less/Makefile | 2 ++ usr.bin/less/Makefile.common | 1 - usr.bin/less/defines.h | 7 ++++++- usr.bin/lessecho/Makefile | 2 ++ usr.bin/lesskey/Makefile | 1 + 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/contrib/less/README.DRAGONFLY b/contrib/less/README.DRAGONFLY index f1cf4c5506..905e53b09c 100644 --- a/contrib/less/README.DRAGONFLY +++ b/contrib/less/README.DRAGONFLY @@ -5,9 +5,6 @@ A list of deleted files is in README.DELETED. When upgrading, remember to update usr.bin/less/defines.h. -cvs import hint: -cvs import src/contrib/less-4 LESS v4?? - This source is used in: usr.bin/less usr.bin/lessecho diff --git a/usr.bin/less/Makefile b/usr.bin/less/Makefile index ef7b83c84e..417bd85277 100644 --- a/usr.bin/less/Makefile +++ b/usr.bin/less/Makefile @@ -19,5 +19,7 @@ LINKS= ${BINDIR}/less ${BINDIR}/more MLINKS= less.1 more.1 CLEANFILES= less.1 +WARNS?= 0 + .include .include diff --git a/usr.bin/less/Makefile.common b/usr.bin/less/Makefile.common index 9d339a8d5a..16b86d2186 100644 --- a/usr.bin/less/Makefile.common +++ b/usr.bin/less/Makefile.common @@ -5,7 +5,6 @@ LSDIR= ${.CURDIR}/../../contrib/less .PATH: ${LSDIR} CFLAGS+=-I${.CURDIR}/../less -I${LSDIR} -WARNS?= 1 .SUFFIXES: .nro .1 diff --git a/usr.bin/less/defines.h b/usr.bin/less/defines.h index f6eaff501a..b59a1e1315 100644 --- a/usr.bin/less/defines.h +++ b/usr.bin/less/defines.h @@ -1,4 +1,3 @@ -/* $DragonFly: src/usr.bin/less/defines.h,v 1.6 2007/11/16 22:32:32 pavalos Exp $ */ /* defines.h. Generated from defines.h.in by configure. */ /* defines.h.in. Generated from configure.ac by autoheader. */ @@ -221,6 +220,9 @@ /* Define HAVE_FILENO if you have the fileno() macro. */ #define HAVE_FILENO 1 +/* Define HAVE_FLOAT if your compiler supports the "double" type. */ +#define HAVE_FLOAT 1 + /* Define to 1 if you have the `fsync' function. */ #define HAVE_FSYNC 1 @@ -388,6 +390,9 @@ /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "less" +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + /* Define to the version of this package. */ #define PACKAGE_VERSION "1" diff --git a/usr.bin/lessecho/Makefile b/usr.bin/lessecho/Makefile index 2ad4136908..3b034c6d90 100644 --- a/usr.bin/lessecho/Makefile +++ b/usr.bin/lessecho/Makefile @@ -5,5 +5,7 @@ PROG= lessecho SRCS= lessecho.c version.c NOMAN= +WARNS?= 2 + .include "${.CURDIR}/../less/Makefile.common" .include diff --git a/usr.bin/lesskey/Makefile b/usr.bin/lesskey/Makefile index cf7d13c48e..7979a3f48a 100644 --- a/usr.bin/lesskey/Makefile +++ b/usr.bin/lesskey/Makefile @@ -4,6 +4,7 @@ PROG= lesskey SRCS= lesskey.c version.c CLEANFILES= lesskey.1 +WARNS?= 2 .include "${.CURDIR}/../less/Makefile.common" .include -- 2.41.0