Initial import of ed-0.2, the GNU version of line-oriented text editor.

5 files changed, 275 insertions, 0 deletions

diff --git a/editors/ed/DESCR b/editors/ed/DESCR
new file mode 100644
index 00000000000..5b9467f7fa0
--- /dev/null
+++ b/editors/ed/DESCR
@@ -0,0 +1,7 @@
+This is the GNU version of ed(1).
+
+ed is a line-oriented text editor.  It is used to create, display,
+modify and otherwise manipulate text files.
+
+This also includes a restricted ed, which can only edit files in the
+current directory and cannot execute shell commands.
diff --git a/editors/ed/Makefile b/editors/ed/Makefile
new file mode 100644
index 00000000000..53e583b5b60
--- /dev/null
+++ b/editors/ed/Makefile
@@ -0,0 +1,24 @@
+# $NetBSD: Makefile,v 1.1.1.1 2004/03/12 04:46:33 reed Exp $
+
+DISTNAME=		ed-0.2
+PKGREVISION=		1
+CATEGORIES=		editors
+MASTER_SITES=		${MASTER_SITE_GNU:=ed/}
+
+MAINTAINER=		reed@reedmedia.net
+HOMEPAGE=		http://www.gnu.org/software/ed/ed.html
+COMMENT=		GNU version of line-oriented text editor
+
+GNU_CONFIGURE=		YES
+INFO_FILES=		ed.info
+
+.include "../../mk/bsd.prefs.mk"
+
+.if defined(GNU_PROGRAM_PREFIX)
+# the ./configure accepts --program-prefix, but doesn't use
+MAKE_ENV+=		binprefix="${GNU_PROGRAM_PREFIX}"
+.endif
+PLIST_SUBST+=           GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX}
+BUILD_DEFS+=            GNU_PROGRAM_PREFIX
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/editors/ed/PLIST b/editors/ed/PLIST
new file mode 100644
index 00000000000..22ef4ec890b
--- /dev/null
+++ b/editors/ed/PLIST
@@ -0,0 +1,6 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2004/03/12 04:46:33 reed Exp $
+bin/${GNU_PROGRAM_PREFIX}ed
+bin/${GNU_PROGRAM_PREFIX}red
+info/ed.info
+man/man1/${GNU_PROGRAM_PREFIX}ed.1
+man/man1/${GNU_PROGRAM_PREFIX}red.1
diff --git a/editors/ed/distinfo b/editors/ed/distinfo
new file mode 100644
index 00000000000..e4f04fd5561
--- /dev/null
+++ b/editors/ed/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1.1.1 2004/03/12 04:46:33 reed Exp $
+
+SHA1 (ed-0.2.tar.gz) = abb61231a3baeb988b145ffe97cdbaea8f651d93
+Size (ed-0.2.tar.gz) = 185913 bytes
+SHA1 (patch-aa) = 21e217b85b6f52d07df9ae7127aba94857c9633e
diff --git a/editors/ed/patches/patch-aa b/editors/ed/patches/patch-aa
new file mode 100644
index 00000000000..780227cd874
--- /dev/null
+++ b/editors/ed/patches/patch-aa
@@ -0,0 +1,233 @@
+$NetBSD: patch-aa,v 1.1.1.1 2004/03/12 04:46:34 reed Exp $
+
+install-info: warning: no info dir entry in `/usr/pkg/info/ed.info'
+ed.texinfo:168: warning: `.' or `,' must follow cross reference, not a.
+ed.texinfo:477: warning: unlikely character , in @var.
+ed.texinfo:478: warning: unlikely character , in @var.
+
+--- ed.info.orig	2003-12-03 01:31:56.000000000 -0800
++++ ed.info
+@@ -1,5 +1,9 @@
+-This is Info file ed.info, produced by Makeinfo-1.55 from the input
+-file ed.texinfo.
++This is ed.info, produced by makeinfo version 4.6 from ed.texinfo.
++
++INFO-DIR-SECTION Text creation and manipulation
++START-INFO-DIR-ENTRY
++* Ed: (ed).                     Line editor.
++END-INFO-DIR-ENTRY
+ 
+    This file documents the `ed' command, which has the purpose of
+ editing text files.
+@@ -25,8 +29,8 @@ File: ed.info,  Node: Top,  Next: Intro,
+ 
+ 
+ 
+-   This info file documents the `ed' text editor, as of release 0.2.
+-You may find in this document:
++This info file documents the `ed' text editor, as of release 0.2.  You
++may find in this document:
+ 
+ * Menu:
+ 
+@@ -44,7 +48,7 @@ File: ed.info,  Node: Intro,  Next: Invo
+ Intro
+ *****
+ 
+-   `ed' is a line-oriented text editor.  It is used to create, display,
++`ed' is a line-oriented text editor.  It is used to create, display,
+ modify and otherwise manipulate text files, both interactively and via
+ shell scripts.  A restricted version of `ed', `red', can only edit
+ files in the current directory and cannot execute shell commands.  `ed'
+@@ -55,7 +59,7 @@ however, it is superceded by full-screen
+    The sample sessions below illustrate some basic concepts of line
+ editing with `ed'.  We begin by creating a file, `sonnet', with some
+ help from Shakespeare.  As with the shell, all input to `ed' must be
+-followed by a newline character.  Comments begin with a `#'.
++followed by a <newline> character.  Comments begin with a `#'.
+ 
+      $ ed
+      # The `a' command is for appending text to the editor buffer.
+@@ -84,8 +88,8 @@ the contents of the editor buffer.  When
+ mode.  This is the primary means of adding text to a file.  In this
+ mode, no commands are available; instead, the standard input is written
+ directly to the editor buffer. A "line" consists of the text up to and
+-including a newline character.  Input mode is terminated by entering a
+-single period (`.') on a line.
++including a <newline> character.  Input mode is terminated by entering
++a single period (`.') on a line.
+ 
+    In the next example, some typos are corrected in the file `sonnet'.
+ 
+@@ -205,6 +209,7 @@ Invoking GNU `ed'
+      try invoking `ed' with this switch.
+ 
+ `-s'
++
+ `-'
+      Suppresses diagnostics. This should be used if `ed''s standard
+      input is from a script.
+@@ -213,6 +218,7 @@ Invoking GNU `ed'
+      Specifies a command prompt.  This may be toggled on and off with
+      the `P' command.
+ 
++
+    FILE specifies the name of a file to read.  If FILE is prefixed with
+ a bang (!), then it is interpreted as a shell command.  In this case,
+ what is read is the standard output of FILE executed via `sh (1)'.  To
+@@ -226,7 +232,7 @@ File: ed.info,  Node: Line addressing,  
+ Line addressing
+ ***************
+ 
+-   An address represents the number of a line in the buffer.  `ed'
++An address represents the number of a line in the buffer.  `ed'
+ maintains a "current address" which is typically supplied to commands
+ as the default address when none is specified.  When a file is first
+ read, the current address is set to the last line of the file.  In
+@@ -308,14 +314,15 @@ interpreted relative to the first.
+      The line previously marked by a `k' (mark) command, where LC is a
+      lower case letter.
+ 
++
+ 
+ File: ed.info,  Node: Regular expressions,  Next: Commands,  Prev: Line addressing,  Up: Top
+ 
+ Regular expressions
+ *******************
+ 
+-   Regular expressions are patterns used in selecting text.  For
+-example, the `ed' command
++Regular expressions are patterns used in selecting text.  For example,
++the `ed' command
+ 
+      g/STRING/
+ 
+@@ -396,8 +403,8 @@ left-most longest match is the one selec
+      string `abbb', as opposed to the substring `bbb', since a null
+      match is the only left-most match.
+ 
+-`\{N,M\}'
+-`\{N,\}'
++`\{`n,m'\}'
++`\{`n,'\}'
+ `\{N\}'
+      Matches the single character regular expression or subexpression
+      immediately preceding it at least N and at most M times.  If M is
+@@ -415,6 +422,7 @@ left-most longest match is the one selec
+      maximal string of alphanumeric characters, including the
+      underscore (_).
+ 
++
+    The following extended operators are preceded by a backslash `\' to
+ distinguish them from traditional `ed' syntax.
+ 
+@@ -452,23 +460,23 @@ distinguish them from traditional `ed' s
+ `\W'
+      Matches any character not in a word.
+ 
++
+ 
+ File: ed.info,  Node: Commands,  Next: Limitations,  Prev: Regular expressions,  Up: Top
+ 
+ Commands
+ ********
+ 
+-   All `ed' commands are single characters, though some require
+-additonal parameters.  If a command's parameters extend over several
+-lines, then each line except for the last must be terminated with a
+-backslash (`\').
++All `ed' commands are single characters, though some require additonal
++parameters.  If a command's parameters extend over several lines, then
++each line except for the last must be terminated with a backslash (`\').
+ 
+    In general, at most one command is allowed per line.  However, most
+ commands accept a print suffix, which is any of `p' (print), `l'
+ (list), or `n' (enumerate), to print the last line affected by the
+ command.
+ 
+-   An interrupt (typically ^C) has the effect of aborting the current
++   An interrupt (typically <^C>) has the effect of aborting the current
+ command and returning the editor to command mode.
+ 
+    `ed' recognizes the following commands.  The commands are shown
+@@ -563,7 +571,7 @@ specified (in parenthesis).
+ 
+ `(.,.)l'
+      Prints the addressed lines unambiguously.  If invoked from a
+-     terminal, `ed' pauses at the end of each page until a newline is
++     terminal, `ed' pauses at the end of each page until a <newline> is
+      entered.  The current address is set to the last line printed.
+ 
+ `(.,.)m(.)'
+@@ -577,7 +585,7 @@ specified (in parenthesis).
+ 
+ `(.,.)p'
+      Prints the addressed lines.  If invoked from a terminal, `ed'
+-     pauses at the end of each page until a newline is entered.  The
++     pauses at the end of each page until a <newline> is entered.  The
+      current address is set to the last line printed.
+ 
+ `P'
+@@ -616,8 +624,8 @@ specified (in parenthesis).
+      The current address is set the last line affected.
+ 
+      RE and REPLACEMENT may be delimited by any character other than
+-     space and newline (see the `s' command below).  If one or two of
+-     the last delimiters is omitted, then the last line affected is
++     <space> and <newline> (see the `s' command below).  If one or two
++     of the last delimiters is omitted, then the last line affected is
+      printed as though the print suffix `p' were specified.
+ 
+      An unescaped `&' in REPLACEMENT is replaced by the currently
+@@ -711,17 +719,18 @@ specified (in parenthesis).
+ `($)='
+      Prints the line number of the addressed line.
+ 
+-`(.+1)newline'
++`(.+1)<newline>'
+      Prints the addressed line, and sets the current address to that
+      line.
+ 
++
+ 
+ File: ed.info,  Node: Limitations,  Next: Diagnostics,  Prev: Commands,  Up: Top
+ 
+ Limitations
+ ***********
+ 
+-   The buffer files are kept in `/tmp/ed.*'.  If the terminal hangs up,
++The buffer files are kept in `/tmp/ed.*'.  If the terminal hangs up,
+ `ed' attempts to write the buffer to file `ed.hup'.
+ 
+    `ed' processes FILE arguments for backslash escapes, i.e., in a
+@@ -740,7 +749,7 @@ File: ed.info,  Node: Diagnostics,  Prev
+ Diagnostics
+ ***********
+ 
+-   When an error occurs, if `ed''s input is from a regular file or here
++When an error occurs, if `ed''s input is from a regular file or here
+ document, then it exits, otherwise it prints a `?' and returns to
+ command mode.  An explanation of the last error can be printed with the
+ `h' (help) command.
+@@ -757,13 +766,13 @@ second time, it succeeds, but any change
+ 
+ 
+ Tag Table:
+-Node: Top894
+-Node: Intro1524
+-Node: Invoking ed7497
+-Node: Line addressing8534
+-Node: Regular expressions11590
+-Node: Commands16976
+-Node: Limitations27862
+-Node: Diagnostics28480
++Node: Top1010
++Node: Intro1638
++Node: Invoking ed7612
++Node: Line addressing8651
++Node: Regular expressions11705
++Node: Commands17094
++Node: Limitations27990
++Node: Diagnostics28605
+ 
+ End Tag Table