more -> less; not less -> more

24 files changed, 44 insertions, 492 deletions

diff --git a/distrib/alpha/common/list b/distrib/alpha/common/list
index 7f2df0ab9b0..d1e168d4616 100644
--- a/distrib/alpha/common/list
+++ b/distrib/alpha/common/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.43 2015/03/11 15:27:31 deraadt Exp $
+#	$OpenBSD: list,v 1.44 2015/04/02 16:13:20 deraadt Exp $
 
 SRCDIRS distrib/special
 
@@ -44,7 +44,7 @@ LINK	instbin					usr/bin/encrypt
 LINK	instbin					usr/bin/ftp
 LINK	instbin					usr/bin/grep usr/bin/egrep usr/bin/fgrep
 LINK	instbin					usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
-LINK	instbin					usr/bin/less usr/bin/more
+LINK	instbin					usr/bin/more usr/bin/less
 LINK	instbin					usr/bin/sed
 LINK	instbin					usr/bin/signify
 LINK	instbin					usr/sbin/chroot
diff --git a/distrib/amd64/common/list b/distrib/amd64/common/list
index fa701590c55..a804219a873 100644
--- a/distrib/amd64/common/list
+++ b/distrib/amd64/common/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.37 2015/03/11 15:27:31 deraadt Exp $
+#	$OpenBSD: list,v 1.38 2015/04/02 16:13:24 deraadt Exp $
 
 SRCDIRS distrib/special
 
@@ -50,7 +50,7 @@ LINK	instbin					usr/bin/encrypt
 LINK	instbin					usr/bin/ftp
 LINK	instbin					usr/bin/grep usr/bin/egrep usr/bin/fgrep
 LINK	instbin					usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
-LINK	instbin					usr/bin/less usr/bin/more
+LINK	instbin					usr/bin/more usr/bin/less
 LINK	instbin					usr/bin/sed
 LINK	instbin					usr/bin/signify
 LINK	instbin					usr/sbin/chroot
diff --git a/distrib/armish/ramdisk/list b/distrib/armish/ramdisk/list
index 1476857c55b..aafd19ff383 100644
--- a/distrib/armish/ramdisk/list
+++ b/distrib/armish/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.28 2015/03/11 15:27:31 deraadt Exp $
+#	$OpenBSD: list,v 1.29 2015/04/02 16:13:24 deraadt Exp $
 
 SRCDIRS distrib/special
 
@@ -56,7 +56,7 @@ LINK	instbin					usr/bin/encrypt
 LINK	instbin					usr/bin/ftp
 LINK	instbin					usr/bin/grep usr/bin/egrep usr/bin/fgrep
 LINK	instbin					usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
-LINK	instbin					usr/bin/less usr/bin/more
+LINK	instbin					usr/bin/more usr/bin/less
 LINK	instbin					usr/bin/sed
 LINK	instbin					usr/bin/signify
 LINK	instbin					usr/sbin/chroot
diff --git a/distrib/armv7/ramdisk/list b/distrib/armv7/ramdisk/list
index 727ceafd733..869a1a64f86 100644
--- a/distrib/armv7/ramdisk/list
+++ b/distrib/armv7/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.15 2015/03/11 15:27:31 deraadt Exp $
+#	$OpenBSD: list,v 1.16 2015/04/02 16:13:24 deraadt Exp $
 
 SRCDIRS distrib/special
 
@@ -57,7 +57,7 @@ LINK	instbin					usr/bin/encrypt
 LINK	instbin					usr/bin/ftp
 LINK	instbin					usr/bin/grep usr/bin/egrep usr/bin/fgrep
 LINK	instbin					usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
-LINK	instbin					usr/bin/less usr/bin/more
+LINK	instbin					usr/bin/more usr/bin/less
 LINK	instbin					usr/bin/sed
 LINK	instbin					usr/bin/signify
 LINK	instbin					usr/sbin/chroot
diff --git a/distrib/aviion/ramdisk/list b/distrib/aviion/ramdisk/list
index e63e9695bbe..6370c1066c6 100644
--- a/distrib/aviion/ramdisk/list
+++ b/distrib/aviion/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.14 2015/03/11 15:27:32 deraadt Exp $
+#	$OpenBSD: list,v 1.15 2015/04/02 16:13:24 deraadt Exp $
 
 SRCDIRS distrib/special
 
@@ -50,7 +50,7 @@ LINK	instbin					usr/bin/encrypt
 LINK	instbin					usr/bin/ftp
 LINK	instbin					usr/bin/grep usr/bin/egrep usr/bin/fgrep
 LINK	instbin					usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
-LINK	instbin					usr/bin/less usr/bin/more
+LINK	instbin					usr/bin/more usr/bin/less
 LINK	instbin					usr/bin/sed
 LINK	instbin					usr/bin/signify
 LINK	instbin					usr/sbin/chroot
diff --git a/distrib/hppa/list b/distrib/hppa/list
index 055d6ef39da..45ba22f9085 100644
--- a/distrib/hppa/list
+++ b/distrib/hppa/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.33 2015/03/11 15:27:32 deraadt Exp $
+#	$OpenBSD: list,v 1.34 2015/04/02 16:13:24 deraadt Exp $
 
 SRCDIRS distrib/special
 
@@ -50,7 +50,7 @@ LINK	instbin					usr/bin/encrypt
 LINK	instbin					usr/bin/ftp
 LINK	instbin					usr/bin/grep usr/bin/egrep usr/bin/fgrep
 LINK	instbin					usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
-LINK	instbin					usr/bin/less usr/bin/more
+LINK	instbin					usr/bin/more usr/bin/less
 LINK	instbin					usr/bin/sed
 LINK	instbin					usr/bin/signify
 LINK	instbin					usr/sbin/chroot
diff --git a/distrib/i386/common/list b/distrib/i386/common/list
index 6198b4c4420..2fcc75f2363 100644
--- a/distrib/i386/common/list
+++ b/distrib/i386/common/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.40 2015/03/11 15:27:32 deraadt Exp $
+#	$OpenBSD: list,v 1.41 2015/04/02 16:13:24 deraadt Exp $
 
 SRCDIRS distrib/special
 
@@ -50,7 +50,7 @@ LINK	instbin					usr/bin/encrypt
 LINK	instbin					usr/bin/ftp
 LINK	instbin					usr/bin/grep usr/bin/egrep usr/bin/fgrep
 LINK	instbin					usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
-LINK	instbin					usr/bin/less usr/bin/more
+LINK	instbin					usr/bin/more usr/bin/less
 LINK	instbin					usr/bin/sed
 LINK	instbin					usr/bin/signify
 LINK	instbin					usr/sbin/chroot
diff --git a/distrib/landisk/ramdisk/list b/distrib/landisk/ramdisk/list
index 7256e50990e..2785b7f86b7 100644
--- a/distrib/landisk/ramdisk/list
+++ b/distrib/landisk/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.36 2015/03/11 15:27:32 deraadt Exp $
+#	$OpenBSD: list,v 1.37 2015/04/02 16:13:24 deraadt Exp $
 
 SRCDIRS distrib/special
 
@@ -55,7 +55,7 @@ LINK	instbin					usr/bin/encrypt
 LINK	instbin					usr/bin/ftp
 LINK	instbin					usr/bin/grep usr/bin/egrep usr/bin/fgrep
 LINK	instbin					usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
-LINK	instbin					usr/bin/less usr/bin/more
+LINK	instbin					usr/bin/more usr/bin/less
 LINK	instbin					usr/bin/sed
 LINK	instbin					usr/bin/signify
 LINK	instbin					usr/sbin/chroot
diff --git a/distrib/loongson/ramdisk/list b/distrib/loongson/ramdisk/list
index 36d8d091d7f..1a617d99543 100644
--- a/distrib/loongson/ramdisk/list
+++ b/distrib/loongson/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.22 2015/03/11 15:27:32 deraadt Exp $
+#	$OpenBSD: list,v 1.23 2015/04/02 16:13:24 deraadt Exp $
 
 SRCDIRS distrib/special
 
@@ -57,7 +57,7 @@ LINK	instbin					usr/bin/encrypt
 LINK	instbin					usr/bin/ftp
 LINK	instbin					usr/bin/grep usr/bin/egrep usr/bin/fgrep
 LINK	instbin					usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
-LINK	instbin					usr/bin/less usr/bin/more
+LINK	instbin					usr/bin/more usr/bin/less
 LINK	instbin					usr/bin/sed
 LINK	instbin					usr/bin/signify
 LINK	instbin					usr/sbin/chroot
diff --git a/distrib/luna88k/ramdisk/list b/distrib/luna88k/ramdisk/list
index c527a55213e..2fed67fa2fd 100644
--- a/distrib/luna88k/ramdisk/list
+++ b/distrib/luna88k/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.30 2015/03/11 15:27:32 deraadt Exp $
+#	$OpenBSD: list,v 1.31 2015/04/02 16:13:24 deraadt Exp $
 
 SRCDIRS distrib/special
 
@@ -50,7 +50,7 @@ LINK	instbin					usr/bin/encrypt
 LINK	instbin					usr/bin/ftp
 LINK	instbin					usr/bin/grep usr/bin/egrep usr/bin/fgrep
 LINK	instbin					usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
-LINK	instbin					usr/bin/less usr/bin/more
+LINK	instbin					usr/bin/more usr/bin/less
 LINK	instbin					usr/bin/sed
 LINK	instbin					usr/bin/signify
 LINK	instbin					usr/sbin/chroot
diff --git a/distrib/macppc/ramdisk/list b/distrib/macppc/ramdisk/list
index 537ce3059b8..be0002657e8 100644
--- a/distrib/macppc/ramdisk/list
+++ b/distrib/macppc/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.58 2015/03/11 15:27:32 deraadt Exp $
+#	$OpenBSD: list,v 1.59 2015/04/02 16:13:25 deraadt Exp $
 
 SRCDIRS distrib/special
 
@@ -56,7 +56,7 @@ LINK	instbin					usr/bin/encrypt
 LINK	instbin					usr/bin/ftp
 LINK	instbin					usr/bin/grep usr/bin/egrep usr/bin/fgrep
 LINK	instbin					usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
-LINK	instbin					usr/bin/less usr/bin/more
+LINK	instbin					usr/bin/more usr/bin/less
 LINK	instbin					usr/bin/sed
 LINK	instbin					usr/bin/signify
 LINK	instbin					usr/sbin/chroot
diff --git a/distrib/miniroot/list b/distrib/miniroot/list
index a7944ef265a..9e3e9adfac7 100644
--- a/distrib/miniroot/list
+++ b/distrib/miniroot/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.63 2015/03/11 15:27:32 deraadt Exp $
+#	$OpenBSD: list,v 1.64 2015/04/02 16:13:25 deraadt Exp $
 
 SRCDIRS distrib/special
 
@@ -50,7 +50,7 @@ LINK	instbin					usr/bin/encrypt
 LINK	instbin					usr/bin/ftp
 LINK	instbin					usr/bin/grep usr/bin/egrep usr/bin/fgrep
 LINK	instbin					usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
-LINK	instbin					usr/bin/less usr/bin/more
+LINK	instbin					usr/bin/more usr/bin/less
 LINK	instbin					usr/bin/sed
 LINK	instbin					usr/bin/signify
 LINK	instbin					usr/sbin/chroot
diff --git a/distrib/octeon/ramdisk/list b/distrib/octeon/ramdisk/list
index 00d87bb0721..8768aa3d0ff 100644
--- a/distrib/octeon/ramdisk/list
+++ b/distrib/octeon/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.14 2015/03/11 15:27:32 deraadt Exp $
+#	$OpenBSD: list,v 1.15 2015/04/02 16:13:25 deraadt Exp $
 
 SRCDIRS distrib/special
 
@@ -54,7 +54,7 @@ LINK	instbin					usr/bin/encrypt
 LINK	instbin					usr/bin/ftp
 LINK	instbin					usr/bin/grep usr/bin/egrep usr/bin/fgrep
 LINK	instbin					usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
-LINK	instbin					usr/bin/less usr/bin/more
+LINK	instbin					usr/bin/more usr/bin/less
 LINK	instbin					usr/bin/sed
 LINK	instbin					usr/bin/signify
 LINK	instbin					usr/sbin/chroot
diff --git a/distrib/ramdisk/list b/distrib/ramdisk/list
index a57231c9edd..58f5dca6232 100644
--- a/distrib/ramdisk/list
+++ b/distrib/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.53 2015/03/11 15:27:32 deraadt Exp $
+#	$OpenBSD: list,v 1.54 2015/04/02 16:13:25 deraadt Exp $
 
 SRCDIRS distrib/special
 
@@ -50,7 +50,7 @@ LINK	instbin					usr/bin/encrypt
 LINK	instbin					usr/bin/ftp
 LINK	instbin					usr/bin/grep usr/bin/egrep usr/bin/fgrep
 LINK	instbin					usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
-LINK	instbin					usr/bin/less usr/bin/more
+LINK	instbin					usr/bin/more usr/bin/less
 LINK	instbin					usr/bin/sed
 LINK	instbin					usr/bin/signify
 LINK	instbin					usr/sbin/chroot
diff --git a/distrib/sgi/ramdisk/list b/distrib/sgi/ramdisk/list
index d6300a7a5f1..fbf97f5586d 100644
--- a/distrib/sgi/ramdisk/list
+++ b/distrib/sgi/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.47 2015/03/11 15:27:32 deraadt Exp $
+#	$OpenBSD: list,v 1.48 2015/04/02 16:13:25 deraadt Exp $
 
 SRCDIRS distrib/special
 
@@ -52,7 +52,7 @@ LINK	instbin					usr/bin/encrypt
 LINK	instbin					usr/bin/ftp
 LINK	instbin					usr/bin/grep usr/bin/egrep usr/bin/fgrep
 LINK	instbin					usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
-LINK	instbin					usr/bin/less usr/bin/more
+LINK	instbin					usr/bin/more usr/bin/less
 LINK	instbin					usr/bin/sed
 LINK	instbin					usr/bin/signify
 LINK	instbin					usr/sbin/chroot
diff --git a/distrib/socppc/ramdisk/list b/distrib/socppc/ramdisk/list
index da1f071db56..cafdfdd3e2a 100644
--- a/distrib/socppc/ramdisk/list
+++ b/distrib/socppc/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.28 2015/03/11 15:27:32 deraadt Exp $
+#	$OpenBSD: list,v 1.29 2015/04/02 16:13:25 deraadt Exp $
 
 SRCDIRS distrib/special
 
@@ -54,7 +54,7 @@ LINK	instbin					usr/bin/encrypt
 LINK	instbin					usr/bin/ftp
 LINK	instbin					usr/bin/grep usr/bin/egrep usr/bin/fgrep
 LINK	instbin					usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
-LINK	instbin					usr/bin/less usr/bin/more
+LINK	instbin					usr/bin/more usr/bin/less
 LINK	instbin					usr/bin/sed
 LINK	instbin					usr/bin/signify
 LINK	instbin					usr/sbin/chroot
diff --git a/distrib/sparc64/bsd.rd/list b/distrib/sparc64/bsd.rd/list
index 1adbacd3885..b681d3f25e4 100644
--- a/distrib/sparc64/bsd.rd/list
+++ b/distrib/sparc64/bsd.rd/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.54 2015/03/11 15:27:32 deraadt Exp $
+#	$OpenBSD: list,v 1.55 2015/04/02 16:13:25 deraadt Exp $
 
 SRCDIRS distrib/special
 
@@ -53,7 +53,7 @@ LINK	instbin					usr/bin/encrypt
 LINK	instbin					usr/bin/ftp
 LINK	instbin					usr/bin/grep usr/bin/egrep usr/bin/fgrep
 LINK	instbin					usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
-LINK	instbin					usr/bin/less usr/bin/more
+LINK	instbin					usr/bin/more usr/bin/less
 LINK	instbin					usr/bin/sed
 LINK	instbin					usr/bin/signify
 LINK	instbin					usr/sbin/chroot
diff --git a/distrib/sparc64/ramdisk/list b/distrib/sparc64/ramdisk/list
index 255b27e63b8..8e85928018a 100644
--- a/distrib/sparc64/ramdisk/list
+++ b/distrib/sparc64/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.50 2015/03/11 15:27:32 deraadt Exp $
+#	$OpenBSD: list,v 1.51 2015/04/02 16:13:25 deraadt Exp $
 
 SRCDIRS distrib/special
 
@@ -48,7 +48,7 @@ LINK	instbin					usr/bin/encrypt
 LINK	instbin					usr/bin/ftp
 LINK	instbin					usr/bin/grep usr/bin/egrep usr/bin/fgrep
 LINK	instbin					usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
-LINK	instbin					usr/bin/less usr/bin/more
+LINK	instbin					usr/bin/more usr/bin/less
 LINK	instbin					usr/bin/sed
 LINK	instbin					usr/bin/signify
 LINK	instbin					usr/sbin/chroot
diff --git a/distrib/sparc64/ramdiskB/list b/distrib/sparc64/ramdiskB/list
index 034830c81b3..cafdbda22a9 100644
--- a/distrib/sparc64/ramdiskB/list
+++ b/distrib/sparc64/ramdiskB/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.43 2015/03/11 15:27:32 deraadt Exp $
+#	$OpenBSD: list,v 1.44 2015/04/02 16:13:25 deraadt Exp $
 
 SRCDIRS distrib/special
 
@@ -47,7 +47,7 @@ LINK	instbin					usr/bin/encrypt
 LINK	instbin					usr/bin/ftp
 LINK	instbin					usr/bin/grep usr/bin/egrep usr/bin/fgrep
 LINK	instbin					usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
-LINK	instbin					usr/bin/less usr/bin/more
+LINK	instbin					usr/bin/more usr/bin/less
 LINK	instbin					usr/bin/sed
 LINK	instbin					usr/bin/signify
 LINK	instbin					usr/sbin/chroot
diff --git a/distrib/special/Makefile b/distrib/special/Makefile
index 094a516695c..832a32f45a8 100644
--- a/distrib/special/Makefile
+++ b/distrib/special/Makefile
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile,v 1.37 2015/03/11 15:23:10 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.38 2015/04/02 16:13:25 deraadt Exp $
 
 SUBDIR=	libstubs \
 	arch bioctl cat chmod chroot cp date dd df dhclient disklabel dmesg \
 	ed eeprom encrypt fdisk fsck fsck_ext2fs fsck_ffs fsck_msdos ftp \
-	grep gzip hostname ifconfig init installboot kbd ksh less ln ls md5 \
+	grep gzip hostname ifconfig init installboot kbd ksh ln ls md5 \
 	mkdir mknod mkuboot more mount mount_cd9660 mount_ext2fs \
 	mount_ffs mount_msdos mount_nfs mount_udf mt mv newfs newfs_ext2fs \
 	newfs_msdos pax pdisk ping ping6 reboot restore rm route sed \
diff --git a/distrib/special/less/Makefile b/distrib/special/less/Makefile
deleted file mode 100644
index d2c89b82969..00000000000
--- a/distrib/special/less/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-#	$OpenBSD: Makefile,v 1.7 2014/05/13 02:34:58 millert Exp $
-
-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 ifile.c input.c jump.c \
-	line.c linenum.c mark.c optfunc.c option.c opttbl.c os.c output.c \
-	pattern.c position.c prompt.c search.c signal.c ttyin.c version.c
-CFLAGS=	${PIPE} ${DEBUG} -I${.CURDIR}
-
-DPADD=	${LIBOCURSES}
-LDADD=	-locurses
-
-.PATH:	${.CURDIR}/../../../usr.bin/less
-
-.include <bsd.prog.mk>
diff --git a/distrib/special/less/defines.h b/distrib/special/less/defines.h
deleted file mode 100644
index 7257a0be7a6..00000000000
--- a/distrib/special/less/defines.h
+++ /dev/null
@@ -1,433 +0,0 @@
-/* defines.h.  Generated by configure.  */
-/* defines.h.in.  Generated from configure.ac by autoheader.  */
-
-
-/* Unix definition file for less.  -*- C -*-
- *
- * This file has 3 sections:
- * User preferences.
- * Settings always true on Unix.
- * Settings automatically determined by configure.
- *
- * * * * * *  WARNING  * * * * * *
- * If you edit defines.h by hand, do "touch stamp-h" before you run make
- * so config.status doesn't overwrite your changes.
- */
-
-/* User preferences.  */
-
-/*
- * SECURE is 1 if you wish to disable a bunch of features in order to
- * be safe to run by unprivileged users.
- * SECURE_COMPILE is set by the --with-secure configure option.
- */
-#define	SECURE		SECURE_COMPILE
-
-/*
- * SMALL is 1 if you wish to disable a bunch of features in order to
- * build a smaller less binary.
- */
-#define	SMALL		1
-
-/*
- * SHELL_ESCAPE is 1 if you wish to allow shell escapes.
- * (This is possible only if your system supplies the system() function.)
- */
-#define	SHELL_ESCAPE	(!SECURE && !SMALL)
-
-/*
- * EXAMINE is 1 if you wish to allow examining files by name from within less.
- */
-#define	EXAMINE		(!SECURE && !SMALL)
-
-/*
- * TAB_COMPLETE_FILENAME is 1 if you wish to allow the TAB key
- * to complete filenames at prompts.
- */
-#define	TAB_COMPLETE_FILENAME	(!SECURE && !SMALL)
-
-/*
- * CMD_HISTORY is 1 if you wish to allow keys to cycle through
- * previous commands at prompts.
- */
-#define	CMD_HISTORY	(!SMALL)
-
-/*
- * HILITE_SEARCH is 1 if you wish to have search targets to be
- * displayed in standout mode.
- */
-#define	HILITE_SEARCH	1
-
-/*
- * EDITOR is 1 if you wish to allow editor invocation (the "v" command).
- * (This is possible only if your system supplies the system() function.)
- * EDIT_PGM is the name of the (default) editor to be invoked.
- */
-#define	EDITOR		(!SECURE && !SMALL)
-
-/*
- * TAGS is 1 if you wish to support tag files.
- */
-#define	TAGS		(!SECURE && !SMALL)
-
-/*
- * USERFILE is 1 if you wish to allow a .less file to specify
- * user-defined key bindings.
- */
-#define	USERFILE	(!SECURE && !SMALL)
-
-/*
- * GLOB is 1 if you wish to have shell metacharacters expanded in filenames.
- * This will generally work if your system provides the "popen" function
- * and the "echo" shell command.
- */
-#define	GLOB		(!SECURE && !SMALL)
-
-/*
- * PIPEC is 1 if you wish to have the "|" command
- * which allows the user to pipe data into a shell command.
- */
-#define	PIPEC		(!SECURE && !SMALL)
-
-/*
- * LOGFILE is 1 if you wish to allow the -l option (to create log files).
- */
-#define	LOGFILE		(!SECURE && !SMALL)
-
-/*
- * GNU_OPTIONS is 1 if you wish to support the GNU-style command
- * line options --help and --version.
- */
-#define	GNU_OPTIONS	(!SMALL)
-
-/*
- * ONLY_RETURN is 1 if you want RETURN to be the only input which
- * will continue past an error message.
- * Otherwise, any key will continue past an error message.
- */
-#define	ONLY_RETURN	0
-
-/*
- * LESSKEYFILE is the filename of the default lesskey output file
- * (in the HOME directory).
- * LESSKEYFILE_SYS is the filename of the system-wide lesskey output file.
- * DEF_LESSKEYINFILE is the filename of the default lesskey input
- * (in the HOME directory).
- * LESSHISTFILE is the filename of the history file
- * (in the HOME directory).
- */
-#define	LESSKEYFILE		".less"
-#define	LESSKEYFILE_SYS		SYSDIR "/sysless"
-#define	DEF_LESSKEYINFILE	".lesskey"
-#define LESSHISTFILE		".lesshst"
-
-
-/* Settings always true on Unix.  */
-
-/*
- * Define MSDOS_COMPILER if compiling under Microsoft C.
- */
-#define	MSDOS_COMPILER	0
-
-/*
- * Pathname separator character.
- */
-#define	PATHNAME_SEP	"/"
-
-/*
- * The value returned from tgetent on success.
- * Some HP-UX systems return 0 on success.
- */
-#define TGETENT_OK  1
-
-/*
- * HAVE_SYS_TYPES_H is 1 if your system has <sys/types.h>.
- */
-#define HAVE_SYS_TYPES_H 1
-
-/*
- * Define if you have the <sgstat.h> header file.
- */
-/* #undef HAVE_SGSTAT_H */
-
-/*
- * HAVE_PERROR is 1 if your system has the perror() call.
- * (Actually, if it has sys_errlist, sys_nerr and errno.)
- */
-#define	HAVE_PERROR	1
-
-/*
- * HAVE_TIME is 1 if your system has the time() call.
- */
-#define	HAVE_TIME	1
-
-/*
- * HAVE_SHELL is 1 if your system supports a SHELL command interpreter.
- */
-#define	HAVE_SHELL	1
-
-/*
- * Default shell metacharacters and meta-escape character.
- */
-#define	DEF_METACHARS	"; *?\t\n'\"()<>[]|&^`#\\$%=~"
-#define	DEF_METAESCAPE	"\\"
-
-/*
- * HAVE_DUP is 1 if your system has the dup() call.
- */
-#define	HAVE_DUP	1
-
-/* Define to 1 if you have the memcpy() function. */
-#define HAVE_MEMCPY 1
-
-/* Define to 1 if you have the strchr() function. */
-#define HAVE_STRCHR 1
-
-/* Define to 1 if you have the strstr() function. */
-#define HAVE_STRSTR 1
-
-/*
- * Sizes of various buffers.
- */
-#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 */
-#define	OUTBUF_SIZE	1024	/* Output buffer */
-#define	PROMPT_SIZE	200	/* 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	512	/* Max size of line in tags file */
-#define	TABSTOP_MAX	32	/* Max number of custom tab stops */
-
-/* Settings automatically determined by configure.  */
-
-
-/* Define EDIT_PGM to your editor. */
-#define EDIT_PGM "ed"
-
-/* Define HAVE_CONST if your compiler supports the "const" modifier. */
-#define HAVE_CONST 1
-
-/* Define to 1 if you have the <ctype.h> header file. */
-#define HAVE_CTYPE_H 1
-
-/* Define HAVE_ERRNO if you have the errno variable. */
-#define HAVE_ERRNO 1
-
-/* Define to 1 if you have the <errno.h> header file. */
-#define HAVE_ERRNO_H 1
-
-/* Define to 1 if you have the `fchmod' function. */
-/* #undef HAVE_FCHMOD */
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H 1
-
-/* Define HAVE_FILENO if you have the fileno() macro. */
-#define HAVE_FILENO 1
-
-/* Define HAVE_FLOAT if your compiler supports the "double" type. */
-/* #undef HAVE_FLOAT */
-
-/* Define to 1 if you have the `fsync' function. */
-#define HAVE_FSYNC 1
-
-/* 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
-
-/* Define HAVE_LOCALE if you have locale.h and setlocale. */
-#define HAVE_LOCALE 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define HAVE_OSPEED if your termcap library has the ospeed variable. */
-#define HAVE_OSPEED 1
-
-/* PCRE (Perl-compatible regular expression) library */
-/* #undef HAVE_PCRE */
-
-/* Define to 1 if you have the `popen' function. */
-#define HAVE_POPEN 1
-
-/* POSIX regcomp() and regex.h */
-#define HAVE_POSIX_REGCOMP 1
-
-/* System V regcmp() */
-/* #undef HAVE_REGCMP */
-
-/* */
-/* #undef HAVE_REGEXEC2 */
-
-/* BSD re_comp() */
-/* #undef HAVE_RE_COMP */
-
-/* Define HAVE_SIGEMPTYSET if you have the sigemptyset macro. */
-#define HAVE_SIGEMPTYSET 1
-
-/* Define to 1 if you have the `sigprocmask' function. */
-#define HAVE_SIGPROCMASK 1
-
-/* Define to 1 if you have the `sigsetmask' function. */
-#define HAVE_SIGSETMASK 1
-
-/* Define to 1 if the system has the type `sigset_t'. */
-#define HAVE_SIGSET_T 1
-
-/* Define to 1 if you have the `snprintf' function. */
-#define HAVE_SNPRINTF 1
-
-/* Define to 1 if you have the `stat' function. */
-#define HAVE_STAT 1
-
-/* Define HAVE_STAT_INO if your struct stat has st_ino and st_dev. */
-#define HAVE_STAT_INO 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-/* #undef HAVE_STDINT_H */
-
-/* Define to 1 if you have the <stdio.h> header file. */
-#define HAVE_STDIO_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define HAVE_STRERROR if you have the strerror() function. */
-#define HAVE_STRERROR 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the `system' function. */
-#define HAVE_SYSTEM 1
-
-/* Define HAVE_SYS_ERRLIST if you have the sys_errlist[] variable. */
-#define HAVE_SYS_ERRLIST 1
-
-/* Define to 1 if you have the <sys/ioctl.h> header file. */
-#define HAVE_SYS_IOCTL_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/stream.h> header file. */
-/* #undef HAVE_SYS_STREAM_H */
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <termcap.h> header file. */
-#define HAVE_TERMCAP_H 1
-
-/* Define HAVE_TERMIOS_FUNCS if you have tcgetattr/tcsetattr. */
-#define HAVE_TERMIOS_FUNCS 1
-
-/* Define to 1 if you have the <termios.h> header file. */
-#define HAVE_TERMIOS_H 1
-
-/* Define to 1 if you have the <termio.h> header file. */
-/* #undef HAVE_TERMIO_H */
-
-/* Define to 1 if you have the <time.h> header file. */
-#define HAVE_TIME_H 1
-
-/* Define HAVE_TIME_T if your system supports the "time_t" type. */
-#define HAVE_TIME_T 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define HAVE_UPPER_LOWER if you have isupper, islower, toupper, tolower. */
-#define HAVE_UPPER_LOWER 1
-
-/* Henry Spencer V8 regcomp() and regexp.h */
-/* #undef HAVE_V8_REGCOMP */
-
-/* Define to 1 if you have the <values.h> header file. */
-/* #undef HAVE_VALUES_H */
-
-/* Define HAVE_VOID if your compiler supports the "void" type. */
-#define HAVE_VOID 1
-
-/* Define HAVE_WCTYPE if you have iswupper, iswlower, towupper, towlower. */
-/* #undef HAVE_WCTYPE */
-
-/* Define to 1 if you have the <wctype.h> header file. */
-/* #undef HAVE_WCTYPE_H */
-
-/* Define to 1 if you have the `_setjmp' function. */
-#define HAVE__SETJMP 1
-
-/* Define MUST_DEFINE_ERRNO if you have errno but it is not define in errno.h.
-   */
-/* #undef MUST_DEFINE_ERRNO */
-
-/* Define MUST_DEFINE_OSPEED if you have ospeed but it is not defined in
-   termcap.h. */
-/* #undef MUST_DEFINE_OSPEED */
-
-/* pattern matching is supported, but without metacharacters. */
-/* #undef NO_REGEX */
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "less"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "less 1"
-
-/* 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"
-
-/* Define as the return type of signal handlers (`int' or `void'). */
-#define RETSIGTYPE void
-
-/* Define SECURE_COMPILE=1 to build a secure version of less. */
-#define SECURE_COMPILE 0
-
-/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
-/* #undef STAT_MACROS_BROKEN */
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#define TIME_WITH_SYS_TIME 1
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-/* #undef _FILE_OFFSET_BITS */
-
-/* Define for large files, on AIX-style hosts. */
-/* #undef _LARGE_FILES */
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define to `long int' if <sys/types.h> does not define. */
-/* #undef off_t */
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-/* #undef size_t */
diff --git a/distrib/vax/common/list b/distrib/vax/common/list
index 0c740636383..9c270d42c6f 100644
--- a/distrib/vax/common/list
+++ b/distrib/vax/common/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.37 2015/03/11 15:27:33 deraadt Exp $
+#	$OpenBSD: list,v 1.38 2015/04/02 16:13:25 deraadt Exp $
 
 SRCDIRS distrib/special
 SRCDIRS sys/arch/vax/stand
@@ -49,7 +49,7 @@ LINK	instbin					usr/bin/encrypt
 LINK	instbin					usr/bin/ftp
 LINK	instbin					usr/bin/grep usr/bin/egrep usr/bin/fgrep
 LINK	instbin					usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
-LINK	instbin					usr/bin/less usr/bin/more
+LINK	instbin					usr/bin/more usr/bin/less 
 LINK	instbin					usr/bin/sed
 LINK	instbin					usr/bin/signify
 #LINK	instbin					usr/sbin/bad144
diff --git a/distrib/zaurus/ramdisk/list b/distrib/zaurus/ramdisk/list
index 0821c1232e5..1f4de31ea37 100644
--- a/distrib/zaurus/ramdisk/list
+++ b/distrib/zaurus/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.32 2015/03/11 15:27:33 deraadt Exp $
+#	$OpenBSD: list,v 1.33 2015/04/02 16:13:25 deraadt Exp $
 
 SRCDIRS distrib/special
 
@@ -56,7 +56,7 @@ LINK	instbin					usr/bin/encrypt
 LINK	instbin					usr/bin/ftp
 LINK	instbin					usr/bin/grep usr/bin/egrep usr/bin/fgrep
 LINK	instbin					usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
-LINK	instbin					usr/bin/less usr/bin/more
+LINK	instbin					usr/bin/more usr/bin/less
 LINK	instbin					usr/bin/sed
 LINK	instbin					usr/bin/signify
 LINK	instbin					usr/sbin/chroot