From 265e385f922df923202458dc6d4fff9d119f200b Mon Sep 17 00:00:00 2001 From: reed Date: Wed, 9 Apr 2008 00:38:51 +0000 Subject: Update to ed-0.9. Both patches changed. I made new patches to support being able to install to program_prefix. (I supplied these upstream too.) From change log: 2008-02-24 Antonio Diaz * Version 0.9 released. * signal.c (sighup_handler): Return 0 if no error. * Arg_parser updated to 1.1. 2007-08-18 Antonio Diaz * Version 0.8 released. * check.sh: Testsuite exits unsuccesfully in case of error. * ed.1: Fixed some minor problems in the manual page. * ed.texinfo: Added 21kB of legalese (fdl.texinfo). 2007-07-18 Antonio Diaz * Version 0.7 released. * buf.c (dec_addr): Now returns correct address when wrapping. 2007-06-29 Antonio Diaz * Version 0.6 released. * License updated to GPL version 3 or later. * signal.c (sigwinch_handler, set_signal): Fixed two minor compatibility problems. * main_loop.c (main_loop): Fixed an infinite loop when reading an empty script. 2007-03-09 Antonio Diaz * Version 0.5 released. * main_loop.c (next_addr): '%' reimplemented as it was in ed 0.2. 2007-01-15 Antonio Diaz * Version 0.4 released. * Fixed some minor problems in the testsuite. 2006-11-11 Antonio Diaz * Version 0.3 released. * buf.c (open_sbuf): Fixed symlink vulnerability using standard function `tmpfile'. * signal.c: Fixed signal handling for SIGINT. * main_loop.c (exec_command): Fixed `c' and `i' commands with address 0. * The pause mode has been removed. * main.c: Added new options `--loose-exit-status' and `--verbose'. * carg_parser.c: New argument parser that replaces `getopt_long'. * `configure' and `Makefile.in' have been replaced. * Removed recursive make for testsuite. * Created directory `doc'. * Removed all pre ISO C89 code. * Removed all global variables. * ed.texinfo: Added to the manual the changes from Andrew and some mine. --- editors/ed/Makefile | 15 ++- editors/ed/distinfo | 12 +- editors/ed/patches/patch-aa | 277 +++++++------------------------------------- editors/ed/patches/patch-ab | 67 ++++++++--- 4 files changed, 111 insertions(+), 260 deletions(-) (limited to 'editors/ed') diff --git a/editors/ed/Makefile b/editors/ed/Makefile index c1c8fea3dd2..1497a2405be 100644 --- a/editors/ed/Makefile +++ b/editors/ed/Makefile @@ -1,28 +1,27 @@ -# $NetBSD: Makefile,v 1.9 2007/02/22 19:26:25 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2008/04/09 00:38:51 reed Exp $ -DISTNAME= ed-0.2 -PKGREVISION= 1 +DISTNAME= ed-0.9 CATEGORIES= editors MASTER_SITES= ${MASTER_SITE_GNU:=ed/} +EXTRACT_SUFX= .tar.bz2 MAINTAINER= reed@reedmedia.net HOMEPAGE= http://www.gnu.org/software/ed/ed.html COMMENT= GNU version of line-oriented text editor GNU_CONFIGURE= YES -CONFIGURE_HAS_INFODIR= NO -CONFIGURE_HAS_MANDIR= NO -MAKE_ENV+= PKGINFODIR=${PKGINFODIR:Q} .include "../../mk/bsd.prefs.mk" INFO_FILES= # PLIST .if defined(GNU_PROGRAM_PREFIX) -# the ./configure accepts --program-prefix, but doesn't use -MAKE_ENV+= binprefix=${GNU_PROGRAM_PREFIX:Q} +CONFIGURE_ARGS+= --program-prefix=${GNU_PROGRAM_PREFIX:Q} .endif PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q} BUILD_DEFS+= GNU_PROGRAM_PREFIX +post-install: + cd ${WRKSRC} && ${MAKE} install-man + .include "../../mk/bsd.pkg.mk" diff --git a/editors/ed/distinfo b/editors/ed/distinfo index 216566cc82a..b22f828dc08 100644 --- a/editors/ed/distinfo +++ b/editors/ed/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.5 2006/03/20 18:15:38 jlam Exp $ +$NetBSD: distinfo,v 1.6 2008/04/09 00:38:51 reed Exp $ -SHA1 (ed-0.2.tar.gz) = abb61231a3baeb988b145ffe97cdbaea8f651d93 -RMD160 (ed-0.2.tar.gz) = 7db3240d13311616df11621566f94241a3721ca2 -Size (ed-0.2.tar.gz) = 185913 bytes -SHA1 (patch-aa) = 21e217b85b6f52d07df9ae7127aba94857c9633e -SHA1 (patch-ab) = 1896cc7df57d3b229126e34b63ce0f04a6ec6c9e +SHA1 (ed-0.9.tar.bz2) = 233a942964653598e3915f8396be7dd3b688b95f +RMD160 (ed-0.9.tar.bz2) = ed73a7e4ea39100f491d207109387e08c6109b80 +Size (ed-0.9.tar.bz2) = 67941 bytes +SHA1 (patch-aa) = cdb909b955e4bc684d499f3aa8ba0a78c3226c9c +SHA1 (patch-ab) = 0147545fd6843c3477ffa0b40e3c6ce04fa455df diff --git a/editors/ed/patches/patch-aa b/editors/ed/patches/patch-aa index 780227cd874..5bcad8478bd 100644 --- a/editors/ed/patches/patch-aa +++ b/editors/ed/patches/patch-aa @@ -1,233 +1,46 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/03/12 04:46:34 reed Exp $ +$NetBSD: patch-aa,v 1.2 2008/04/09 00:38:51 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 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 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 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 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 -+ and (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)' - 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 +--- configure.orig 2008-02-24 13:10:42.000000000 -0600 ++++ configure 2008-04-08 12:54:40.000000000 -0500 +@@ -11,6 +11,7 @@ + args=$* + no_create= + progname=ed ++program_prefix= + progversion=0.9 + srctrigger=ed.h + +@@ -58,6 +59,7 @@ + echo " --infodir=DIR info files directory [${infodir}]" + echo " --mandir=DIR man pages directory [${mandir}]" + echo " --sysconfdir=DIR read-only single-machine data directory [${sysconfdir}]" ++ echo " --program-prefix=NAME install program and documentation prefixed with NAME" + echo " CC=COMPILER C compiler to use [gcc]" + echo " CXX=COMPILER C++ compiler to use [g++]" + echo " CPPFLAGS=OPTIONS command line options for the preprocessor [${CPPFLAGS}]" +@@ -71,7 +73,7 @@ + exit 0 ;; + --srcdir* | --sr*) + srcdir=`echo ${optarg} | sed -e 's,/$,,'` ;; +- --prefix* | --pr*) ++ --prefix* | --pre*) + prefix=`echo ${optarg} | sed -e 's,/$,,'` ;; + --exec-prefix* | --ex*) + exec_prefix=`echo ${optarg} | sed -e 's,/$,,'` ;; +@@ -85,6 +87,8 @@ + mandir=`echo ${optarg} | sed -e 's,/$,,'` ;; + --sysconfdir* | --sy*) + sysconfdir=`echo ${optarg} | sed -e 's,/$,,'` ;; ++ --program-prefix* | --pro*) ++ program_prefix=`echo ${optarg} | sed -e 's,/$,,'` ;; + --no-create | --no-c*) + no_create=yes ;; + +@@ -188,6 +192,7 @@ + # to copy, distribute and modify it. + + progname = ${progname} ++program_prefix = ${program_prefix} + progversion = ${progversion} + VPATH = ${srcdir} + prefix = ${prefix} diff --git a/editors/ed/patches/patch-ab b/editors/ed/patches/patch-ab index 77abff3f110..18e95b92b0d 100644 --- a/editors/ed/patches/patch-ab +++ b/editors/ed/patches/patch-ab @@ -1,15 +1,54 @@ -$NetBSD: patch-ab,v 1.3 2006/03/20 18:15:38 jlam Exp $ +$NetBSD: patch-ab,v 1.4 2008/04/09 00:38:51 reed Exp $ ---- Makefile.in.orig 1994-11-19 04:45:32.000000000 -0800 -+++ Makefile.in 2005-10-15 16:09:14.000000000 -0700 -@@ -41,8 +41,8 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = $(exec_prefix)/bin --infodir = $(prefix)/info --mandir = $(prefix)/man/man1 -+infodir = $(prefix)/$(PKGINFODIR) -+mandir = $(prefix)/$(PKGMANDIR)/man1 - manext = .1 - - CPPFLAGS = -I. -I$(srcdir) $(DEFS) @CPPFLAGS@ +--- Makefile.in.orig 2007-08-05 13:45:46.000000000 -0500 ++++ Makefile.in 2008-04-08 12:57:13.000000000 -0500 +@@ -46,35 +46,35 @@ + + install : all install-info + if test ! -d $(DESTDIR)$(bindir) ; then $(INSTALL) -d $(DESTDIR)$(bindir) ; fi +- $(INSTALL_PROGRAM) ./$(progname) $(DESTDIR)$(bindir)/$(progname) +- -rm -f $(DESTDIR)$(bindir)/r$(progname) +- cd $(DESTDIR)$(bindir) ; ln $(progname) r$(progname) ++ $(INSTALL_PROGRAM) ./$(progname) $(DESTDIR)$(bindir)/$(program_prefix)$(progname) ++ -rm -f $(DESTDIR)$(bindir)/$(program_prefix)r$(progname) ++ cd $(DESTDIR)$(bindir) ; ln $(program_prefix)$(progname) $(program_prefix)r$(progname) + + install-info : + if test ! -d $(DESTDIR)$(infodir) ; then $(INSTALL) -d $(DESTDIR)$(infodir) ; fi +- $(INSTALL_DATA) $(VPATH)/doc/$(progname).info $(DESTDIR)$(infodir)/$(progname).info +- -install-info $(DESTDIR)$(infodir)/$(progname).info $(DESTDIR)$(infodir)/dir ++ $(INSTALL_DATA) $(VPATH)/doc/$(progname).info $(DESTDIR)$(infodir)/$(program_prefix)$(progname).info ++ -install-info $(DESTDIR)$(infodir)/$(program_prefix)$(progname).info $(DESTDIR)$(infodir)/dir + + install-man : + if test ! -d $(DESTDIR)$(mandir)/man1 ; then $(INSTALL) -d $(DESTDIR)$(mandir)/man1 ; fi +- $(INSTALL_DATA) $(VPATH)/doc/$(progname).1 $(DESTDIR)$(mandir)/man1/$(progname).1 +- -rm -f $(DESTDIR)$(mandir)/man1/r$(progname).1 +- cd $(DESTDIR)$(mandir)/man1 ; ln $(progname).1 r$(progname).1 ++ $(INSTALL_DATA) $(VPATH)/doc/$(progname).1 $(DESTDIR)$(mandir)/man1/$(program_prefix)$(progname).1 ++ -rm -f $(DESTDIR)$(mandir)/man1/$(program_prefix)r$(progname).1 ++ cd $(DESTDIR)$(mandir)/man1 ; ln $(program_prefix)$(progname).1 $(program_prefix)r$(progname).1 + + install-strip : all + $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install + + uninstall : uninstall-info +- -rm -f $(DESTDIR)$(bindir)/$(progname) +- -rm -f $(DESTDIR)$(bindir)/r$(progname) ++ -rm -f $(DESTDIR)$(bindir)/$(program_prefix)$(progname) ++ -rm -f $(DESTDIR)$(bindir)/$(program_prefix)r$(progname) + + uninstall-info : +- -install-info --remove $(DESTDIR)$(infodir)/$(progname).info $(DESTDIR)$(infodir)/dir +- -rm -f $(DESTDIR)$(infodir)/$(progname).info ++ -install-info --remove $(DESTDIR)$(infodir)/$(program_prefix)$(progname).info $(DESTDIR)$(infodir)/dir ++ -rm -f $(DESTDIR)$(infodir)/$(program_prefix)$(progname).info + + uninstall-man : +- -rm -f $(DESTDIR)$(mandir)/man1/$(progname).1 +- -rm -f $(DESTDIR)$(mandir)/man1/r$(progname).1 ++ -rm -f $(DESTDIR)$(mandir)/man1/$(program_prefix)$(progname).1 ++ -rm -f $(DESTDIR)$(mandir)/man1/$(program_prefix)r$(progname).1 + + dist : + ln -sf . $(DISTNAME) -- cgit v1.2.3