[pkgsrc/trunk]: pkgsrc/net/tcl-scotty Respect TCL_INCLUDE_SPEC from tclConfig...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cb15e1751501
branches:  trunk
changeset: 381058:cb15e1751501
user:      he <he%pkgsrc.org@localhost>
date:      Mon May 28 14:14:02 2018 +0000

description:
Respect TCL_INCLUDE_SPEC from tclConfig.sh if specified.
Bump PKGREVISION.

diffstat:

 net/tcl-scotty/Makefile                        |   4 ++--
 net/tcl-scotty/distinfo                        |   6 +++---
 net/tcl-scotty/patches/patch-unix_configure    |  11 ++++++++++-
 net/tcl-scotty/patches/patch-unix_configure.in |  11 ++++++++++-
 4 files changed, 25 insertions(+), 7 deletions(-)

diffs (85 lines):

diff -r 51a06865c597 -r cb15e1751501 net/tcl-scotty/Makefile
--- a/net/tcl-scotty/Makefile   Mon May 28 13:46:20 2018 +0000
+++ b/net/tcl-scotty/Makefile   Mon May 28 14:14:02 2018 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.44 2018/05/14 08:57:57 he Exp $
+# $NetBSD: Makefile,v 1.45 2018/05/28 14:14:02 he Exp $
 #
 
 DISTNAME=      scotty-${DIST_VERS}
 PKGNAME=       tcl-scotty-${DIST_VERS}
-PKGREVISION=   17
+PKGREVISION=   18
 CATEGORIES=    net tcl
 MASTER_SITES=  ftp://ftp.ibr.cs.tu-bs.de/pub/local/tkined/
 
diff -r 51a06865c597 -r cb15e1751501 net/tcl-scotty/distinfo
--- a/net/tcl-scotty/distinfo   Mon May 28 13:46:20 2018 +0000
+++ b/net/tcl-scotty/distinfo   Mon May 28 14:14:02 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2018/05/14 08:57:57 he Exp $
+$NetBSD: distinfo,v 1.28 2018/05/28 14:14:02 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) = e214b77c1e5fe7c83fe59d9308a3913b5c5042ca
-SHA1 (patch-unix_configure.in) = 0906c2bb19453484d05a3fec158e0917da78368e
+SHA1 (patch-unix_configure) = e10959d30c9ab34c1d58addca5660a0bd58b773c
+SHA1 (patch-unix_configure.in) = b1a4477cebfdf64ea1dcec765155972f1cedc85c
 SHA1 (patch-unix_scotty.c) = fdb6a9bb414566ddb5317a3ebc60d2c305f611a7
 SHA1 (patch-unix_tnmUnixIcmp.c) = 86be48d8da9d77098662e7d2515193515a028e96
 SHA1 (patch-unix_tnmUnixLog.c) = 9191e4683d691a04c5397180f61ebb4365a2c344
diff -r 51a06865c597 -r cb15e1751501 net/tcl-scotty/patches/patch-unix_configure
--- a/net/tcl-scotty/patches/patch-unix_configure       Mon May 28 13:46:20 2018 +0000
+++ b/net/tcl-scotty/patches/patch-unix_configure       Mon May 28 14:14:02 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-unix_configure,v 1.2 2018/04/13 19:10:50 he Exp $
+$NetBSD: patch-unix_configure,v 1.3 2018/05/28 14:14:02 he Exp $
 
 Regen after unix/configure.in patching.
 
@@ -383,6 +383,15 @@
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_path_tclsh="$ac_dir/$ac_word"
+@@ -1400,7 +1496,7 @@ SHLIB_SUFFIX=$TCL_SHLIB_SUFFIX
+ DL_LIBS=$TCL_DL_LIBS
+ LD_FLAGS=$TCL_LD_FLAGS
+ LD_SEARCH_FLAGS=$TCL_LD_SEARCH_FLAGS
+-TCL_INCLUDES=-I$TCL_PREFIX/include
++TCL_INCLUDES=${TCL_INCLUDE_SPEC:-"-I$TCL_PREFIX/include"}
+ 
+ if test -z "$SHLIB_LD" ; then
+     { echo "configure: error: no shared linker definition (TCL_SHLIB_LD) in tclConfig.sh" 1>&2; exit 1; }
 @@ -1431,9 +1527,13 @@ else
    /*)
    ac_cv_path_wish="$wish" # Let the user override the test with a path.
diff -r 51a06865c597 -r cb15e1751501 net/tcl-scotty/patches/patch-unix_configure.in
--- a/net/tcl-scotty/patches/patch-unix_configure.in    Mon May 28 13:46:20 2018 +0000
+++ b/net/tcl-scotty/patches/patch-unix_configure.in    Mon May 28 14:14:02 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-unix_configure.in,v 1.1 2018/04/13 19:10:50 he Exp $
+$NetBSD: patch-unix_configure.in,v 1.2 2018/05/28 14:14:02 he Exp $
 
 Default target to build & install scotty & tkined.
 Append TCL_LIBS to library setting, so that tcl library is picked up.
@@ -17,6 +17,15 @@
  
  #--------------------------------------------------------------------
  #       Check for various system specific things.
+@@ -151,7 +154,7 @@ SHLIB_SUFFIX=$TCL_SHLIB_SUFFIX
+ DL_LIBS=$TCL_DL_LIBS
+ LD_FLAGS=$TCL_LD_FLAGS
+ LD_SEARCH_FLAGS=$TCL_LD_SEARCH_FLAGS
+-TCL_INCLUDES=-I$TCL_PREFIX/include
++TCL_INCLUDES=${TCL_INCLUDE_SPEC:-"-I$TCL_PREFIX/include"}
+ 
+ if test -z "$SHLIB_LD" ; then
+     AC_MSG_ERROR([no shared linker definition (TCL_SHLIB_LD) in tclConfig.sh])
 @@ -196,9 +199,8 @@ for f in $dirs ; do
  done