CVS commit: pkgsrc/lang/tcl-expect

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Sun Jun 19 14:43:29 UTC 2022

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

Log Message:
lang/tcl-expect: Adjust comments

Add a commented-out secondary HOMEPAGE.

Rototill patch comments after reading them enough to mostly understand.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/lang/tcl-expect/Makefile.common
cvs rdiff -u -r1.24 -r1.25 pkgsrc/lang/tcl-expect/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/tcl-expect/patches/patch-Makefile.in
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/tcl-expect/patches/patch-configure
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/tcl-expect/patches/patch-exp__chan.c

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

Modified files:

Index: pkgsrc/lang/tcl-expect/Makefile.common
diff -u pkgsrc/lang/tcl-expect/Makefile.common:1.14 pkgsrc/lang/tcl-expect/Makefile.common:1.15
--- pkgsrc/lang/tcl-expect/Makefile.common:1.14 Tue Jun 14 10:56:15 2022
+++ pkgsrc/lang/tcl-expect/Makefile.common      Sun Jun 19 14:43:28 2022
@@ -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.
@@ -6,6 +6,7 @@
 DISTNAME=      expect${EXPECT_FNAME}
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=expect/}
 HOMEPAGE=      http://expect.sourceforge.net/
+#HOMEPAGE+=    https://core.tcl-lang.org/expect/index
 
 EXPECT_FNAME=  5.45
 EXPECT_VERSION=        5.45.0

Index: pkgsrc/lang/tcl-expect/distinfo
diff -u pkgsrc/lang/tcl-expect/distinfo:1.24 pkgsrc/lang/tcl-expect/distinfo:1.25
--- pkgsrc/lang/tcl-expect/distinfo:1.24        Tue Jun 14 10:56:15 2022
+++ pkgsrc/lang/tcl-expect/distinfo     Sun Jun 19 14:43:28 2022
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.24 2022/06/14 10:56:15 gdt Exp $
+$NetBSD: distinfo,v 1.25 2022/06/19 14:43:28 gdt Exp $
 
 BLAKE2s (expect5.45.tar.gz) = 38c440ed0868322b6ec7438decaa036a636e7d700191b754c1e4a7dc0fdd0c46
 SHA512 (expect5.45.tar.gz) = be991c68241e607b3a689eae7e7966056dbfb577e857331d54a4911bd178c1816425217603b43918ad1b6d2e966271a0f01e79d7028a22e223562d59d10c8c51
 Size (expect5.45.tar.gz) = 628808 bytes
-SHA1 (patch-Makefile.in) = 3b234d232a47adc64b3a4d275237b64bbbf7fdf6
-SHA1 (patch-configure) = 843b330b46c7dd17deab1b2c133e5ae52d609ae9
-SHA1 (patch-exp__chan.c) = 5af6bf31fa87a4d9951be6bc978ede5440380981
+SHA1 (patch-Makefile.in) = 06858e50b7517901d0a7dc58f2149e7ef09b615b
+SHA1 (patch-configure) = 51ae6c4aaf6ff1ac510aec0d062310a91cb959c2
+SHA1 (patch-exp__chan.c) = 045d3442cfdc0976c8767a6cbdd9bbf2dcc8ed87

Index: pkgsrc/lang/tcl-expect/patches/patch-Makefile.in
diff -u pkgsrc/lang/tcl-expect/patches/patch-Makefile.in:1.5 pkgsrc/lang/tcl-expect/patches/patch-Makefile.in:1.6
--- pkgsrc/lang/tcl-expect/patches/patch-Makefile.in:1.5        Tue Jun 14 10:56:15 2022
+++ pkgsrc/lang/tcl-expect/patches/patch-Makefile.in    Sun Jun 19 14:43:28 2022
@@ -1,20 +1,20 @@
-$NetBSD: patch-Makefile.in,v 1.5 2022/06/14 10:56:15 gdt 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.)
-
-Define SHLIB_VERSION, mysteriously.
-
-Add a variable for a static library version, build and install it.
-
-Use standard rather than namespaced directories.
+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).
+
+Build and install a static version of the expect library.
+
+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.
-
-\todo Push changes upstream, or explain why that's not appropriate.
+\todo File changes upstream (but upstream is not functioning).
 
 --- Makefile.in.orig   2010-09-30 17:14:07.000000000 +0000
 +++ Makefile.in

Index: pkgsrc/lang/tcl-expect/patches/patch-configure
diff -u pkgsrc/lang/tcl-expect/patches/patch-configure:1.2 pkgsrc/lang/tcl-expect/patches/patch-configure:1.3
--- pkgsrc/lang/tcl-expect/patches/patch-configure:1.2  Tue Jun 14 10:56:15 2022
+++ pkgsrc/lang/tcl-expect/patches/patch-configure      Sun Jun 19 14:43:28 2022
@@ -1,19 +1,20 @@
-$NetBSD: patch-configure,v 1.2 2022/06/14 10:56:15 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.)
+$NetBSD: patch-configure,v 1.3 2022/06/19 14:43:28 gdt Exp $
 
 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.
+
+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.
 
-\todo Expain why PVNODOTS isn't the PACKAGE_VERSION_NO_DOTS that
-upstream configure already computes.
+Substitute the already-computed SHLIB_VERSION, for use in Makefile.in.
 
-\todo Push changes upstream, or explain why that's not appropriate.
+\todo File changes upstream (but upstream is not functioning).
 
 --- configure.orig     2010-09-16 20:46:47.000000000 +0000
 +++ configure

Index: pkgsrc/lang/tcl-expect/patches/patch-exp__chan.c
diff -u pkgsrc/lang/tcl-expect/patches/patch-exp__chan.c:1.1 pkgsrc/lang/tcl-expect/patches/patch-exp__chan.c:1.2
--- pkgsrc/lang/tcl-expect/patches/patch-exp__chan.c:1.1        Sun May 15 01:56:24 2022
+++ pkgsrc/lang/tcl-expect/patches/patch-exp__chan.c    Sun Jun 19 14:43:28 2022
@@ -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 
 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    2010-07-01 00:53:49.000000000 +0000
 +++ exp_chan.c
 @@ -7,6 +7,7 @@