[pkgsrc/trunk]: pkgsrc/editors/jed Fix compilation by detecting presense of <...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/04188bdbd5d8
branches:  trunk
changeset: 476867:04188bdbd5d8
user:      christos <christos%pkgsrc.org@localhost>
date:      Mon Jun 21 17:51:41 2004 +0000

description:
Fix compilation by detecting presense of <sys/stropts.h> and I_PUSH. Version
not bumped, since no actual source changes.

diffstat:

 editors/jed/distinfo         |     3 +-
 editors/jed/patches/patch-ac |  8262 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 8264 insertions(+), 1 deletions(-)

diffs (truncated from 8278 to 300 lines):

diff -r 9adcdc3aac6c -r 04188bdbd5d8 editors/jed/distinfo
--- a/editors/jed/distinfo      Mon Jun 21 17:30:05 2004 +0000
+++ b/editors/jed/distinfo      Mon Jun 21 17:51:41 2004 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.8 2004/03/18 16:42:36 xtraeme Exp $
+$NetBSD: distinfo,v 1.9 2004/06/21 17:51:41 christos Exp $
 
 SHA1 (jed-0.99-16.tar.bz2) = 34649571fb5caa61314553c10db2e15ebf248d82
 Size (jed-0.99-16.tar.bz2) = 667623 bytes
 SHA1 (patch-aa) = da971ebf501a733fece8f968a0168461cbebb4c3
 SHA1 (patch-ab) = 38c8708fbfff84afa67aeb8691bdbd021156ab82
+SHA1 (patch-ac) = ea69205bac45e1e4c340a33cb85a466728410d35
diff -r 9adcdc3aac6c -r 04188bdbd5d8 editors/jed/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/jed/patches/patch-ac      Mon Jun 21 17:51:41 2004 +0000
@@ -0,0 +1,8262 @@
+$NetBSD: patch-ac,v 1.3 2004/06/21 17:51:41 christos Exp $
+
+--- src/pty.c.orig     2002-10-20 02:55:31.000000000 -0400
++++ src/pty.c  2004-06-21 13:42:35.000000000 -0400
+@@ -18,11 +18,13 @@
+ 
+ #include <errno.h>
+ 
++#ifdef HAVE_SYS_STROPTS_H
+ #if !defined (__linux__) && !defined(__CYGWIN__) && defined(HAVE_GRANTPT)
+ # define USE_SYSV_PTYS
+ # include <sys/types.h>
+ # include <stropts.h>
+ #endif
++#endif
+ 
+ #ifdef HAVE_PTY_H
+ # include <pty.h>
+@@ -236,6 +238,7 @@
+    if (-1 == (fd = signal_safe_open (slave_name, O_RDWR)))
+      return -1;
+    
++#ifdef I_PUSH
+    if ((-1 == ioctl (fd, I_PUSH, "ptem"))
+        || (-1 == ioctl (fd, I_PUSH, "ldterm")))
+      {
+@@ -256,6 +259,7 @@
+         }
+ # endif
+      }
++#endif
+    *slave = fd;
+    return 0;
+ }
+
+--- src/config.hin.orig        2002-10-20 02:55:31.000000000 -0400
++++ src/config.hin     2004-06-21 13:41:28.000000000 -0400
+@@ -29,6 +29,9 @@
+ /* define if you have sys/fcntl.h */
+ #undef HAVE_SYS_FCNTL_H
+ 
++/* define if you have sys/stropts.h */
++#undef HAVE_SYS_STROPTS_H
++
+ #undef HAVE_PTY_H
+ 
+ /* define if you have memset */
+
+--- autoconf/configure.in.orig 2002-10-20 02:55:30.000000000 -0400
++++ autoconf/configure.in      2004-06-21 13:43:26.000000000 -0400
+@@ -25,6 +25,7 @@
+ termios.h \
+ fcntl.h \
+ sys/fcntl.h \
++sys/stropts.h \
+ pty.h \
+ )
+ 
+--- configure.orig     2002-10-20 02:55:30.000000000 -0400
++++ configure  2004-06-21 13:43:42.000000000 -0400
+@@ -1,73 +1,324 @@
+ #! /bin/sh
++# Guess values for system-dependent variables and create Makefiles.
++# 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=.
++  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
++done
+ 
++       ;;
++  esac
++  # We did not find ourselves, most probably we were run as `sh COMMAND'
++  # in which case we are not to be found in the path.
++  if test "x$as_myself" = x; then
++    as_myself=$0
++  fi
++  if test ! -f "$as_myself"; then
++    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
++   { (exit 1); exit 1; }; }
++  fi
++  case $CONFIG_SHELL in
++  '')
++    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for as_base in sh bash ksh sh5; do
++       case $as_dir in
++       /*)
++         if ("$as_dir/$as_base" -c '
++  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" ') 2>/dev/null; then
++           $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
++           $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
++           CONFIG_SHELL=$as_dir/$as_base
++           export CONFIG_SHELL
++           exec "$CONFIG_SHELL" "$0" ${1+"$@"}
++         fi;;
++       esac
++       done
++done
++;;
++  esac
+ 
++  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
++  # uniformly replaced by the line number.  The first 'sed' inserts a
++  # line-number line before each line; the second 'sed' does the real
++  # work.  The second script uses 'N' to pair each line-number line
++  # with the numbered line, and appends trailing '-' during
++  # substitution so that $LINENO is not a special case at line end.
++  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
++  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
++  sed '=' <$as_myself |
++    sed '
++      N
++      s,$,-,
++      : loop
++      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
++      t loop
++      s,-$,,
++      s,^['$as_cr_digits']*\n,,
++    ' >$as_me.lineno &&
++  chmod +x $as_me.lineno ||
++    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
++   { (exit 1); exit 1; }; }
++
++  # Don't try to exec as it changes $[0], causing all sort of problems
++  # (the dirname of $[0] is not the place where we might find the
++  # original and so on.  Autoconf is especially sensible to this).
++  . ./$as_me.lineno
++  # Exit status is that of the last command.
++  exit
++}
++
++
++case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
++  *c*,-n*) ECHO_N= ECHO_C='
++' ECHO_T='    ' ;;
++  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
++  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
++esac
+ 
++if expr a : '\(a\)' >/dev/null 2>&1; then
++  as_expr=expr
++else
++  as_expr=false
++fi
+ 
++rm -f conf$$ conf$$.exe conf$$.file
++echo >conf$$.file
++if ln -s conf$$.file conf$$ 2>/dev/null; then
++  # We could just check for DJGPP; but this test a) works b) is more generic
++  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
++  if test -f conf$$.exe; then
++    # Don't use ln at all; we don't have any links
++    as_ln_s='cp -p'
++  else
++    as_ln_s='ln -s'
++  fi
++elif ln conf$$.file conf$$ 2>/dev/null; then
++  as_ln_s=ln
++else
++  as_ln_s='cp -p'
++fi
++rm -f conf$$ conf$$.exe conf$$.file
+ 
++if mkdir -p . 2>/dev/null; then
++  as_mkdir_p=:
++else
++  as_mkdir_p=false
++fi
+