[pkgsrc/trunk]: pkgsrc/net/tcl-scotty Add checking for both res_mkquery and _...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ab0d90277363
branches:  trunk
changeset: 381098:ab0d90277363
user:      he <he%pkgsrc.org@localhost>
date:      Tue May 29 12:56:55 2018 +0000

description:
Add checking for both res_mkquery and __res_mkquery, and same for
dn_expand.  I could not find a way to express "you need to include
<resolv.h> before checking this function in this library" with the
older autoconf this uses.
Bump PKGREVISION.

diffstat:

 net/tcl-scotty/Makefile                        |    4 +-
 net/tcl-scotty/distinfo                        |    6 +-
 net/tcl-scotty/patches/patch-unix_configure    |  571 +-----------------------
 net/tcl-scotty/patches/patch-unix_configure.in |   16 +-
 4 files changed, 42 insertions(+), 555 deletions(-)

diffs (truncated from 686 to 300 lines):

diff -r c764fd8daa36 -r ab0d90277363 net/tcl-scotty/Makefile
--- a/net/tcl-scotty/Makefile   Tue May 29 12:55:11 2018 +0000
+++ b/net/tcl-scotty/Makefile   Tue May 29 12:56:55 2018 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.45 2018/05/28 14:14:02 he Exp $
+# $NetBSD: Makefile,v 1.46 2018/05/29 12:56:55 he Exp $
 #
 
 DISTNAME=      scotty-${DIST_VERS}
 PKGNAME=       tcl-scotty-${DIST_VERS}
-PKGREVISION=   18
+PKGREVISION=   19
 CATEGORIES=    net tcl
 MASTER_SITES=  ftp://ftp.ibr.cs.tu-bs.de/pub/local/tkined/
 
diff -r c764fd8daa36 -r ab0d90277363 net/tcl-scotty/distinfo
--- a/net/tcl-scotty/distinfo   Tue May 29 12:55:11 2018 +0000
+++ b/net/tcl-scotty/distinfo   Tue May 29 12:56:55 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2018/05/28 14:14:02 he Exp $
+$NetBSD: distinfo,v 1.29 2018/05/29 12:56:55 he Exp $
 
 SHA1 (scotty-2.1.11.tar.gz) = 819011f908c57e4591d6f50e51677c01eb55dc13
 RMD160 (scotty-2.1.11.tar.gz) = 3b4d45f3db73f05b49a46017bf2ffed6d6464b00
@@ -42,8 +42,8 @@
 SHA1 (patch-tnm_snmp_tnmSnmpTcl.c) = 565d982a4e24e8033c4a16895ff503a3159a1a33
 SHA1 (patch-tnm_snmp_tnmSnmpUtil.c) = 9441f16f0be0f15689e9e628c3e96fc0c10bc942
 SHA1 (patch-unix-Makefile.in) = 9a00bc8affad69035d7bc78955d30e4f2f8fc991
-SHA1 (patch-unix_configure) = e10959d30c9ab34c1d58addca5660a0bd58b773c
-SHA1 (patch-unix_configure.in) = b1a4477cebfdf64ea1dcec765155972f1cedc85c
+SHA1 (patch-unix_configure) = 8b8446c739496e685a9aadf24b64d401cdc294bd
+SHA1 (patch-unix_configure.in) = b2a31df2b525c315d883e1e4629275dc708027d6
 SHA1 (patch-unix_scotty.c) = fdb6a9bb414566ddb5317a3ebc60d2c305f611a7
 SHA1 (patch-unix_tnmUnixIcmp.c) = 86be48d8da9d77098662e7d2515193515a028e96
 SHA1 (patch-unix_tnmUnixLog.c) = 9191e4683d691a04c5397180f61ebb4365a2c344
diff -r c764fd8daa36 -r ab0d90277363 net/tcl-scotty/patches/patch-unix_configure
--- a/net/tcl-scotty/patches/patch-unix_configure       Tue May 29 12:55:11 2018 +0000
+++ b/net/tcl-scotty/patches/patch-unix_configure       Tue May 29 12:56:55 2018 +0000
@@ -1,389 +1,21 @@
-$NetBSD: patch-unix_configure,v 1.3 2018/05/28 14:14:02 he Exp $
+$NetBSD: patch-unix_configure,v 1.4 2018/05/29 12:56:55 he Exp $
 
 Regen after unix/configure.in patching.
 
 --- unix/configure.orig        1998-11-03 15:16:50.000000000 +0000
 +++ unix/configure
-@@ -1,7 +1,7 @@
- #! /bin/sh
- 
- # Guess values for system-dependent variables and create Makefiles.
--# Generated automatically using autoconf version 2.12 
-+# Generated automatically using autoconf version 2.13 
- # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
- #
- # This configure script is free software; the Free Software Foundation
-@@ -67,6 +67,7 @@ mandir='${prefix}/man'
- # Initialize some other variables.
- subdirs=
- MFLAGS= MAKEFLAGS=
-+SHELL=${CONFIG_SHELL-/bin/sh}
- # Maximum number of lines to put in a shell here document.
- ac_max_here_lines=12
- 
-@@ -350,7 +351,7 @@ EOF
-     verbose=yes ;;
- 
-   -version | --version | --versio | --versi | --vers)
--    echo "configure generated by autoconf version 2.12"
-+    echo "configure generated by autoconf version 2.13"
-     exit 0 ;;
- 
-   -with-* | --with-*)
-@@ -520,9 +521,11 @@ ac_ext=c
- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
- cross_compiling=$ac_cv_prog_cc_cross
- 
-+ac_exeext=
-+ac_objext=o
- if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-   # Stardent Vistra SVR4 grep lacks -e, says ghazi%caip.rutgers.edu@localhost.
-   if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-@@ -564,8 +567,9 @@ else
-   if test -n "$CC"; then
-   ac_cv_prog_CC="$CC" # Let the user override the test.
- else
--  IFS="${IFS=         }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--  for ac_dir in $PATH; do
-+  IFS="${IFS=         }"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-       ac_cv_prog_CC="gcc"
-@@ -593,9 +597,10 @@ else
-   if test -n "$CC"; then
-   ac_cv_prog_CC="$CC" # Let the user override the test.
- else
--  IFS="${IFS=         }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-+  IFS="${IFS=         }"; ac_save_ifs="$IFS"; IFS=":"
-   ac_prog_rejected=no
--  for ac_dir in $PATH; do
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-       if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-@@ -630,6 +635,40 @@ else
-   echo "$ac_t""no" 1>&6
- fi
- 
-+  if test -z "$CC"; then
-+    case "`uname -s`" in
-+    *win32* | *WIN32*)
-+      # Extract the first word of "cl", so it can be a program name with args.
-+set dummy cl; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:645: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  if test -n "$CC"; then
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+  IFS="${IFS=         }"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      ac_cv_prog_CC="cl"
-+      break
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+fi
-+fi
-+CC="$ac_cv_prog_CC"
-+if test -n "$CC"; then
-+  echo "$ac_t""$CC" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+ ;;
-+    esac
-+  fi
-   test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
- fi
- 
-@@ -640,15 +679,17 @@ ac_ext=c
- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
- cross_compiling=$ac_cv_prog_cc_cross
- 
--cat > conftest.$ac_ext <<EOF
--#line 648 "configure"
-+cat > conftest.$ac_ext << EOF
-+
-+#line 688 "configure"
- #include "confdefs.h"
-+
- main(){return(0);}
- EOF
--if { (eval echo configure:652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   ac_cv_prog_cc_works=yes
-   # If we can't run a trivial program, we are probably using a cross compiler.
-   if (./conftest; exit) 2>/dev/null; then
-@@ -662,6 +703,12 @@ else
-   ac_cv_prog_cc_works=no
- fi
- rm -fr conftest*
-+ac_ext=c
-+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+cross_compiling=$ac_cv_prog_cc_cross
- 
- echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
- if test $ac_cv_prog_cc_works = no; then
-@@ -693,11 +740,15 @@ echo "$ac_t""$ac_cv_prog_gcc" 1>&6
- 
- if test $ac_cv_prog_gcc = yes; then
-   GCC=yes
--  ac_test_CFLAGS="${CFLAGS+set}"
--  ac_save_CFLAGS="$CFLAGS"
--  CFLAGS=
--  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
--echo "configure:701: checking whether ${CC-cc} accepts -g" >&5
-+else
-+  GCC=
-+fi
-+
-+ac_test_CFLAGS="${CFLAGS+set}"
-+ac_save_CFLAGS="$CFLAGS"
-+CFLAGS=
-+echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-+echo "configure:752: checking whether ${CC-cc} accepts -g" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -712,16 +763,20 @@ rm -f conftest*
+@@ -29,7 +29,10 @@ AC_PREFIX_PROGRAM(scotty)
+ if test "$prefix" = "NONE" ; then
+     AC_PREFIX_PROGRAM(tclsh)
  fi
- 
- echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
--  if test "$ac_test_CFLAGS" = set; then
--    CFLAGS="$ac_save_CFLAGS"
--  elif test $ac_cv_prog_cc_g = yes; then
-+if test "$ac_test_CFLAGS" = set; then
-+  CFLAGS="$ac_save_CFLAGS"
-+elif test $ac_cv_prog_cc_g = yes; then
-+  if test "$GCC" = yes; then
-     CFLAGS="-g -O2"
-   else
--    CFLAGS="-O2"
-+    CFLAGS="-g"
-   fi
- else
--  GCC=
--  test "${CFLAGS+set}" = set || CFLAGS="-g"
-+  if test "$GCC" = yes; then
-+    CFLAGS="-O2"
-+  else
-+    CFLAGS=
-+  fi
- fi
- 
- else
-@@ -750,8 +805,8 @@ else
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:754: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:809: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   :
- else
-@@ -761,14 +816,31 @@ else
-   rm -rf conftest*
-   CPP="${CC-cc} -E -traditional-cpp"
-   cat > conftest.$ac_ext <<EOF
--#line 765 "configure"
-+#line 820 "configure"
-+#include "confdefs.h"
-+#include <assert.h>
-+Syntax Error
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:826: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+  :
-+else
-+  echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  CPP="${CC-cc} -nologo -E"
-+  cat > conftest.$ac_ext <<EOF
-+#line 837 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:771: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:843: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   :
- else
-@@ -781,6 +853,8 @@ fi
- rm -f conftest*
- fi
- rm -f conftest*
-+fi
-+rm -f conftest*
-   ac_cv_prog_CPP="$CPP"
- fi
-   CPP="$ac_cv_prog_CPP"
-@@ -799,8 +873,9 @@ else
-   if test -n "$LEX"; then
-   ac_cv_prog_LEX="$LEX" # Let the user override the test.
- else
--  IFS="${IFS=         }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--  for ac_dir in $PATH; do
-+  IFS="${IFS=         }"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"