[Midnightbsd-cvs] src [11363] U trunk/usr.bin/less/zless.sh: update less to 530

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri Jul 6 08:47:13 EDT 2018


Revision: 11363
          http://svnweb.midnightbsd.org/src/?rev=11363
Author:   laffer1
Date:     2018-07-06 08:47:12 -0400 (Fri, 06 Jul 2018)
Log Message:
-----------
update less to 530

Modified Paths:
--------------
    trunk/usr.bin/less/Makefile
    trunk/usr.bin/less/Makefile.common
    trunk/usr.bin/less/defines.h
    trunk/usr.bin/less/zless.sh

Property Changed:
----------------
    trunk/usr.bin/less/Makefile.common
    trunk/usr.bin/less/lesspipe.sh
    trunk/usr.bin/less/zless.sh

Modified: trunk/usr.bin/less/Makefile
===================================================================
--- trunk/usr.bin/less/Makefile	2018-07-06 12:46:07 UTC (rev 11362)
+++ trunk/usr.bin/less/Makefile	2018-07-06 12:47:12 UTC (rev 11363)
@@ -1,11 +1,12 @@
-# $FreeBSD: src/usr.bin/less/Makefile,v 1.10 2005/05/17 11:41:01 ru Exp $
-# $MidnightBSD: src/usr.bin/less/Makefile,v 1.4 2012/12/31 08:14:04 laffer1 Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/usr.bin/less/Makefile 207842 2010-05-10 06:59:50Z mm $
 
 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 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
+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 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
 SCRIPTS=lesspipe.sh zless.sh
 SCRIPTSNAME_lesspipe.sh=lesspipe.sh
 DPADD=	${LIBTERMCAP}

Modified: trunk/usr.bin/less/Makefile.common
===================================================================
--- trunk/usr.bin/less/Makefile.common	2018-07-06 12:46:07 UTC (rev 11362)
+++ trunk/usr.bin/less/Makefile.common	2018-07-06 12:47:12 UTC (rev 11363)
@@ -1,10 +1,10 @@
-# $MidnightBSD: src/usr.bin/less/Makefile.common,v 1.2 2007/04/10 22:05:46 laffer1 Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/usr.bin/less/Makefile.common 201386 2010-01-02 10:27:05Z ed $
 
 LSDIR=	${.CURDIR}/../../contrib/less
 .PATH:	${LSDIR}
 
 CFLAGS+=-I${.CURDIR}/../less -I${LSDIR}
-
 WARNS?=	1
 
 .SUFFIXES: .nro .1


Property changes on: trunk/usr.bin/less/Makefile.common
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.bin/less/defines.h
===================================================================
--- trunk/usr.bin/less/defines.h	2018-07-06 12:46:07 UTC (rev 11362)
+++ trunk/usr.bin/less/defines.h	2018-07-06 12:47:12 UTC (rev 11363)
@@ -1,4 +1,5 @@
-/* $MidnightBSD: src/usr.bin/less/defines.h,v 1.3 2008/04/17 23:42:30 laffer1 Exp $ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/usr.bin/less/defines.h 330571 2018-03-07 06:39:00Z delphij $ */
 /* defines.h.  Generated from defines.h.in by configure.  */
 /* defines.h.in.  Generated from configure.ac by autoheader.  */
 
@@ -136,6 +137,11 @@
 #define TGETENT_OK  1
 
 /*
+ * HAVE_ANSI_PROTOS	is 1 if your compiler supports ANSI function prototypes.
+ */
+#define HAVE_ANSI_PROTOS	1
+
+/*
  * HAVE_SYS_TYPES_H is 1 if your system has <sys/types.h>.
  */
 #define HAVE_SYS_TYPES_H 1
@@ -164,7 +170,7 @@
 /*
  * Default shell metacharacters and meta-escape character.
  */
-#define	DEF_METACHARS	"; *?\t\n'\"()<>[]|&^`#\\$%=~"
+#define	DEF_METACHARS	"; *?\t\n'\"()<>[]|&^`#\\$%=~{},"
 #define	DEF_METAESCAPE	"\\"
 
 /* 
@@ -184,6 +190,7 @@
 /*
  * Sizes of various buffers.
  */
+#if 0 /* old sizes for small memory machines */
 #define	CMDBUF_SIZE	512	/* Buffer for multichar commands */
 #define	UNGOT_SIZE	100	/* Max chars to unget() */
 #define	LINEBUF_SIZE	1024	/* Max size of line in input file */
@@ -193,6 +200,17 @@
 #define	TERMSBUF_SIZE	1024	/* Buffer to hold termcap strings */
 #define	TAGLINE_SIZE	512	/* Max size of line in tags file */
 #define	TABSTOP_MAX	32	/* Max number of custom tab stops */
+#else /* more reasonable sizes for modern machines */
+#define	CMDBUF_SIZE	2048	/* Buffer for multichar commands */
+#define	UNGOT_SIZE	200	/* Max chars to unget() */
+#define	LINEBUF_SIZE	1024	/* Initial max size of line in input file */
+#define	OUTBUF_SIZE	1024	/* Output buffer */
+#define	PROMPT_SIZE	2048	/* Max size of prompt string */
+#define	TERMBUF_SIZE	2048	/* Termcap buffer for tgetent */
+#define	TERMSBUF_SIZE	1024	/* Buffer to hold termcap strings */
+#define	TAGLINE_SIZE	1024	/* Max size of line in tags file */
+#define	TABSTOP_MAX	128	/* Max number of custom tab stops */
+#endif
 
 /* Settings automatically determined by configure.  */
 
@@ -227,18 +245,12 @@
 /* Define to 1 if you have the `fsync' function. */
 #define HAVE_FSYNC 1
 
+/* GNU regex library */
+/* #undef HAVE_GNU_REGEX */
+
 /* Define to 1 if you have the <inttypes.h> header file. */
 #define HAVE_INTTYPES_H 1
 
-/* Define to 1 if you have the `gen' library (-lgen). */
-/* #undef HAVE_LIBGEN */
-
-/* Define to 1 if you have the `intl' library (-lintl). */
-/* #undef HAVE_LIBINTL */
-
-/* Define to 1 if you have the `PW' library (-lPW). */
-/* #undef HAVE_LIBPW */
-
 /* Define to 1 if you have the <limits.h> header file. */
 #define HAVE_LIMITS_H 1
 
@@ -412,6 +424,11 @@
 /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
 #define TIME_WITH_SYS_TIME 1
 
+/* Enable large inode numbers on Mac OS X 10.5.  */
+#ifndef _DARWIN_USE_64_BIT_INODE
+# define _DARWIN_USE_64_BIT_INODE 1
+#endif
+
 /* Number of bits in a file offset, on hosts where this is settable. */
 /* #undef _FILE_OFFSET_BITS */
 

Index: trunk/usr.bin/less/lesspipe.sh
===================================================================
--- trunk/usr.bin/less/lesspipe.sh	2018-07-06 12:46:07 UTC (rev 11362)
+++ trunk/usr.bin/less/lesspipe.sh	2018-07-06 12:47:12 UTC (rev 11363)

Property changes on: trunk/usr.bin/less/lesspipe.sh
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.bin/less/zless.sh
===================================================================
--- trunk/usr.bin/less/zless.sh	2018-07-06 12:46:07 UTC (rev 11362)
+++ trunk/usr.bin/less/zless.sh	2018-07-06 12:47:12 UTC (rev 11363)
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $MidnightBSD: src/usr.bin/less/zless.sh,v 1.2 2007/04/10 22:05:46 laffer1 Exp $
+# $MidnightBSD$
 
 export LESSOPEN="||/usr/bin/lesspipe.sh %s"
 exec /usr/bin/less "$@"


Property changes on: trunk/usr.bin/less/zless.sh
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property


More information about the Midnightbsd-cvs mailing list