Re: Compilation failure with ncurses 5.2 patchlevel 20020427

[Thomas Dickey]

On Mon, Apr 29, 2002 at 11:57:11AM -0500, Andy Tsouladze wrote:
> Hello,
> 
> I am trying to compile the latest ncurses-5.2 release with patches, and
> there are problems.
> 
> If I patch up to ncurses-5.2-20020323 patch, everything is fine. However,
> if I use the latest patch 20020427, compilation fails. I have not tried
> anything in between these two patchlevels.

Here's a fix

# ------------------------------------------------------------------------------
# NEWS                      |    5 +++++
# dist.mk                   |    4 ++--
# ncurses/base/MKlib_gen.sh |    5 ++---
# 3 files changed, 9 insertions(+), 5 deletions(-)
# ------------------------------------------------------------------------------
Index: NEWS
Prereq:  1.683 
--- ncurses-5.2-20020427+/NEWS  Sat Apr 27 18:51:36 2002
+++ ncurses-5.2-20020429/NEWS   Mon Apr 29 20:40:55 2002
@@ -1,10 +1,14 @@
--- $Id: NEWS,v 1.683 2002/04/27 22:51:36 tom Exp $
+-- $Id: NEWS,v 1.684 2002/04/30 00:40:55 tom Exp $
 
 This is a log of changes that ncurses has gone through since Zeyd started
 working with Pavel Curtis' original work, pcurses, in 1992.
 
 Changes through 1.9.9e are recorded by Zeyd M. Ben-Halim.
 Changes since 1.9.9e are recorded by Thomas Dickey.
+
+20020429
+       + workaround for Solaris sed with MKlib_gen.sh (reported by Andy
+         Tsouladze <address@hidden>).
 
 20020427
        + correct return-value from getcchar(), making it consistent with
Index: dist.mk
Prereq:  1.300 
--- ncurses-5.2-20020427+/dist.mk       Sat Apr 20 11:39:38 2002
+++ ncurses-5.2-20020429/dist.mk        Mon Apr 29 20:41:44 2002
@@ -1,4 +1,4 @@
-# $Id: dist.mk,v 1.300 2002/04/20 15:39:38 tom Exp $
+# $Id: dist.mk,v 1.301 2002/04/30 00:41:44 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -10,7 +10,7 @@
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 5
 NCURSES_MINOR = 2
-NCURSES_PATCH = 20020420
+NCURSES_PATCH = 20020429
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
Index: ncurses/base/MKlib_gen.sh
Prereq:  1.17 
--- ncurses-5.2-20020427+/ncurses/base/MKlib_gen.sh     Sun Apr 21 13:54:17 2002
+++ ncurses-5.2-20020429/ncurses/base/MKlib_gen.sh      Mon Apr 29 20:37:55 2002
@@ -2,7 +2,7 @@
 #
 # MKlib_gen.sh -- generate sources from curses.h macro definitions
 #
-# ($Id: MKlib_gen.sh,v 1.17 2002/04/21 17:54:17 tom Exp $)
+# ($Id: MKlib_gen.sh,v 1.18 2002/04/30 00:37:55 tom Exp $)
 #
 ##############################################################################
 # Copyright (c) 1998-2001,2002 Free Software Foundation, Inc.                #
@@ -376,8 +376,7 @@
 | sed -e 's/NCURSES_EXPORT(\(.*\)) \(.*\) (\(.*\))/\1 \2(\3)/' \
 | sed -f $ED2 \
 | $AWK -f $AW1 using=$USE \
-| sed \
-       -e '/^\([a-z_][a-z_]*\( \*\)*\) /s//\1 gen_/' >>$TMP
+| sed -e 's/^\([a-z_][a-z_]*[ *]*\)/\1 gen_/' -e 's/  / /g' >>$TMP
 
 $preprocessor $TMP 2>/dev/null \
 | sed -e 's/  / /g' -e 's/^ //' \
-- 
Thomas E. Dickey <address@hidden>
http://invisible-island.net
ftp://invisible-island.net