[pkgsrc/trunk]: pkgsrc/cad/gattrib - use the configure output to decide if so...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/107fc060e10b
branches:  trunk
changeset: 481332:107fc060e10b
user:      dmcmahill <dmcmahill%pkgsrc.org@localhost>
date:      Sat Oct 02 00:50:14 2004 +0000

description:
- use the configure output to decide if some headers should be included.
- add some missing headers to get rid of various compiler warnings on
  alpha.

Patches have been fed back to the author.

diffstat:

 cad/gattrib/distinfo         |     8 +-
 cad/gattrib/patches/patch-aa |    41 +
 cad/gattrib/patches/patch-ab |    14 +
 cad/gattrib/patches/patch-ac |    20 +
 cad/gattrib/patches/patch-ad |    16 +
 cad/gattrib/patches/patch-ae |  2131 ++++++++++++++++++++++++++++++++++++++++++
 cad/gattrib/patches/patch-af |    24 +
 7 files changed, 2253 insertions(+), 1 deletions(-)

diffs (truncated from 2285 to 300 lines):

diff -r d916dc91c1b0 -r 107fc060e10b cad/gattrib/distinfo
--- a/cad/gattrib/distinfo      Fri Oct 01 23:05:22 2004 +0000
+++ b/cad/gattrib/distinfo      Sat Oct 02 00:50:14 2004 +0000
@@ -1,4 +1,10 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/09/29 12:48:51 wulf Exp $
+$NetBSD: distinfo,v 1.2 2004/10/02 00:50:14 dmcmahill Exp $
 
 SHA1 (geda/geda-gattrib-20040313.tar.gz) = d207b8fcce4886080dd1131a71a9605f19487114
 Size (geda/geda-gattrib-20040313.tar.gz) = 306618 bytes
+SHA1 (patch-aa) = df97d2d27834988028785eae698d8c8d3d4adfe8
+SHA1 (patch-ab) = d82a092dc31bbfb9cd6faebdd14b795cf526f8ff
+SHA1 (patch-ac) = 95e71e018be8ea1bd873dcbc8fd2afcfc074dc8d
+SHA1 (patch-ad) = 4f5741838f6bfe2c9e51b623bc29e64975cd967f
+SHA1 (patch-ae) = 5f7cf305db6cb4eb7c5b06a08978b462d15db3ef
+SHA1 (patch-af) = 0d954a0df28b7a1185161f3316c253babab3acda
diff -r d916dc91c1b0 -r 107fc060e10b cad/gattrib/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/cad/gattrib/patches/patch-aa      Sat Oct 02 00:50:14 2004 +0000
@@ -0,0 +1,41 @@
+$NetBSD: patch-aa,v 1.1 2004/10/02 00:50:14 dmcmahill Exp $
+
+--- src/x_fileselect.c.orig    Sun Feb 22 17:58:27 2004
++++ src/x_fileselect.c
+@@ -22,6 +22,10 @@
+  * by SDB for use in gattrib.
+  *------------------------------------------------------------------*/
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ /*------------------------------------------------------------------
+  * Includes required to run graphical widgets.
+  *------------------------------------------------------------------*/
+@@ -39,19 +43,19 @@
+  */
+ #include <sys/types.h>
+ 
+-/* #ifdef HAVE_SYS_PARAM_H */
++#ifdef HAVE_SYS_PARAM_H 
+ #include <sys/param.h>
+-/* #endif */
++#endif
+ 
+ #include <sys/stat.h>
+ 
+-/* #ifdef HAVE_UNISTD_H */
++#ifdef HAVE_UNISTD_H 
+ #include <unistd.h>
+-/* #endif */
++#endif 
+ 
+-/* #ifdef HAVE_DIRENT_H */
++#ifdef HAVE_DIRENT_H 
+ #include <dirent.h>
+-/* #endif */
++#endif 
+ 
+ #ifdef HAVE_STRING_H
+ #include <string.h>
diff -r d916dc91c1b0 -r 107fc060e10b cad/gattrib/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/cad/gattrib/patches/patch-ab      Sat Oct 02 00:50:14 2004 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-ab,v 1.1 2004/10/02 00:50:14 dmcmahill Exp $
+
+--- configure.ac.orig  Sat Mar 13 17:12:24 2004
++++ configure.ac
+@@ -126,7 +126,8 @@ AC_HEADER_STDC
+ AC_HEADER_SYS_WAIT
+ AC_HEADER_DIRENT
+ AC_CHECK_HEADERS(unistd.h string.h stdlib.h \
+-                 stdarg.h assert.h fcntl.h errno.h)
++                 stdarg.h assert.h fcntl.h errno.h \
++               dirent.h sys/param.h)
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
diff -r d916dc91c1b0 -r 107fc060e10b cad/gattrib/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/cad/gattrib/patches/patch-ac      Sat Oct 02 00:50:14 2004 +0000
@@ -0,0 +1,20 @@
+$NetBSD: patch-ac,v 1.1 2004/10/02 00:50:14 dmcmahill Exp $
+
+--- src/gtksheet.c.orig        Mon Jan 26 03:37:42 2004
++++ src/gtksheet.c
+@@ -20,7 +20,15 @@
+  * Boston, MA 02111-1307, USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
++
++#ifdef HAVE_STRING_H
+ #include <string.h>
++#endif
++
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <glib.h>
diff -r d916dc91c1b0 -r 107fc060e10b cad/gattrib/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/cad/gattrib/patches/patch-ad      Sat Oct 02 00:50:14 2004 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-ad,v 1.1 2004/10/02 00:50:14 dmcmahill Exp $
+
+--- src/x_gtksheet.c.orig      Sun Feb 22 19:00:23 2004
++++ src/x_gtksheet.c
+@@ -27,6 +27,11 @@
+ /*------------------------------------------------------------------
+  * Includes required to run graphical widgets.
+  *------------------------------------------------------------------*/
++
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <gtk/gtk.h>
diff -r d916dc91c1b0 -r 107fc060e10b cad/gattrib/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/cad/gattrib/patches/patch-ae      Sat Oct 02 00:50:14 2004 +0000
@@ -0,0 +1,2131 @@
+$NetBSD: patch-ae,v 1.1 2004/10/02 00:50:14 dmcmahill Exp $
+
+--- configure.orig     Sat Mar 13 17:12:46 2004
++++ configure
+@@ -1,9 +1,8 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.57.
++# Generated by GNU Autoconf 2.59.
+ #
+-# 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.
+ ## --------------------- ##
+@@ -20,9 +19,10 @@ if test -n "${ZSH_VERSION+set}" && (emul
+ 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
+@@ -41,7 +41,7 @@ for as_var in \
+   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
+@@ -218,16 +218,17 @@ rm -f conf$$ conf$$.exe conf$$.file
+ 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
+@@ -667,7 +668,7 @@ done
+ 
+ # 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
+@@ -707,10 +708,10 @@ if test -z "$srcdir"; then
+   # Try the directory containing this script, then its parent.
+   ac_confdir=`(dirname "$0") 2>/dev/null ||
+ $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+-         X"$0" : 'X\(//\)[^/]' \| \
+-         X"$0" : 'X\(//\)$' \| \
+-         X"$0" : 'X\(/\)' \| \
+-         .     : '\(.\)' 2>/dev/null ||
++       X"$0" : 'X\(//\)[^/]' \| \
++       X"$0" : 'X\(//\)$' \| \
++       X"$0" : 'X\(/\)' \| \
++       .     : '\(.\)' 2>/dev/null ||
+ echo X"$0" |
+     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+         /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+@@ -802,9 +803,9 @@ _ACEOF
+   cat <<_ACEOF
+ Installation directories:
+   --prefix=PREFIX         install architecture-independent files in PREFIX
+-                          [$ac_default_prefix]
++                        [$ac_default_prefix]
+   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+-                          [PREFIX]
++                        [PREFIX]
+ 
+ By default, \`make install' will install all the files in
+ \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+@@ -903,12 +904,45 @@ case $srcdir in
+     ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+     ac_top_srcdir=$ac_top_builddir$srcdir ;;
+ esac
+-# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+-# absolute.
+-ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+-ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+-ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+-ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
++
++# Do not use `cd foo && pwd` to compute absolute paths, because
++# the directories may not exist.
++case `pwd` in
++.) ac_abs_builddir="$ac_dir";;
++*)
++  case "$ac_dir" in
++  .) ac_abs_builddir=`pwd`;;
++  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
++  *) ac_abs_builddir=`pwd`/"$ac_dir";;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_top_builddir=${ac_top_builddir}.;;
++*)
++  case ${ac_top_builddir}. in
++  .) ac_abs_top_builddir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
++  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_srcdir=$ac_srcdir;;
++*)
++  case $ac_srcdir in
++  .) ac_abs_srcdir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
++  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_top_srcdir=$ac_top_srcdir;;
++*)
++  case $ac_top_srcdir in
++  .) ac_abs_top_srcdir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
++  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
++  esac;;
++esac
+ 
+     cd $ac_dir
+     # Check for guested configure; otherwise get Cygnus style configure.
+@@ -919,7 +953,7 @@ ac_abs_top_srcdir=`cd "$ac_dir" && cd $a
+       echo
+       $SHELL $ac_srcdir/configure  --help=recursive
+     elif test -f $ac_srcdir/configure.ac ||
+-           test -f $ac_srcdir/configure.in; then
++         test -f $ac_srcdir/configure.in; then
+       echo
+       $ac_configure --help
+     else
+@@ -933,8 +967,7 @@ test -n "$ac_init_help" && exit 0
+ if $ac_init_version; then
+   cat <<\_ACEOF
+ 
+-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.
+ _ACEOF
+@@ -946,7 +979,7 @@ This file contains any messages produced
+ running configure, to aid debugging if configure makes a mistake.
+ 
+ It was created by $as_me, which was
+-generated by GNU Autoconf 2.57.  Invocation command line was
++generated by GNU Autoconf 2.59.  Invocation command line was
+ 
+   $ $0 $@
+ 
+@@ -1023,19 +1056,19 @@ do