[pkgsrc/trunk]: pkgsrc/textproc/nbsed Simplify the import structure by keepin...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/textproc/nbsed Simplify the import structure by keepin...
From: jlam <jlam%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 00:30:32 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/6c325f407d22
branches:  trunk
changeset: 479955:6c325f407d22
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Aug 27 03:45:08 2004 +0000

description:
Simplify the import structure by keeping the "sed" name, and using the
configure script's --program-transform-name to install as "nbsed".  Also
add a cat-ready nbsed.0 file.

diffstat:

 textproc/nbsed/Makefile           |   22 +-
 textproc/nbsed/PLIST              |    3 +-
 textproc/nbsed/files/Makefile.in  |   30 +-
 textproc/nbsed/files/configure    |   20 +-
 textproc/nbsed/files/configure.ac |    4 +-
 textproc/nbsed/files/nbsed.1      |  514 --------------------------------------
 textproc/nbsed/files/sed.1        |  514 ++++++++++++++++++++++++++++++++++++++
 textproc/nbsed/files/sed.cat1     |  326 ++++++++++++++++++++++++
 textproc/nbsed/files/sed2nbcompat |   13 +-
 9 files changed, 888 insertions(+), 558 deletions(-)

diffs (truncated from 1597 to 300 lines):

diff -r 3ad22677a25b -r 6c325f407d22 textproc/nbsed/Makefile
--- a/textproc/nbsed/Makefile   Fri Aug 27 03:19:29 2004 +0000
+++ b/textproc/nbsed/Makefile   Fri Aug 27 03:45:08 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/08/21 08:39:54 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2004/08/27 03:45:08 jlam Exp $
 
 DISTNAME=              nbsed-20040821
 CATEGORIES=            textproc pkgtools
@@ -9,12 +9,20 @@
 HOMEPAGE=              http://www.NetBSD.org/
 COMMENT=               NetBSD-current's sed(1)
 
-NO_CHECKSUM=           # defined
-GNU_CONFIGURE=         # defined
+USE_BUILDLINK3=                yes
+NO_CHECKSUM=           yes
+GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --program-transform-name="s,sed,nbsed,"
+
+.include "../../mk/bsd.prefs.mk"
 
-post-extract:
-       ${MKDIR} ${WRKSRC}
-       cd ${FILESDIR} && ${PAX} -rwpe . ${WRKSRC}
+.if defined(LIBNBCOMPAT_STYLE) && (${LIBNBCOMPAT_STYLE} == "inplace")  
+.  include "../../pkgtools/libnbcompat/inplace.mk"
+.else
+.  include "../../pkgtools/libnbcompat/buildlink3.mk"
+.endif
 
-.include "../../pkgtools/libnbcompat/inplace.mk"
+do-extract:
+       @${CP} -Rp ${FILESDIR} ${WRKSRC}
+
 .include "../../mk/bsd.pkg.mk"
diff -r 3ad22677a25b -r 6c325f407d22 textproc/nbsed/PLIST
--- a/textproc/nbsed/PLIST      Fri Aug 27 03:19:29 2004 +0000
+++ b/textproc/nbsed/PLIST      Fri Aug 27 03:45:08 2004 +0000
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/08/18 17:34:54 agc Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/08/27 03:45:08 jlam Exp $
 bin/nbsed
+man/cat1/nbsed.0
 man/man1/nbsed.1
diff -r 3ad22677a25b -r 6c325f407d22 textproc/nbsed/files/Makefile.in
--- a/textproc/nbsed/files/Makefile.in  Fri Aug 27 03:19:29 2004 +0000
+++ b/textproc/nbsed/files/Makefile.in  Fri Aug 27 03:45:08 2004 +0000
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.3 2004/08/23 02:58:58 jlam Exp $
+# $Id: Makefile.in,v 1.4 2004/08/27 03:45:08 jlam Exp $
 
 @SET_MAKE@
 SHELL = @SHELL@
@@ -52,16 +52,16 @@
 .c.o:
        $(COMPILE) -c $< -o $@
 
-all: nbsed
+all: sed
 
-nbsed: $(OBJS)
+sed: $(OBJS)
        $(LINK) $(OBJS) $(LIBS)
 
-check: nbsed
+check: sed
        @SHELL@ $(srcdir)/regress.sh
 
 clean:
-       rm -f *.o nbsed
+       rm -f *.o sed
 
 distclean: clean
        rm -f Makefile config.h
@@ -70,18 +70,22 @@
 maintainer-clean: distclean
        rm -f configure config.h.in
 
-install: nbsed
+install: sed
        $(mkinstalldirs) $(DESTDIR)$(bindir)
-       @f=`echo nbsed|sed '$(transform)'`; \
-       echo "$(INSTALL_PROGRAM) nbsed $(DESTDIR)$(bindir)/$$f"; \
-       $(INSTALL_PROGRAM) nbsed $(DESTDIR)$(bindir)/$$f
+       @f=`echo sed|sed '$(transform)'`; \
+       echo "$(INSTALL_PROGRAM) sed $(DESTDIR)$(bindir)/$$f"; \
+       $(INSTALL_PROGRAM) sed $(DESTDIR)$(bindir)/$$f
        $(mkinstalldirs) $(DESTDIR)$(mandir)/man1
-       @f=`echo nbsed.1|sed '$(transform)'`; \
-       echo "$(INSTALL_DATA) nbsed.1 $(DESTDIR)$(mandir)/man1/$$f"; \
-       $(INSTALL_DATA) nbsed.1 $(DESTDIR)$(mandir)/man1/$$f
+       @f=`echo sed.1|sed '$(transform)'`; \
+       echo "$(INSTALL_DATA) sed.1 $(DESTDIR)$(mandir)/man1/$$f"; \
+       $(INSTALL_DATA) sed.1 $(DESTDIR)$(mandir)/man1/$$f
+       $(mkinstalldirs) $(DESTDIR)$(mandir)/cat1
+       @f=`echo sed.cat1|sed '$(transform);s,\.cat1$$,.0,'`; \
+       echo "$(INSTALL_DATA) sed.cat1 $(DESTDIR)$(mandir)/cat1/$$f"; \
+       $(INSTALL_DATA) sed.cat1 $(DESTDIR)$(mandir)/cat1/$$f
 
 uninstall:
-       @f=`echo nbsed|sed '$(transform)'`; \
+       @f=`echo sed|sed '$(transform)'`; \
        echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
        rm -f $(DESTDIR)$(bindir)/$$f
 
diff -r 3ad22677a25b -r 6c325f407d22 textproc/nbsed/files/configure
--- a/textproc/nbsed/files/configure    Fri Aug 27 03:19:29 2004 +0000
+++ b/textproc/nbsed/files/configure    Fri Aug 27 03:45:08 2004 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for nbsed 20040821.
+# Generated by GNU Autoconf 2.59 for sed 20040821.
 #
 # Report bugs to <agc%NetBSD.org@localhost>.
 #
@@ -267,10 +267,10 @@
 : ${ac_max_here_lines=38}
 
 # Identity of this package.
-PACKAGE_NAME='nbsed'
-PACKAGE_TARNAME='nbsed'
+PACKAGE_NAME='sed'
+PACKAGE_TARNAME='sed'
 PACKAGE_VERSION='20040821'
-PACKAGE_STRING='nbsed 20040821'
+PACKAGE_STRING='sed 20040821'
 PACKAGE_BUGREPORT='agc%NetBSD.org@localhost'
 
 ac_unique_file="main.c"
@@ -780,7 +780,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures nbsed 20040821 to adapt to many kinds of systems.
+\`configure' configures sed 20040821 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -846,7 +846,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of nbsed 20040821:";;
+     short | recursive ) echo "Configuration of sed 20040821:";;
    esac
   cat <<\_ACEOF
 
@@ -958,7 +958,7 @@
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-nbsed configure 20040821
+sed configure 20040821
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -972,7 +972,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by nbsed $as_me 20040821, which was
+It was created by sed $as_me 20040821, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -4973,7 +4973,7 @@
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by nbsed $as_me 20040821, which was
+This file was extended by sed $as_me 20040821, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5033,7 +5033,7 @@
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-nbsed config.status 20040821
+sed config.status 20040821
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
diff -r 3ad22677a25b -r 6c325f407d22 textproc/nbsed/files/configure.ac
--- a/textproc/nbsed/files/configure.ac Fri Aug 27 03:19:29 2004 +0000
+++ b/textproc/nbsed/files/configure.ac Fri Aug 27 03:45:08 2004 +0000
@@ -1,7 +1,7 @@
-dnl $Id: configure.ac,v 1.7 2004/08/23 02:58:58 jlam Exp $
+dnl $Id: configure.ac,v 1.8 2004/08/27 03:45:08 jlam Exp $
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.57)
-AC_INIT([nbsed],[20040821],[agc%NetBSD.org@localhost])
+AC_INIT([sed],[20040821],[agc%NetBSD.org@localhost])
 AC_CONFIG_SRCDIR([main.c])
 AC_CONFIG_HEADER(config.h)
 AC_ARG_PROGRAM
diff -r 3ad22677a25b -r 6c325f407d22 textproc/nbsed/files/nbsed.1
--- a/textproc/nbsed/files/nbsed.1      Fri Aug 27 03:19:29 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,514 +0,0 @@
-.\"    $NetBSD: nbsed.1,v 1.5 2004/07/25 05:40:25 grant Exp $
-.\"
-.\" Copyright (c) 1992, 1993
-.\"    The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the Institute of Electrical and Electronics Engineers, Inc.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"    @(#)sed.1       8.2 (Berkeley) 12/30/93
-.\"
-.Dd January 4, 2004
-.Dt SED 1
-.Os
-.Sh NAME
-.Nm sed
-.Nd stream editor
-.Sh SYNOPSIS
-.Nm
-.Op Fl aEn
-.Ar command
-.Op Ar file ...
-.Nm
-.Op Fl aEn
-.Op Fl e Ar command
-.Op Fl f Ar command_file
-.Op Ar file ...
-.Sh DESCRIPTION
-The
-.Nm
-utility reads the specified files, or the standard input if no files
-are specified, modifying the input as specified by a list of commands.
-The input is then written to the standard output.
-.Pp
-A single command may be specified as the first argument to
-.Nm .
-Multiple commands may be specified by using the
-.Fl e
-or
-.Fl f
-options.
-All commands are applied to the input in the order they are specified
-regardless of their origin.
-.Pp
-The following options are available:
-.Bl -tag -width indent
-.It Fl a
-The files listed as parameters for the
-.Dq w
-functions are created (or truncated) before any processing begins,
-by default.
-The
-.Fl a
-option causes
-.Nm
-to delay opening each file until a command containing the related
-.Dq w
-function is applied to a line of input.
-.It Fl E
-Enables the use of extended regular expressions instead of the
-usual basic regular expression syntax.
-.It Fl e Ar command
-Append the editing commands specified by the
-.Ar command
-argument
-to the list of commands.
-.It Fl f Ar command_file
-Append the editing commands found in the file
-.Ar command_file
-to the list of commands.
-The editing commands should each be listed on a separate line.
-.It Fl n
-By default, each line of input is echoed to the standard output after
-all of the commands have been applied to it.
-The
Prev by Date: [pkgsrc/trunk]: pkgsrc/net/ppp-lzs This is initial import of ppp-lzs-1.2.
Next by Date: [pkgsrc/trunk]: pkgsrc/doc Note rss2email update.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/net/ppp-lzs This is initial import of ppp-lzs-1.2.
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc Note rss2email update.
Indexes:
Home | Main Index | Thread Index | Old Index