tcl-expect: Reduce diff to ../lang

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: tcl-expect: Reduce diff to ../lang
From: Greg Troxel <gdt%lexort.com@localhost>
Date: Sun, 19 Jun 2022 14:49:14 +0000
Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Sun Jun 19 10:49:14 2022 -0400
Changeset:	7345d9abe45b68d30fc787fb37b7857c30be58aa

Modified Files:
	tcl-expect/DESCR
	tcl-expect/Makefile
	tcl-expect/Makefile.common
	tcl-expect/TODO
	tcl-expect/distinfo
	tcl-expect/patches/patch-Makefile.in
	tcl-expect/patches/patch-configure
	tcl-expect/patches/patch-exp__chan.c

Log Message:
tcl-expect: Reduce diff to ../lang

These are all comment changes:
  - sync DESCR
  - unify/sync patch comments
  - sync RCS ids

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

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

diffstat:
 tcl-expect/DESCR                     |  3 ++-
 tcl-expect/Makefile                  |  2 +-
 tcl-expect/Makefile.common           |  2 +-
 tcl-expect/TODO                      |  3 ---
 tcl-expect/distinfo                  |  8 ++++----
 tcl-expect/patches/patch-Makefile.in | 24 +++++++++++-------------
 tcl-expect/patches/patch-configure   | 22 +++++++++++++---------
 tcl-expect/patches/patch-exp__chan.c |  4 +++-
 8 files changed, 35 insertions(+), 33 deletions(-)

diffs:
diff --git a/tcl-expect/DESCR b/tcl-expect/DESCR
index 49953da8d4..8f542d0697 100644
--- a/tcl-expect/DESCR
+++ b/tcl-expect/DESCR
@@ -4,4 +4,5 @@ interactive programs.  It is briefly described by its man page, expect(1).
 It uses pseudo-tty's to control the child processes, so it is not affected
 by programs that refuse to read from stdin or pipes. (eg: passwd(1) etc).
 
-"This program is not maintained upstream."
+This program is no longer maintained upstream, with a last release in
+2018 and the most recent maintainer ticket action in 2020.
diff --git a/tcl-expect/Makefile b/tcl-expect/Makefile
index 5fa23f11bc..5468f60b92 100644
--- a/tcl-expect/Makefile
+++ b/tcl-expect/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2018/09/07 08:51:39 jperkin Exp $
+# $NetBSD: Makefile,v 1.35 2022/05/15 01:56:24 dholland Exp $
 
 .include "Makefile.common"
 
diff --git a/tcl-expect/Makefile.common b/tcl-expect/Makefile.common
index 4e702526ba..0984c385b6 100644
--- a/tcl-expect/Makefile.common
+++ b/tcl-expect/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2022/06/14 10:56:15 gdt Exp $
+# $NetBSD: Makefile.common,v 1.15 2022/06/19 14:43:28 gdt Exp $
 
 # used by lang/tcl-expect/Makefile
 # \todo Explain why there is only one user, or fold into Makefile.
diff --git a/tcl-expect/TODO b/tcl-expect/TODO
index e312308d18..529fb49b60 100644
--- a/tcl-expect/TODO
+++ b/tcl-expect/TODO
@@ -1,6 +1,3 @@
-- Create COMMIT_MSG for use in updating pkgsrc.  Most of the
-  explanations below belong here, besides the usual upstream NEWS.
-
 - Explain why patch-Makefile.in has .1.0 hard-coded instead of the
   previous .@SHLIB_VERSION@.
 
diff --git a/tcl-expect/distinfo b/tcl-expect/distinfo
index f12c50fc58..365700744b 100644
--- a/tcl-expect/distinfo
+++ b/tcl-expect/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.22 2021/10/26 10:51:57 nia Exp $
+$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) = 1efb1bdd0d3a80a8ad2d66aaf1a6b0a344df9c3d
-SHA1 (patch-configure) = be1c1ca1d274c824077988a67005050e4814354f
-SHA1 (patch-exp__chan.c) = 21cd7e8d37cdc465e9523ead81adead38a694c97
+SHA1 (patch-Makefile.in) = da70955bf923e1cd1074a4988a52452400072796
+SHA1 (patch-configure) = f7ff3eb39029099e1c01b9c74ef8586e6a1414ba
+SHA1 (patch-exp__chan.c) = 3c5a2eb9cd93c9eecd55f998476165769eafc6ee
 SHA1 (patch-retoglob.c) = 4406f9e5d7622f393e35e7a1f70a700a98d6e981
 SHA1 (patch-tclconfig_tcl.m4) = 8da471800dcc5f110858dd0af36ad5e924232976
diff --git a/tcl-expect/patches/patch-Makefile.in b/tcl-expect/patches/patch-Makefile.in
index 3d3f940ed2..960e97b5d8 100644
--- a/tcl-expect/patches/patch-Makefile.in
+++ b/tcl-expect/patches/patch-Makefile.in
@@ -1,22 +1,20 @@
-$NetBSD: patch-Makefile.in,v 1.4 2018/08/27 07:12:08 wiz Exp $
+$NetBSD: patch-Makefile.in,v 1.6 2022/06/19 14:43:28 gdt Exp $
 
-(This patch was created in 2012 and not adequately commented.  The
-comment included "no libtool", but there is no hint of libtool
-upstream and this patch does not remove it.)
+Add a shlib version to the shared library, which does not have one,
+for reasons not understood.  This is accomplished by defining a
+SHLIB_VERSION make variable by autoconf substitution (and oddly but
+not importantly, including a . in the make variable rather than where
+used).
 
-Define SHLIB_VERSION, Complaints about teaching PLIST about using SHLIB_VERSION
-required it to be defined.
+Build and install a static version of the expect library.
 
-Add a variable for a static library version, build and install it.
-
-Use standard rather than namespaced directories.
+Use standard rather than namespaced directories for data/lib/include.
+\todo Decide if this is working around an upstream bug, and if so file
+upstream, or if it is a pkgsrc accomodation.
 
 Include LDFLAGS when linking (for RELRO).
 
-Version the shlib and the expect binary.
-
-Changes were sent upstream by email but were never added to the bug tracking system,
-No activity since the release.
+\todo File changes upstream (but upstream is not functioning).
 
 --- Makefile.in.orig	2018-02-02 12:15:52.000000000 -0700
 +++ Makefile.in	2022-06-09 06:35:29.261652426 -0600
diff --git a/tcl-expect/patches/patch-configure b/tcl-expect/patches/patch-configure
index 84267a1b65..9138aae5dc 100644
--- a/tcl-expect/patches/patch-configure
+++ b/tcl-expect/patches/patch-configure
@@ -1,20 +1,24 @@
-$NetBSD$
+$NetBSD: patch-configure,v 1.3 2022/06/19 14:43:28 gdt Exp $
 
-(This patch was created in 2012 and not adequately commented.  The
-comment included "no libtool", but there is no hint of libtool
-upstream and this patch does not remove it.)
+Add support for MirBSD as OpenBSD and DragonFly as FreeBSD.
 
 Upstream has support to use the version with or without dots as the
-shlib suffix.  This patch forces that to be the "NODOTS" flavor
-always, perhaps for PLIST consistency.
+shlib suffix, conditioned on TCL_LIB_VERSIONS_OK.  This patch forces
+that to be the "NODOTS" flavor always.  \todo Explain the plan; this
+seems likely to make the build the same on all pkgsrc platforms.
 
-PVNODOTS isn't the PACKAGE_VERSION_NO_DOTS that upstream configure already computes.
-
-The bug tracking system has no activity on fixing bugs reported since the release.
+Define PVNODOTS and use it to overwrite SHARED_LIB_SUFFIX and
+define UNSHARED_LIB_SUFFIX.  PVNODOTS appears to have the same value as
+PACKAGE_VERSION_NO_DOTS, that upstream configure already computes.
+\todo Explain why there is a new variable.
 
 Add support for SVR5 and OpenServer 5.  Sent upstream by email
 September 2019.
 
+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 @@
diff --git a/tcl-expect/patches/patch-exp__chan.c b/tcl-expect/patches/patch-exp__chan.c
index 7b2aca2c19..47b5710de0 100644
--- a/tcl-expect/patches/patch-exp__chan.c
+++ b/tcl-expect/patches/patch-exp__chan.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-exp__chan.c,v 1.1 2022/05/15 01:56:24 dholland Exp $
+$NetBSD: patch-exp__chan.c,v 1.2 2022/06/19 14:43:28 gdt Exp $
 
 Add hack to work around deadlock situation that occurs on Solaris and
 Linux. See PR 34442.
@@ -9,6 +9,8 @@ problem as far as it's understood seems to be portable. So don't
 conditionalize it, as the check should be safe. If this turns out to
 cause problems, we can wrap it in ifdefs.
 
+\todo File changes upstream (but upstream is not functioning).
+
 --- exp_chan.c.orig	2018-02-02 12:15:52.000000000 -0700
 +++ exp_chan.c	2022-06-17 15:37:14.620875137 -0600
 @@ -7,6 +7,7 @@
Prev by Date: lima: Update to 0.11.1
Next by Date: tcl-expect: Regen patch-configure and prune TODO
Previous by Thread: lima: Update to 0.11.1
Next by Thread: tcl-expect: Regen patch-configure and prune TODO
Indexes:
Home | Main Index | Thread Index | Old Index