tcl-expect: Prune comments from configure patch and drop 'exit 0'.

[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 18:43:04 2022 -0400
Changeset:	fbe79323d87327edb5af84a7691d01b8f6704de7

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

Log Message:
tcl-expect: Prune comments from configure patch and drop 'exit 0'.

This patch is based on the patch in pkgsrc, as expected.  Don't label
things as preexisting.

Drop code to force exit configure, as unexplained and not carried from
pkgsrc. (And, pkglint objects to it.)

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

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

diffstat:
 tcl-expect/distinfo                |  2 +-
 tcl-expect/patches/patch-configure | 25 +++++--------------------
 2 files changed, 6 insertions(+), 21 deletions(-)

diffs:
diff --git a/tcl-expect/distinfo b/tcl-expect/distinfo
index fdd20c7d77..16a139dbab 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) = 1a26a361931ce5a3b3d9c88ab0ac2c7cd1c07cac
+SHA1 (patch-configure) = da593f94063bfed178dbc45233fbe0ac3bf0f59c
 SHA1 (patch-exp__chan.c) = 8dbb1b1abea73858cc9eba05d4662976edf664f5
 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 a80de4a6d8..220c571edf 100644
--- a/tcl-expect/patches/patch-configure
+++ b/tcl-expect/patches/patch-configure
@@ -109,24 +109,23 @@ Substitute the already-computed SHLIB_VERSION, for use in Makefile.in.
  	    Darwin-*) ;;
  	    SCO_SV-3.2*) ;;
  	    windows) ;;
-@@ -9597,14 +9646,9 @@ fi
+@@ -9596,15 +9645,7 @@ fi
+ #   up the Tcl library.
  
  PACKAGE_VERSION_NODOTS="`echo $PACKAGE_VERSION | sed -e 's/\.//g'`"
- 
+-
 -if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
 -    EXP_LIB_VERSION=$PACKAGE_VERSION
 -else
 -    EXP_LIB_VERSION=$PACKAGE_VERSION_NODOTS
 -fi
 -if test $iunix -eq 1 ; then
-+# pkgsrc tcl-expect additions from 2012 added.
-+
      EXP_LIB_VERSION=$PACKAGE_VERSION_NODOTS
 -fi
  
  # also remove dots on systems that don't support filenames > 14
  # (are there systems which support shared libs and restrict filename lengths!?)
-@@ -9659,11 +9703,8 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
+@@ -9659,11 +9700,7 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
      $as_echo "#define EXP_FRAMEWORK 1" >>confdefs.h
  
  else
@@ -135,31 +134,17 @@ Substitute the already-computed SHLIB_VERSION, for use in Makefile.in.
 -    else
 -        EXP_LIB_FLAG="-lexpect`echo ${EXP_LIB_VERSION} | tr -d .`"
 -    fi
-+# pkgsrc tcl-expect additions from 2012 added.
 +    EXP_LIB_FLAG="-lexpect`echo ${EXP_LIB_VERSION} | tr -d .`"
      EXP_BUILD_LIB_SPEC="-L`pwd` ${EXP_LIB_FLAG}"
      EXP_LIB_SPEC="-L${libdir} ${EXP_LIB_FLAG}"
  fi
-@@ -9965,6 +10006,10 @@ rm -f conftest*
+@@ -9965,6 +10002,9 @@ rm -f conftest*
      # substituted. (@@@ Might not be necessary anymore)
      #--------------------------------------------------------------------
  
-+    # pkgsrc tcl-expect additions from 2012 added.
 +    PVNODOTS=`echo ${PACKAGE_VERSION} | tr -d .`
 +    SHARED_LIB_SUFFIX=${PVNODOTS}.so
 +    UNSHARED_LIB_SUFFIX=${PVNODOTS}.a
      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 +10756,11 @@ do
-   case $ac_option in
-   # Handling of the options.
-   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-+    # pkgsrc tcl-expect additions from 2012 added.
-+	: Avoid regenerating within pkgsrc
-+	exit 0
-+	: Avoid regenerating within pkgsrc
-+	exit 0
-     ac_cs_recheck=: ;;
-   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-     $as_echo "$ac_cs_version"; exit ;;