tcl-expect: Restore SHLIB_VERSION handling as in ../lang/tcl-expect

[Greg Troxel <gdt%lexort.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Sun Jun 19 20:25:48 2022 -0400
Changeset:	ec8e86119529911124369b0caa5ce6f50f6e75ef

Modified Files:
	tcl-expect/COMMIT_MSG
	tcl-expect/distinfo
	tcl-expect/patches/patch-Makefile.in
	tcl-expect/patches/patch-configure

Log Message:
tcl-expect: Restore SHLIB_VERSION handling as in ../lang/tcl-expect

The patch to add SHLIB_VERSION to config.status didn't apply because
upstream used newer configure (as one might expect in 2018 vs 2010)
and the code for config.status has been changed to be more
declarative.  This commit adds a hunk with the same semantics, even
though it looks very little like the ../lang/tcl-expect patch.  Then,
the use of @SHLIB_VERSION@ is restored.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ec8e86119529911124369b0caa5ce6f50f6e75ef

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 tcl-expect/COMMIT_MSG                |  8 ++------
 tcl-expect/distinfo                  |  4 ++--
 tcl-expect/patches/patch-Makefile.in | 15 +++++++--------
 tcl-expect/patches/patch-configure   | 22 +++++++++++++++-------
 4 files changed, 26 insertions(+), 23 deletions(-)

diffs:
diff --git a/tcl-expect/COMMIT_MSG b/tcl-expect/COMMIT_MSG
index 4dbec7def4..d7bf82d688 100644
--- a/tcl-expect/COMMIT_MSG
+++ b/tcl-expect/COMMIT_MSG
@@ -2,12 +2,8 @@ lang/tcl-expect:  Update to 5.45.4
 
 Packaging changes:
 
-Upstream used to export SHLIB_VERSION from configure into
-config.status, and thus it was usable in our patched Makefile so that
-the install rules would work if SHLIB_VERSION changed.  Instead,
-\todo.
-  Rather than teaching PLIST about .@SHLIB_VERSION@ in which many said "felt wrong"
-  a patch-Makefile.in has .1.0 hard-coded instead of the previous .@SHLIB_VERSION@.
+Adapt patch to add SHLIB_VERSION to config.status across autoconf
+versions; the autoconf version used in 5.45.4 is more declarative.
 
 Add patch to tclconfig/tcl.m4 for UnixWare/SVR5.  \todo Explain how
 this is effective if configure is not regenerated.
diff --git a/tcl-expect/distinfo b/tcl-expect/distinfo
index 4fb055753d..ae7a76951c 100644
--- a/tcl-expect/distinfo
+++ b/tcl-expect/distinfo
@@ -3,8 +3,8 @@ $NetBSD: distinfo,v 1.25 2022/06/19 14:43:28 gdt Exp $
 BLAKE2s (expect5.45.4.tar.gz) = 41310882c3658679f60911aca1a3cf9c353784f164410abf919ce7adefdc73e0
 SHA512 (expect5.45.4.tar.gz) = a8dc25e8175f67e029e15cbcfca1705165c1c4cb2dd37eaaaebffb61e3ba132d9519cd73ca5add4c3358a2b0b7a91e878279e8d0b72143ff2c287fce07e4659a
 Size (expect5.45.4.tar.gz) = 632363 bytes
-SHA1 (patch-Makefile.in) = 1a5b0bc539429117490dded93b9efa1a218a21e7
-SHA1 (patch-configure) = da593f94063bfed178dbc45233fbe0ac3bf0f59c
+SHA1 (patch-Makefile.in) = 29813ec821902582e6991fc29a9378cf92cee2cd
+SHA1 (patch-configure) = d82e62975d854a4cae92f17051f13e0f586542d7
 SHA1 (patch-exp__chan.c) = 8dbb1b1abea73858cc9eba05d4662976edf664f5
 SHA1 (patch-retoglob.c) = 41bb63f893dcf6e1d1c768986bffc9e59206d17a
 SHA1 (patch-tclconfig_tcl.m4) = fb468fb941261dba4f5b5d39ee045283134a0de4
diff --git a/tcl-expect/patches/patch-Makefile.in b/tcl-expect/patches/patch-Makefile.in
index d7fd635560..75f527dfa7 100644
--- a/tcl-expect/patches/patch-Makefile.in
+++ b/tcl-expect/patches/patch-Makefile.in
@@ -18,18 +18,17 @@ Include LDFLAGS when linking (for RELRO).
 
 --- Makefile.in.orig	2018-02-02 19:15:52.000000000 +0000
 +++ Makefile.in
-@@ -99,7 +99,10 @@ PKG_HEADERS	= @PKG_HEADERS@
+@@ -99,7 +99,9 @@ PKG_HEADERS	= @PKG_HEADERS@
  # configuration options) composed of the named objects.
  #========================================================================
  
-+# Add a SHLIB_VERSION because it is not defined
-+SHLIB_VERSION	= .1.0
++SHLIB_VERSION	= .@SHLIB_VERSION@
  PKG_LIB_FILE	= @PKG_LIB_FILE@
 +PKG_LIB_A_FILE  = ${PKG_LIB_FILE:.so=.a}
  PKG_STUB_LIB_FILE = @PKG_STUB_LIB_FILE@
  
  lib_BINARIES	= $(PKG_LIB_FILE)
-@@ -121,9 +124,9 @@ includedir	= @includedir@
+@@ -121,9 +123,9 @@ includedir	= @includedir@
  DESTDIR		=
  
  PKG_DIR		= $(PACKAGE_NAME)$(PACKAGE_VERSION)
@@ -42,7 +41,7 @@ Include LDFLAGS when linking (for RELRO).
  
  top_builddir	= .
  
-@@ -149,7 +152,7 @@ RANLIB		= @RANLIB@
+@@ -149,7 +151,7 @@ RANLIB		= @RANLIB@
  RANLIB_STUB	= @RANLIB_STUB@
  SHLIB_CFLAGS	= @SHLIB_CFLAGS@
  SHLIB_LD	= @SHLIB_LD@
@@ -51,7 +50,7 @@ Include LDFLAGS when linking (for RELRO).
  STLIB_LD	= @STLIB_LD@
  TCL_DEFS	= @TCL_DEFS@
  TCL_BIN_DIR	= @TCL_BIN_DIR@
-@@ -214,10 +217,15 @@ all: binaries libraries doc
+@@ -214,10 +216,15 @@ all: binaries libraries doc
  # of the Makefile, in the "BINARIES" variable.
  #========================================================================
  
@@ -68,7 +67,7 @@ Include LDFLAGS when linking (for RELRO).
  doc:
  
  install: all install-binaries install-libraries install-doc
-@@ -547,6 +555,9 @@ install-lib-binaries:
+@@ -547,6 +554,9 @@ install-lib-binaries:
  	    fi; \
  	  fi; \
  	done
@@ -78,7 +77,7 @@ Include LDFLAGS when linking (for RELRO).
  	@list='$(PKG_TCL_SOURCES)'; for p in $$list; do \
  	  if test -f $(srcdir)/$$p; then \
  	    destp=`basename $$p`; \
-@@ -554,9 +565,11 @@ install-lib-binaries:
+@@ -554,9 +564,11 @@ install-lib-binaries:
  	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/$$destp; \
  	  fi; \
  	done
diff --git a/tcl-expect/patches/patch-configure b/tcl-expect/patches/patch-configure
index 220c571edf..deefb82f38 100644
--- a/tcl-expect/patches/patch-configure
+++ b/tcl-expect/patches/patch-configure
@@ -21,7 +21,15 @@ Substitute the already-computed SHLIB_VERSION, for use in Makefile.in.
 
 --- configure.orig	2018-02-04 10:43:58.000000000 +0000
 +++ configure
-@@ -6480,7 +6480,8 @@ fi
+@@ -659,6 +659,7 @@ LD_LIBRARY_PATH_VAR
+ SHLIB_CFLAGS
+ SHLIB_LD_LIBS
+ SHLIB_LD
++SHLIB_VERSION
+ STLIB_LD
+ CFLAGS_WARNING
+ CFLAGS_OPTIMIZE
+@@ -6480,7 +6481,8 @@ fi
  		LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
  fi
  	    ;;
@@ -31,7 +39,7 @@ Substitute the already-computed SHLIB_VERSION, for use in Makefile.in.
  	    SHLIB_CFLAGS="-fPIC"
  	    SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
  	    SHLIB_SUFFIX=".so"
-@@ -6563,11 +6564,11 @@ fi
+@@ -6563,11 +6565,11 @@ fi
  		;;
  	    esac
  	    ;;
@@ -45,7 +53,7 @@ Substitute the already-computed SHLIB_VERSION, for use in Makefile.in.
  	    SHLIB_SUFFIX=".so"
  	    LDFLAGS=""
  	    if test $doRpath = yes; then :
-@@ -6941,6 +6942,54 @@ fi
+@@ -6941,6 +6943,54 @@ fi
  	    LD_SEARCH_FLAGS=""
  	    ;;
  	SCO_SV-3.2*)
@@ -100,7 +108,7 @@ Substitute the already-computed SHLIB_VERSION, for use in Makefile.in.
  	    if test "$GCC" = yes; then :
  
  		SHLIB_CFLAGS="-fPIC -melf"
-@@ -7150,7 +7199,7 @@ fi
+@@ -7150,7 +7200,7 @@ fi
  	    BSD/OS*) ;;
  	    CYGWIN_*) ;;
  	    IRIX*) ;;
@@ -109,7 +117,7 @@ Substitute the already-computed SHLIB_VERSION, for use in Makefile.in.
  	    Darwin-*) ;;
  	    SCO_SV-3.2*) ;;
  	    windows) ;;
-@@ -9596,15 +9645,7 @@ fi
+@@ -9596,15 +9646,7 @@ fi
  #   up the Tcl library.
  
  PACKAGE_VERSION_NODOTS="`echo $PACKAGE_VERSION | sed -e 's/\.//g'`"
@@ -125,7 +133,7 @@ Substitute the already-computed SHLIB_VERSION, for use in Makefile.in.
  
  # also remove dots on systems that don't support filenames > 14
  # (are there systems which support shared libs and restrict filename lengths!?)
-@@ -9659,11 +9700,7 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
+@@ -9659,11 +9701,7 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
      $as_echo "#define EXP_FRAMEWORK 1" >>confdefs.h
  
  else
@@ -138,7 +146,7 @@ Substitute the already-computed SHLIB_VERSION, for use in Makefile.in.
      EXP_BUILD_LIB_SPEC="-L`pwd` ${EXP_LIB_FLAG}"
      EXP_LIB_SPEC="-L${libdir} ${EXP_LIB_FLAG}"
  fi
-@@ -9965,6 +10002,9 @@ rm -f conftest*
+@@ -9965,6 +10003,9 @@ rm -f conftest*
      # substituted. (@@@ Might not be necessary anymore)
      #--------------------------------------------------------------------