pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Update textproc/nbsed to 20040821 (date of import from...
details: https://anonhg.NetBSD.org/pkgsrc/rev/1ee40f79f793
branches: trunk
changeset: 479707:1ee40f79f793
user: jlam <jlam%pkgsrc.org@localhost>
date: Sat Aug 21 08:39:54 2004 +0000
description:
Update textproc/nbsed to 20040821 (date of import from src HEAD).
Changes from the previous version include:
- Adding a sed2nbcompat script to ease importing from src HEAD into
pkgsrc.
- Make this package depend on libnbcompat since it needs a regex
implementation and it's also a bootstrap package.
* s/xmalloc/xrealloc/ so that large (greater than _POSIX2_LINE_MAX*2-1)
multi line text can be added.
diffstat:
doc/CHANGES | 3 +-
textproc/nbsed/Makefile | 6 +-
textproc/nbsed/files/TEST/sed.test | 8 +-
textproc/nbsed/files/compile.c | 43 +-
textproc/nbsed/files/config.h.in | 18 +-
textproc/nbsed/files/configure | 1186 +++++++++++++++++++++++------------
textproc/nbsed/files/configure.ac | 10 +-
textproc/nbsed/files/main.c | 46 +-
textproc/nbsed/files/misc.c | 30 +-
textproc/nbsed/files/process.c | 84 +-
textproc/nbsed/files/sed2nbcompat | 63 +
11 files changed, 1003 insertions(+), 494 deletions(-)
diffs (truncated from 3193 to 300 lines):
diff -r ad4848e299b2 -r 1ee40f79f793 doc/CHANGES
--- a/doc/CHANGES Sat Aug 21 07:01:02 2004 +0000
+++ b/doc/CHANGES Sat Aug 21 08:39:54 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.6960 2004/08/21 07:01:02 schmonz Exp $
+$NetBSD: CHANGES,v 1.6961 2004/08/21 08:39:59 jlam Exp $
Changes to the packages collection and infrastructure in 2004:
@@ -3927,3 +3927,4 @@
Updated pax to 20040802 [jlam 2004-08-21]
Updated mtree to 20040722 [jlam 2004-08-21]
Updated memtester to 4.0.3 [schmonz 2004-08-21]
+ Updated nbsed to 20040821 [jlam 2004-08-21]
diff -r ad4848e299b2 -r 1ee40f79f793 textproc/nbsed/Makefile
--- a/textproc/nbsed/Makefile Sat Aug 21 07:01:02 2004 +0000
+++ b/textproc/nbsed/Makefile Sat Aug 21 08:39:54 2004 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2004/07/25 05:42:30 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/08/21 08:39:54 jlam Exp $
-DISTNAME= nbsed-20040725
+DISTNAME= nbsed-20040821
CATEGORIES= textproc pkgtools
MASTER_SITES= # empty
DISTFILES= # empty
@@ -10,11 +10,11 @@
COMMENT= NetBSD-current's sed(1)
NO_CHECKSUM= # defined
-
GNU_CONFIGURE= # defined
post-extract:
${MKDIR} ${WRKSRC}
cd ${FILESDIR} && ${PAX} -rwpe . ${WRKSRC}
+.include "../../pkgtools/libnbcompat/inplace.mk"
.include "../../mk/bsd.pkg.mk"
diff -r ad4848e299b2 -r 1ee40f79f793 textproc/nbsed/files/TEST/sed.test
--- a/textproc/nbsed/files/TEST/sed.test Sat Aug 21 07:01:02 2004 +0000
+++ b/textproc/nbsed/files/TEST/sed.test Sat Aug 21 08:39:54 2004 +0000
@@ -1,5 +1,5 @@
#!/bin/sh -
-# $NetBSD: sed.test,v 1.1.1.1 2003/08/18 17:35:00 agc Exp $
+# $NetBSD: sed.test,v 1.2 2004/08/21 08:39:54 jlam Exp $
#
# Copyright (c) 1992 Diomidis Spinellis.
# Copyright (c) 1992, 1993
@@ -34,7 +34,7 @@
# SUCH DAMAGE.
#
# from: @(#)sed.test 8.1 (Berkeley) 6/6/93
-# $NetBSD: sed.test,v 1.1.1.1 2003/08/18 17:35:00 agc Exp $
+# $NetBSD: sed.test,v 1.2 2004/08/21 08:39:54 jlam Exp $
#
# sed Regression Tests
@@ -513,7 +513,7 @@
test_error()
{
- exec 0>&3 4>&1 5>&2
+ exec 3<&0 4>&1 5>&2
exec 0</dev/null
exec 2>&1
set -x
@@ -548,7 +548,7 @@
$TEST '!' && exit 1
$TEST supercalifrangolisticexprialidociussupercalifrangolisticexcius
set +x
- exec 0>&3 1>&4 2>&5
+ exec 0<&3 1>&4 2>&5
}
main
diff -r ad4848e299b2 -r 1ee40f79f793 textproc/nbsed/files/compile.c
--- a/textproc/nbsed/files/compile.c Sat Aug 21 07:01:02 2004 +0000
+++ b/textproc/nbsed/files/compile.c Sat Aug 21 08:39:54 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: compile.c,v 1.5 2004/07/25 05:40:08 grant Exp $ */
+/* $NetBSD: compile.c,v 1.6 2004/08/21 08:39:54 jlam Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -67,41 +67,52 @@
* SUCH DAMAGE.
*/
+#if HAVE_CONFIG_H
#include "config.h"
-
-#ifdef HAVE_SYS_CDEFS_H
+#endif
+#include <nbcompat.h>
+#if HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
#endif
-
#ifndef lint
#if 0
static char sccsid[] = "@(#)compile.c 8.2 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: compile.c,v 1.5 2004/07/25 05:40:08 grant Exp $");
+__RCSID("$NetBSD: compile.c,v 1.6 2004/08/21 08:39:54 jlam Exp $");
#endif
#endif /* not lint */
+#if HAVE_SYS_TYPES_H
#include <sys/types.h>
+#endif
+#if HAVE_SYS_STAT_H
#include <sys/stat.h>
-
-#include <ctype.h>
-#include <errno.h>
-
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
#endif
-#ifdef HAVE_LIMITS_H
+#if HAVE_CTYPE_H
+#include <ctype.h>
+#endif
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
+#if HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+#if HAVE_LIMITS_H
#include <limits.h>
#endif
-
-#ifdef HAVE_REGEX_H
+#if HAVE_REGEX_H
#include <regex.h>
#endif
-
+#if HAVE_STDIO_H
#include <stdio.h>
+#endif
+#if HAVE_STDLIB_H
#include <stdlib.h>
+#endif
+#if HAVE_STRING_H
#include <string.h>
+#endif
#include "defs.h"
#include "extern.h"
@@ -559,7 +570,7 @@
size += sp - op;
if (asize - size < _POSIX2_LINE_MAX + 1) {
asize *= 2;
- text = xmalloc(asize);
+ text = xrealloc(text, asize);
}
} while (cu_fgets(p = lbuf, sizeof(lbuf)));
err(COMPILE, "unterminated substitute in regular expression");
diff -r ad4848e299b2 -r 1ee40f79f793 textproc/nbsed/files/config.h.in
--- a/textproc/nbsed/files/config.h.in Sat Aug 21 07:01:02 2004 +0000
+++ b/textproc/nbsed/files/config.h.in Sat Aug 21 08:39:54 2004 +0000
@@ -19,6 +19,9 @@
/* Define to 1 if you have the <errno.h> header file. */
#undef HAVE_ERRNO_H
+/* Define to 1 if you have the <err.h> header file. */
+#undef HAVE_ERR_H
+
/* Define to 1 if you have the <fcntl.h> header file. */
#undef HAVE_FCNTL_H
@@ -58,12 +61,18 @@
/* Define to 1 if you have the `setprogname' function. */
#undef HAVE_SETPROGNAME
+/* Define to 1 if you have the <stdarg.h> header file. */
+#undef HAVE_STDARG_H
+
/* Define to 1 if you have the <stddef.h> header file. */
#undef HAVE_STDDEF_H
/* 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. */
+#undef HAVE_STDIO_H
+
/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
@@ -85,9 +94,6 @@
/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
-/* Define to 1 if you have the <sys/termios.h> header file. */
-#undef HAVE_SYS_TERMIOS_H
-
/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
@@ -124,9 +130,11 @@
/* Define to empty if `const' does not conform to ANSI C. */
#undef const
-/* Define as `__inline' if that's what the C compiler calls it, or to nothing
- if it is not supported. */
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+ calls it, or to nothing if 'inline' is not supported under any name. */
+#ifndef __cplusplus
#undef inline
+#endif
/* Define to `unsigned' if <sys/types.h> does not define. */
#undef size_t
diff -r ad4848e299b2 -r 1ee40f79f793 textproc/nbsed/files/configure
--- a/textproc/nbsed/files/configure Sat Aug 21 07:01:02 2004 +0000
+++ b/textproc/nbsed/files/configure Sat Aug 21 08:39:54 2004 +0000
@@ -1,11 +1,10 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.57 for nbsed 20031016.
+# Generated by GNU Autoconf 2.59 for nbsed 20040821.
#
# Report bugs to <agc%NetBSD.org@localhost>.
#
-# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 2003 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
## --------------------- ##
@@ -22,9 +21,10 @@
elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
set -o posix
fi
+DUALCASE=1; export DUALCASE # for MKS sh
# Support unset when possible.
-if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
as_unset=unset
else
as_unset=false
@@ -43,7 +43,7 @@
LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
LC_TELEPHONE LC_TIME
do
- if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
$as_unset $as_var
@@ -220,16 +220,17 @@
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
else
+ test -d ./-p && rmdir ./-p
as_mkdir_p=false
fi
as_executable_p="test -f"
# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
# Sed expression to map a string onto a valid variable name.
-as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
# IFS
@@ -268,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='nbsed'
PACKAGE_TARNAME='nbsed'
-PACKAGE_VERSION='20031016'
-PACKAGE_STRING='nbsed 20031016'
+PACKAGE_VERSION='20040821'
+PACKAGE_STRING='nbsed 20040821'
PACKAGE_BUGREPORT='agc%NetBSD.org@localhost'
ac_unique_file="main.c"
@@ -669,7 +670,7 @@
# Be sure to have absolute paths.
for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
- localstatedir libdir includedir oldincludedir infodir mandir
+ localstatedir libdir includedir oldincludedir infodir mandir
do
eval ac_val=$`echo $ac_var`
case $ac_val in
@@ -709,10 +710,10 @@
# Try the directory containing this script, then its parent.
ac_confdir=`(dirname "$0") 2>/dev/null ||
$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$0" : 'X\(//\)[^/]' \| \
Home |
Main Index |
Thread Index |
Old Index