Update ne to 3.02

Change Log for New E (NE)
-------------------------

Version 3.02 15-May-12
----------------------

1. The icurrent command did not remove the line number from the line it copied.

2. Cutting and pasting did not always remove line numbers, as it is documented
   to do.

3. Some additional information has been added to the output from "show
   settings".


Version 3.01 02-Mar-12
----------------------

1. There were bugs in the table the controls what commands may be obeyed in
   read-only mode. For example, the "readonly" command was not allowed, so the
   mode could not be turned off. Doh! In addition, the single-character
   commands such as # ? etc. were not correctly handled in readonly mode;
   neither were bracketed groups nor procedures. Using any of these commands
   caused segfaults.


Version 3.00 23-Feb-11
----------------------

1. Rather than just fixing an out-by-one bug in eversion.c, I re-designed how
it works. Added the copyright notice to the -help output. Added a lot more
casts for signed/unsigned chars so that it compiles clean with -Wall on today's
compilers (it's been over 5 years since the last release).

2. Renamed configure.in as configure.ac in line with modern practice, and did
some tidying/updating of the configure and make files.

3. Made --help a synonym of -help, and added -v and --version as synonyms of
(the very ancient) -id.

4. Removed the -stream facility, as it seems redundant nowadays.

5. Fixed reference to unset memory in rdargs.c.

6. Removed redundant code for various special (no longer existing) terminal
types, and unused code for the Acorn windowing environment. The only special
terminal type now recognized is xterm. Also removed the unixregexp command,
which used to switch between different regex types, but has been obsolete for
ages.

7. In screen mode, test whether an xterm is set to UTF-8, and adjust output
accordingly. UTF-8 sequences are sent for certain characters whose code points
are greater than 127. Characters that do not occupy exactly one cell on an
xterm display are displayed as the substitute character (defaulting to a
question mark). These include zero-width and double-width characters.
Characters with code points greater than 0xFFFF are also substituted.

8. If -w[idechars] is specified, or the "widechars on" command is obeyed,
recognize valid wide UTF-8 characters in the text being edited, without
modifying the text bytes. A top-bit-set byte that is not part of a valid UTF-8
character is treated as a single-byte character. This affects how data lines
are displayed on the screen and in verification output. You can flip between
modes during an editing session.

9. "Show wordcount" was including line-ending characters in its character
count, contrary to its documentation. Of course, previously it was just a byte
count. It now shows both a byte count and a character count in wide character
mode, in both cases excluding line ending characters. Words are now delimited
by either tabs or spaces (previously it was just spaces). The output is now on
multiple lines.

10. Added new keyboard escapes for inputting Unicode characters, for example,
ESC A ' for aacute. Also recognize ESC U or ESC u followed by up to 5 hex
digits (short-terminated by a non-hex digit or another ESC). This feature
applies only to input in screen mode because in line-by-line mode the commands
are read using standard C input functions.

11. While implementing 8/9/10, several old bugs/infelicities were found and
fixed:

    (a) In the code for formatting paragraphs, if the begin/end paragraph
        settings did not include indented lines, and some lines of a paragraph
        were indented less than earlier lines, characters could sometimes get
        scrambled.

    (b) Characters deleted by keystroke while in overstrike mode did not get
        remembered for recall by "undelete".

    (c) Some redundant arguments for certain functions were discovered and
        removed (they probably related to code for environments no longer
        supported which itself has gone).

    (d) If a command line from a .nerc file was recovered by the use of the
        "up" key in a screen command line, the final newline was still present,
        and displayed as "?".

12. When running in an xterm, NE now recognizes a left-button mouse click in
the window, and moves the cursor appropriately. It also recognizes twiddling
the wheel in a wheel mouse, and for each twiddle scrolls the screen up or down
by an amount that can be set by "set autovmousescroll" (default 1). The current
line is changed only if it would disappear off the screen. The "mouse" command
can be used to turn mouse recognition on and off. Unfortunately, you have to
turn it off if you want to use normal xterm cut-and-paste.

13. NE was maintaining a value in a variable called main_currentlinenumber, but
never actually using it for anything. This must be an historic relic. Removing
it does not seem to have broken anything.

14. When writing a file, NE was not testing for an error on the fclose() call
at the end. Errors can happen here if, for example, the system is buffering the
output and a quota overrun is not detected until fclose().

15. When "show keys" was issued in screen mode, NE was pausing for interaction
more often than actually necessary if the screen or window was relatively deep.
It now notices the available depth.

16. The subchar command now allows for altering the character that is
substituted on screen for undisplayable characters.


Version 2.01 06-Jun-05
----------------------

1. Lines whose length was between 32768 and 65535 were ending up with
negative lengths because I was using short int rather than unsigned short
int. They showed up therefore as empty lines, which was pretty disastrous. As
well as inserting "unsigned", I have removed "short", since memory is plentiful
these days. So line lengths can in principle be *really* big.

2. Change from -lcurses to -lncurses in the Makefile.

3. Insert $(DESTDIR) before all the path names for make install.


Version 2.00 01-Mar-04
----------------------

This version has had the code refactored in several ways, and the compiling
process has been converted into a conventional "configure, make, make install"
paradigm. Only PCRE regular expressions are supported, and the PCRE library has
to be installed. Only Unix-like systems are now supported. The initialization
now uses .nerc instead of an environment variable. A number of other tidies and
minor interface changes were made. The documentation was re-worked to remove
all the obsolete stuff and to incorporate the changes.

7 files changed, 62 insertions, 85 deletions

diff --git a/editors/ne/DESCR b/editors/ne/DESCR
index 7ad04bf8a30..334127056a1 100644
--- a/editors/ne/DESCR
+++ b/editors/ne/DESCR
@@ -1,12 +1,14 @@
-NE is a text editor that is designed to run on a wide variety
-of machines, from large servers to personal workstations. Its
-main use is expected to be as an interactive screen editor.
-However, it can also function as a line-by-line editor, and it
-is programmable, so it can be run non-interactively as a text
-manipulation tool.
+NE is a text editor that was originally designed to run on a wide
+variety of machines, from large servers to personal workstations.
+In the past it ran on a number of operating systems; however, the
+current version supports only Unix-like systems.
 
-NE is a re-implementation of a previous editor that was called
-E. It is to a large extent upwards compatible, though there
-are some features of E that are not provided in NE. On the
-other hand, there are some additional features of NE that are
-not part of E.
+The main use of NE is expected to be as an interactive screen
+editor.  However, it can also function as a line-by-line editor,
+and it is programmable, so it can be run non-interactively as a
+text manipulation tool.
+
+NE is a re-implementation of a previous editor that was called E,
+which in turn evolved from one called Zed and a number of predecessors
+that ran on IBM mainframes. The lineage can be traced back to some
+very early Cambridge text editors of the 1960s.
diff --git a/editors/ne/Makefile b/editors/ne/Makefile
index a5a31b8da5d..9b756d8fe31 100644
--- a/editors/ne/Makefile
+++ b/editors/ne/Makefile
@@ -1,32 +1,20 @@
-# $NetBSD: Makefile,v 1.17 2016/02/25 12:56:10 jperkin Exp $
+# $NetBSD: Makefile,v 1.18 2016/06/19 17:25:31 prlw1 Exp $
 
-DISTNAME=	ne-1.31
+DISTNAME=	ne-3.02
 CATEGORIES=	editors
-MASTER_SITES=	ftp://ftp.cus.cam.ac.uk/pub/software/programs/NE/
-DISTFILES=	${DISTNAME}.tar.gz ne.manpage.1 NE.spec.ascii NE.changes.spec
+MASTER_SITES=	ftp://ftp.csx.cam.ac.uk/pub/software/wordprocessing/unix/ne/
 
-MAINTAINER=	bjh@mail.dotcom.fr
-COMMENT=	Re-write of Phoenix E.  A sensible light-weight editor
+MAINTAINER=	prlw1@cam.ac.uk
+HOMEPAGE=	ftp://ftp.csx.cam.ac.uk/pub/software/wordprocessing/unix/ne/
+COMMENT=	Terminal text editor
+LICENSE=	gnu-gpl-v2
 
-MAKE_JOBS_SAFE=		no
+GNU_CONFIGURE=	yes
 
-DIST_SUBDIR=	${PKGNAME_NOREV}
-WRKSRC=		${WRKDIR}/src
+CONFIGURE_ARGS+=	--enable-termcap
 
-EXTRACT_ONLY=	${DISTNAME}.tar.gz
-
-BUILD_TARGET.SunOS=	SunOS5_gcc ne
-BUILD_TARGET.*=		NetBSD ne
-
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/nenewp ${DESTDIR}${PREFIX}/bin/ne
-	${INSTALL_MAN} ${_DISTDIR}/ne.manpage.1 \
-		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/ne.1
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/ne
-	${INSTALL_DATA} ${_DISTDIR}/NE.spec.ascii ${_DISTDIR}/NE.changes.spec \
-		${WRKSRC}/LICENCE ${DESTDIR}${PREFIX}/share/doc/ne
+BUILD_TARGET=	build
 
+.include "../../devel/pcre/buildlink3.mk"
 .include "../../mk/termcap.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/ne/PLIST b/editors/ne/PLIST
index af436974993..00660969e64 100644
--- a/editors/ne/PLIST
+++ b/editors/ne/PLIST
@@ -1,6 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:50:25 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2016/06/19 17:25:31 prlw1 Exp $
 bin/ne
 man/man1/ne.1
-share/doc/ne/NE.spec.ascii
-share/doc/ne/NE.changes.spec
-share/doc/ne/LICENCE
+share/doc/ne.pdf
diff --git a/editors/ne/distinfo b/editors/ne/distinfo
index b0e4032a33b..ae653ef2577 100644
--- a/editors/ne/distinfo
+++ b/editors/ne/distinfo
@@ -1,20 +1,7 @@
-$NetBSD: distinfo,v 1.6 2015/11/03 03:32:18 agc Exp $
+$NetBSD: distinfo,v 1.7 2016/06/19 17:25:31 prlw1 Exp $
 
-SHA1 (ne-1.31/ne-1.31.tar.gz) = 25642fa74c720bef7ba56f96673d2d2d554f2f57
-RMD160 (ne-1.31/ne-1.31.tar.gz) = a3c2d90d289737b67a66ae7d79005ac665ebba53
-SHA512 (ne-1.31/ne-1.31.tar.gz) = 906473a523ed4c203ba6fc6a2164f0bd8f0cf99c858f3a8501d211af1d261819c60639e39c680ee0a66d5f6ed877bc98a5a458783552a4f66c2a6ea63e2a4a1a
-Size (ne-1.31/ne-1.31.tar.gz) = 342567 bytes
-SHA1 (ne-1.31/ne.manpage.1) = b252b2c55fa057f7aaf2e092bbc9acec5e263373
-RMD160 (ne-1.31/ne.manpage.1) = cc46ad47ea8a26b668d15d9a2a63f74859a003d5
-SHA512 (ne-1.31/ne.manpage.1) = e74f8feed05f2fdc217dd19654d995d11aaef7737a31f6fc85028068a159b1334cbf59dadbd02647f1842bd4805c1b5e54c6d22a31b41a58a11aff282d5af51b
-Size (ne-1.31/ne.manpage.1) = 4578 bytes
-SHA1 (ne-1.31/NE.spec.ascii) = 83a4acfea7c5e01a3efdf67105596af77d968f2f
-RMD160 (ne-1.31/NE.spec.ascii) = 7d972e836458912ce17c2a16dd8a1152ff33a5a0
-SHA512 (ne-1.31/NE.spec.ascii) = 421ceaaa4293900c0d7f3b2c549f87674234448d9c2b8bbd5b228bd849863e034b495dd33598922b57e31502b034f39aa64129f289956178bc791cc9e0cbe3e3
-Size (ne-1.31/NE.spec.ascii) = 318118 bytes
-SHA1 (ne-1.31/NE.changes.spec) = 587a72694b34763b324bd694549f951250e3d309
-RMD160 (ne-1.31/NE.changes.spec) = a619a2d8a80054138cb97198fbb2d6e8f473a178
-SHA512 (ne-1.31/NE.changes.spec) = 76e6b3c24cf282fac00563a9c66e572bed4c47e295183a9d7ff4dba6b907c0f4555e68a43390679f5f8a767be02e754099dc80ca25dea480f5b167fc5fc47d8d
-Size (ne-1.31/NE.changes.spec) = 7380 bytes
-SHA1 (patch-aa) = 83fe227f538774e6268126c39bc31cdf188b15f1
-SHA1 (patch-sysunix.c) = 942bcfa3aa4be33b06d018d0ce3b546db99849f2
+SHA1 (ne-3.02.tar.gz) = 7e93213780a668856b8bda0e80bad0dd8a6e543b
+RMD160 (ne-3.02.tar.gz) = 9c97a88759871e0139b3b0a5f122628e24a836bc
+SHA512 (ne-3.02.tar.gz) = 18414f32967c99a29a22587daa1c24de86df3677b238b1bbc88c1a5c888e5a025a5bbcee00f8ea74e9f4591f60d544c82151a1e295f4dcb3ace6aafa55cce0bb
+Size (ne-3.02.tar.gz) = 601076 bytes
+SHA1 (patch-Makefile.in) = 9f10a8a6ab8569e417fa01dfb430e62993094a0d
diff --git a/editors/ne/patches/patch-Makefile.in b/editors/ne/patches/patch-Makefile.in
new file mode 100644
index 00000000000..50fbb0a6073
--- /dev/null
+++ b/editors/ne/patches/patch-Makefile.in
@@ -0,0 +1,30 @@
+$NetBSD: patch-Makefile.in,v 1.1 2016/06/19 17:25:31 prlw1 Exp $
+
+Install documentation.
+
+--- Makefile.in.orig	2012-05-16 08:40:16.000000000 +0000
++++ Makefile.in
+@@ -12,8 +12,11 @@ LDFLAGS=@LDFLAGS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ 
+-BINDIR=@prefix@/bin
+-MANDIR=@prefix@/man
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++BINDIR=@bindir@
++MANDIR=@mandir@
++DOCDIR=@docdir@
+ 
+ LIBS=@LIBS@
+ LIB_TERMINAL=@LIB_TERMINAL@
+@@ -47,6 +50,8 @@ install:        build
+ 		$(mkinstalldirs) $(DESTDIR)$(BINDIR)
+ 		$(mkinstalldirs) $(DESTDIR)$(MANDIR)
+ 		$(mkinstalldirs) $(DESTDIR)$(MANDIR)/man1
++		$(mkinstalldirs) $(DESTDIR)$(DOCDIR)
+ 		$(INSTALL) src/ne $(DESTDIR)$(BINDIR)/ne
+-#		$(INSTALL_DATA) doc/ne.1 $(DESTDIR)$(MANDIR)/man1
++		$(INSTALL_DATA) doc/ne.1 $(DESTDIR)$(MANDIR)/man1
++		$(INSTALL_DATA) doc/ne.pdf $(DESTDIR)$(DOCDIR)
+ # End
diff --git a/editors/ne/patches/patch-aa b/editors/ne/patches/patch-aa
deleted file mode 100644
index 2b1cb8a42b1..00000000000
--- a/editors/ne/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2004/11/25 15:12:56 adam Exp $
-
---- OS_Make_NetBSD.orig	2004-11-25 16:00:47.000000000 +0000
-+++ OS_Make_NetBSD
-@@ -2,7 +2,7 @@
- # Version for NetBSD using the cc compiler.
- 
- FLAGS   = CC=cc \
--          CFLAGS="-Dunixwinsz -DHAVE_TERMCAP -O" \
-+          CFLAGS="${CFLAGS} -Dunixwinsz -DHAVE_TERMCAP" \
-           LIB_TERMINAL=-ltermcap
- 
- newne:;   @make -f BaseMake $(FLAGS) $(TARGET)
diff --git a/editors/ne/patches/patch-sysunix.c b/editors/ne/patches/patch-sysunix.c
deleted file mode 100644
index 64999a3316f..00000000000
--- a/editors/ne/patches/patch-sysunix.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-sysunix.c,v 1.1 2013/10/24 09:35:10 jperkin Exp $
-
---- sysunix.c.orig	2003-10-01 09:57:29.000000000 +0000
-+++ sysunix.c
-@@ -21,6 +21,10 @@ its own modules. */
- #include <fcntl.h>
- #include <dirent.h>
-             
-+#if defined(__sun)
-+# include <sys/filio.h>
-+#endif
-+
- #include "ehdr.h"
- #include "unixhdr.h"
- #include "scomhdr.h"