[pkgsrc/trunk]: pkgsrc/devel/ddd Fix brokeness in the included "libiberty" (L...

[tron <tron%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/47bea4d481ef
branches:  trunk
changeset: 461916:47bea4d481ef
user:      tron <tron%pkgsrc.org@localhost>
date:      Tue Sep 23 18:40:05 2003 +0000

description:
Fix brokeness in the included "libiberty" (Lubomir Sedlacik provided
the autoconfig fixes) and a "configure" botch so that this package
finally builds with NetBSD-current GCC 3.3.1.

diffstat:

 devel/ddd/distinfo         |     8 +-
 devel/ddd/patches/patch-ac |    15 +-
 devel/ddd/patches/patch-ad |   127 +
 devel/ddd/patches/patch-ae |  8057 ++++++++++++++++++++++++++++++++++++++++++++
 devel/ddd/patches/patch-af |    25 +
 devel/ddd/patches/patch-ag |    31 +
 6 files changed, 8258 insertions(+), 5 deletions(-)

diffs (truncated from 8300 to 300 lines):

diff -r e2e96a46d5a5 -r 47bea4d481ef devel/ddd/distinfo
--- a/devel/ddd/distinfo        Tue Sep 23 18:26:05 2003 +0000
+++ b/devel/ddd/distinfo        Tue Sep 23 18:40:05 2003 +0000
@@ -1,7 +1,11 @@
-$NetBSD: distinfo,v 1.9 2003/09/12 21:02:11 tron Exp $
+$NetBSD: distinfo,v 1.10 2003/09/23 18:40:05 tron Exp $
 
 SHA1 (ddd-3.3.7.tar.gz) = d2a4fcf2bace28ef7d7dfef6903251822345cc21
 Size (ddd-3.3.7.tar.gz) = 14840534 bytes
 SHA1 (patch-aa) = 6f8ce32d8aafd06cfa72e1dcb19d516183098a41
 SHA1 (patch-ab) = fcf7b99706479ea27d95649aa228efeb3eb042ff
-SHA1 (patch-ac) = 027ca5635790be9cd50f28dad541bc790087b456
+SHA1 (patch-ac) = 43ba8976ef093dccd37ecbe49fe01570a731f508
+SHA1 (patch-ad) = 3953f9e62a1e46c086166e1208cf1736f5809457
+SHA1 (patch-ae) = 281150c1bc7605901425b10c99f5457927675183
+SHA1 (patch-af) = 6685e383354997ddcca443d96c2cb9062ef4d322
+SHA1 (patch-ag) = d61956f73a7622868c89b23bafb4b09250a16f97
diff -r e2e96a46d5a5 -r 47bea4d481ef devel/ddd/patches/patch-ac
--- a/devel/ddd/patches/patch-ac        Tue Sep 23 18:26:05 2003 +0000
+++ b/devel/ddd/patches/patch-ac        Tue Sep 23 18:40:05 2003 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.3 2003/09/12 21:02:11 tron Exp $
+$NetBSD: patch-ac,v 1.4 2003/09/23 18:40:06 tron Exp $
 
---- configure.old      Tue Jun  3 13:35:36 2003
-+++ configure  Fri Sep 12 22:56:55 2003
+--- configure.orig     2003-06-03 13:35:36.000000000 +0200
++++ configure  2003-09-23 20:19:31.000000000 +0200
 @@ -3466,7 +3466,7 @@
  if test "${ddd_cv_compface_xbm+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11,3 +11,12 @@
         ddd_cv_compface_xbm=yes; else ddd_cv_compface_xbm=no; fi
  fi
  echo "$as_me:$LINENO: result: $ddd_cv_compface_xbm" >&5
+@@ -28536,7 +28536,7 @@
+ ice_cv_have_strsignal_decl=no
+ ice_re_params='[a-zA-Z_][a-zA-Z0-9_]*'
+ ice_re_word='(^|[^a-zA-Z_0-9_])'
+-for header in string.h; do
++for header in string.h unistd.h; do
+ # Check for ordinary declaration
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
diff -r e2e96a46d5a5 -r 47bea4d481ef devel/ddd/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/ddd/patches/patch-ad        Tue Sep 23 18:40:05 2003 +0000
@@ -0,0 +1,127 @@
+$NetBSD: patch-ad,v 1.1 2003/09/23 18:40:06 tron Exp $
+
+--- libiberty/configure.in.orig        2003-03-03 01:48:39.000000000 +0100
++++ libiberty/configure.in     2003-09-22 14:11:57.000000000 +0200
+@@ -1,6 +1,6 @@
+ dnl Process this file with autoconf to produce a configure script
+ 
+-AC_PREREQ(2.13)
++AC_PREREQ(2.57)
+ AC_INIT(pexecute.c)
+ 
+ dnl We use these options to decide which functions to include.
+@@ -36,51 +36,14 @@
+ AC_CHECK_TOOL(AR, ar)
+ AC_CHECK_TOOL(RANLIB, ranlib, :)
+ 
+-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
+-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
+-# are probably using a cross compiler, which will not be able to fully
+-# link an executable.  This should really be fixed in autoconf
+-# itself.
+-
+-AC_DEFUN(LIB_AC_PROG_CC,
+-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
+-AC_PROVIDE([AC_PROG_CC])
+-AC_CHECK_PROG(CC, gcc, gcc)
+-if test -z "$CC"; then
+-  AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
+-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
+-fi
+-
+-AC_PROG_CC_GNU
++AC_PROG_CC
+ 
+-if test $ac_cv_prog_gcc = yes; then
+-  GCC=yes
++if test x$GCC = xyes; then
+   ac_libiberty_warn_cflags='-W -Wall -Wtraditional'
+-dnl Check whether -g works, even if CFLAGS is set, in case the package
+-dnl plays around with CFLAGS (such as to build both debugging and
+-dnl normal versions of a library), tasteless as that idea is.
+-  ac_test_CFLAGS="${CFLAGS+set}"
+-  ac_save_CFLAGS="$CFLAGS"
+-  CFLAGS=
+-  AC_PROG_CC_G
+-  if test "$ac_test_CFLAGS" = set; then
+-    CFLAGS="$ac_save_CFLAGS"
+-  elif test $ac_cv_prog_cc_g = yes; then
+-    CFLAGS="-g -O2"
+-  else
+-    CFLAGS="-O2"
+-  fi
+-else
+-  GCC=
+-  ac_libiberty_warn_cflags=
+-  test "${CFLAGS+set}" = set || CFLAGS="-g"
+ fi
+-])
+ AC_SUBST(ac_libiberty_warn_cflags)
+ 
+-LIB_AC_PROG_CC
+-
+-AC_ISC_POSIX
++AC_PROG_CC_C_O
+ 
+ dnl When we start using libtool:
+ dnl Default to a non shared library.  This may be overridden by the
+@@ -195,7 +158,12 @@
+ 
+   if test "x${with_newlib}" = "xyes"; then
+     ALLOCA="alloca.o"
+-    LIBOBJS="asprintf.o basename.o insque.o random.o strdup.o vasprintf.o"
++    AC_LIBOBJ([asprintf])
++    AC_LIBOBJ([basename])
++    AC_LIBOBJ([insque])
++    AC_LIBOBJ([random])
++    AC_LIBOBJ([strdup])
++    AC_LIBOBJ([vasprintf])
+ 
+     for f in $funcs; do
+       case "$f" in
+@@ -234,8 +202,16 @@
+     # Handle VxWorks configuration specially, since on VxWorks the
+     # libraries are actually on the target board, not in the file
+     # system.
+-    LIBOBJS="basename.o getpagesize.o insque.o random.o strcasecmp.o"
+-    LIBOBJS="$LIBOBJS strncasecmp.o strdup.o vfork.o waitpid.o vasprintf.o"
++    AC_LIBOBJ([basename])
++    AC_LIBOBJ([getpagesize])
++    AC_LIBOBJ([insque])
++    AC_LIBOBJ([random])
++    AC_LIBOBJ([strcasecmp])
++    AC_LIBOBJ([strncasecmp])
++    AC_LIBOBJ([strdup])
++    AC_LIBOBJ([vfork])
++    AC_LIBOBJ([waitpid])
++    AC_LIBOBJ([vasprintf])
+     for f in $funcs; do
+       case "$f" in
+       basename | getpagesize | insque | random | strcasecmp)
+@@ -278,7 +254,7 @@
+     # missing.
+ 
+     funcs="`echo $funcs | sed -e 's/random//'`"
+-    LIBOBJS="$LIBOBJS random.o"
++    AC_LIBOBJ([random])
+     vars="`echo $vars | sed -e 's/sys_siglist//'`"
+     checkfuncs="`echo $checkfuncs | sed -e 's/strsignal//' -e 's/psignal//'`"
+     ;;
+@@ -307,7 +283,7 @@
+ 
+   # We haven't set the list of objects yet.  Use the standard autoconf
+   # tests.  This will only work if the compiler works.
+-  AC_PROG_CC_WORKS
++  AC_ISC_POSIX
+   AC_REPLACE_FUNCS($funcs)
+ 
+   case "${host}" in
+@@ -333,7 +309,7 @@
+ 
+   AC_FUNC_VFORK
+   if test $ac_cv_func_vfork_works = no; then
+-    LIBOBJS="$LIBOBJS vfork.o"
++    AC_LIBOBJ([vfork])
+   fi
+   for v in $vars; do
+     AC_MSG_CHECKING([for $v])
diff -r e2e96a46d5a5 -r 47bea4d481ef devel/ddd/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/ddd/patches/patch-ae        Tue Sep 23 18:40:05 2003 +0000
@@ -0,0 +1,8057 @@
+$NetBSD: patch-ae,v 1.1 2003/09/23 18:40:06 tron Exp $
+
+--- libiberty/configure.orig   2003-03-03 01:48:39.000000000 +0100
++++ libiberty/configure        2003-09-22 14:12:04.000000000 +0200
+@@ -1,32 +1,324 @@
+ #! /bin/sh
+-
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated automatically using autoconf version 2.13 
+-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
++# Generated by GNU Autoconf 2.57.
+ #
++# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This configure script is free software; the Free Software Foundation
+ # gives unlimited permission to copy, distribute and modify it.
++## --------------------- ##
++## M4sh Initialization.  ##
++## --------------------- ##
++
++# Be Bourne compatible
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++  emulate sh
++  NULLCMD=:
++  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++  # is contrary to our usage.  Disable this feature.
++  alias -g '${1+"$@"}'='"$@"'
++elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
++  set -o posix
++fi
++
++# Support unset when possible.
++if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
++  as_unset=unset
++else
++  as_unset=false
++fi
++
++
++# Work around bugs in pre-3.0 UWIN ksh.
++$as_unset ENV MAIL MAILPATH
++PS1='$ '
++PS2='> '
++PS4='+ '
++
++# NLS nuisances.
++for as_var in \
++  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
++  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
++    eval $as_var=C; export $as_var
++  else
++    $as_unset $as_var
++  fi
++done
++
++# Required to use basename.
++if expr a : '\(a\)' >/dev/null 2>&1; then
++  as_expr=expr
++else
++  as_expr=false
++fi
++
++if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
++  as_basename=basename
++else
++  as_basename=false
++fi
++
++
++# Name of the executable.
++as_me=`$as_basename "$0" ||
++$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
++       X"$0" : 'X\(//\)$' \| \
++       X"$0" : 'X\(/\)$' \| \
++       .     : '\(.\)' 2>/dev/null ||
++echo X/"$0" |
++    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
++        /^X\/\(\/\/\)$/{ s//\1/; q; }
++        /^X\/\(\/\).*/{ s//\1/; q; }
++        s/.*/./; q'`
++
++
++# PATH needs CR, and LINENO needs CR and PATH.
++# Avoid depending upon Character Ranges.
++as_cr_letters='abcdefghijklmnopqrstuvwxyz'
++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
++as_cr_Letters=$as_cr_letters$as_cr_LETTERS
++as_cr_digits='0123456789'
++as_cr_alnum=$as_cr_Letters$as_cr_digits
++
++# The user is always right.
++if test "${PATH_SEPARATOR+set}" != set; then
++  echo "#! /bin/sh" >conf$$.sh
++  echo  "exit 0"   >>conf$$.sh
++  chmod +x conf$$.sh
++  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
++    PATH_SEPARATOR=';'
++  else
++    PATH_SEPARATOR=:
++  fi
++  rm -f conf$$.sh
++fi
++
++
++  as_lineno_1=$LINENO
++  as_lineno_2=$LINENO
++  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
++  test "x$as_lineno_1" != "x$as_lineno_2" &&
++  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
++  # Find who we are.  Look in the path if we contain no path at all
++  # relative or not.
++  case $0 in
++    *[\\/]* ) as_myself=$0 ;;
++    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.