tcl-expect: Regen patch-configure and prune TODO

[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 10:53:55 2022 -0400
Changeset:	f1ff8056730e784b0d32c6a210a0c0ed344c29a6

Modified Files:
	tcl-expect/TODO
	tcl-expect/distinfo
	tcl-expect/patches/patch-configure

Log Message:
tcl-expect: Regen patch-configure and prune TODO

Drop TODO items that have been addressed.

Regen patch-configure to reduce diff to pkgsrc.

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

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

diffstat:
 tcl-expect/TODO                    | 11 ++---------
 tcl-expect/distinfo                |  2 +-
 tcl-expect/patches/patch-configure | 22 ++++++++++------------
 3 files changed, 13 insertions(+), 22 deletions(-)

diffs:
diff --git a/tcl-expect/TODO b/tcl-expect/TODO
index 529fb49b60..732f839ad6 100644
--- a/tcl-expect/TODO
+++ b/tcl-expect/TODO
@@ -3,15 +3,10 @@
 
 - In patch-configure:
 
-   - Explain why the patches to add MirBSD and DragonFly were dropped;
-     they don't appear to have been applied upstream.
-
    - Remove comments 'taken from previous'; the expectation is that
      all content from the pkgsrc package is in the new version, absent
      a good reason and documented in COMMIT_MSG.
 
-   - Explain why subsituting @SHLIB_VERSION@ is added.
-
    - Explain "avoid regenerating within pkgsrc", which is labeled as
      from the previous version but does not appear there.  Plus, it is
      tagged as an ERROR by pkglint.
@@ -23,9 +18,7 @@
 
    - Improve patch comment; the change to SVR3.2 linking is not explained.
    
-
-- In patch-exp__chan.c, explain why it is dropped.
-
 - The package patches an m4 file and configure, and this doesn't
   really make sense, as either we are regenerating configure or we
-  aren't.  Explain/fix.
+  aren't.  At the momennt we are not regenerating configure, so the m4
+  patch has no effect.  Explain/fix.
diff --git a/tcl-expect/distinfo b/tcl-expect/distinfo
index 365700744b..f5ed86518e 100644
--- a/tcl-expect/distinfo
+++ b/tcl-expect/distinfo
@@ -4,7 +4,7 @@ BLAKE2s (expect5.45.4.tar.gz) = 41310882c3658679f60911aca1a3cf9c353784f164410abf
 SHA512 (expect5.45.4.tar.gz) = a8dc25e8175f67e029e15cbcfca1705165c1c4cb2dd37eaaaebffb61e3ba132d9519cd73ca5add4c3358a2b0b7a91e878279e8d0b72143ff2c287fce07e4659a
 Size (expect5.45.4.tar.gz) = 632363 bytes
 SHA1 (patch-Makefile.in) = da70955bf923e1cd1074a4988a52452400072796
-SHA1 (patch-configure) = f7ff3eb39029099e1c01b9c74ef8586e6a1414ba
+SHA1 (patch-configure) = 1a26a361931ce5a3b3d9c88ab0ac2c7cd1c07cac
 SHA1 (patch-exp__chan.c) = 3c5a2eb9cd93c9eecd55f998476165769eafc6ee
 SHA1 (patch-retoglob.c) = 4406f9e5d7622f393e35e7a1f70a700a98d6e981
 SHA1 (patch-tclconfig_tcl.m4) = 8da471800dcc5f110858dd0af36ad5e924232976
diff --git a/tcl-expect/patches/patch-configure b/tcl-expect/patches/patch-configure
index 9138aae5dc..a80de4a6d8 100644
--- a/tcl-expect/patches/patch-configure
+++ b/tcl-expect/patches/patch-configure
@@ -19,9 +19,9 @@ Substitute the already-computed SHLIB_VERSION, for use in Makefile.in.
 
 \todo File changes upstream (but upstream is not functioning).
 
---- configure.orig      2018-02-04 03:43:58.000000000 +0000
-+++ configure	2022-06-08 07:03:02.940051201 -0600
-@@ -6480,7 +6480,8 @@
+--- configure.orig	2018-02-04 10:43:58.000000000 +0000
++++ configure
+@@ -6480,7 +6480,8 @@ fi
  		LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
  fi
  	    ;;
@@ -31,7 +31,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 @@
+@@ -6563,11 +6564,11 @@ fi
  		;;
  	    esac
  	    ;;
@@ -45,7 +45,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 @@
+@@ -6941,6 +6942,54 @@ fi
  	    LD_SEARCH_FLAGS=""
  	    ;;
  	SCO_SV-3.2*)
@@ -100,7 +100,7 @@ Substitute the already-computed SHLIB_VERSION, for use in Makefile.in.
  	    if test "$GCC" = yes; then :
  
  		SHLIB_CFLAGS="-fPIC -melf"
-@@ -7150,9 +7199,9 @@
+@@ -7150,7 +7199,7 @@ fi
  	    BSD/OS*) ;;
  	    CYGWIN_*) ;;
  	    IRIX*) ;;
@@ -109,9 +109,7 @@ Substitute the already-computed SHLIB_VERSION, for use in Makefile.in.
  	    Darwin-*) ;;
  	    SCO_SV-3.2*) ;;
  	    windows) ;;
- 	    *) SHLIB_CFLAGS="-fPIC" ;;
- 	esac
-@@ -9597,14 +9647,9 @@
+@@ -9597,14 +9646,9 @@ fi
  
  PACKAGE_VERSION_NODOTS="`echo $PACKAGE_VERSION | sed -e 's/\.//g'`"
  
@@ -128,7 +126,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 +9704,8 @@
+@@ -9659,11 +9703,8 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
      $as_echo "#define EXP_FRAMEWORK 1" >>confdefs.h
  
  else
@@ -142,7 +140,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 +10007,10 @@
+@@ -9965,6 +10006,10 @@ rm -f conftest*
      # substituted. (@@@ Might not be necessary anymore)
      #--------------------------------------------------------------------
  
@@ -153,7 +151,7 @@ Substitute the already-computed SHLIB_VERSION, for use in Makefile.in.
      if test "${TEA_PLATFORM}" = "windows" ; then
  	if test "${SHARED_BUILD}" = "1" ; then
  	    # We force the unresolved linking of symbols that are really in
-@@ -10711,6 +10757,11 @@
+@@ -10711,6 +10756,11 @@ do
    case $ac_option in
    # Handling of the options.
    -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)