CVS commit: pkgsrc/lang/tcl-expect

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

Module Name:    pkgsrc
Committed By:   gdt
Date:           Tue Jun 14 10:56:15 UTC 2022

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

Log Message:
lang/tcl-expect: Add best-guess patch comments

The patches had a comment from 2012 that I cannot understand at all.
This replaces them with my best guess at the point of the patches.

Add users to Makefile.common, apparently only this package.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/lang/tcl-expect/Makefile.common
cvs rdiff -u -r1.23 -r1.24 pkgsrc/lang/tcl-expect/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/tcl-expect/patches/patch-Makefile.in
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/tcl-expect/patches/patch-configure

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.13 pkgsrc/lang/tcl-expect/Makefile.common:1.14
--- pkgsrc/lang/tcl-expect/Makefile.common:1.13 Tue May  3 23:38:38 2022
+++ pkgsrc/lang/tcl-expect/Makefile.common      Tue Jun 14 10:56:15 2022
@@ -1,4 +1,7 @@
-# $NetBSD: Makefile.common,v 1.13 2022/05/03 23:38:38 gdt Exp $
+# $NetBSD: Makefile.common,v 1.14 2022/06/14 10:56:15 gdt Exp $
+
+# used by lang/tcl-expect/Makefile
+# \todo Explain why there is only one user, or fold into Makefile.
 
 DISTNAME=      expect${EXPECT_FNAME}
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=expect/}

Index: pkgsrc/lang/tcl-expect/distinfo
diff -u pkgsrc/lang/tcl-expect/distinfo:1.23 pkgsrc/lang/tcl-expect/distinfo:1.24
--- pkgsrc/lang/tcl-expect/distinfo:1.23        Sun May 15 01:56:24 2022
+++ pkgsrc/lang/tcl-expect/distinfo     Tue Jun 14 10:56:15 2022
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.23 2022/05/15 01:56:24 dholland Exp $
+$NetBSD: distinfo,v 1.24 2022/06/14 10:56:15 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) = 24efcbdb0a21985cb8a0fb7812c5f45f67de7c30
-SHA1 (patch-configure) = a16c833e61d23f63abff1413522b99cd2251bc34
+SHA1 (patch-Makefile.in) = 3b234d232a47adc64b3a4d275237b64bbbf7fdf6
+SHA1 (patch-configure) = 843b330b46c7dd17deab1b2c133e5ae52d609ae9
 SHA1 (patch-exp__chan.c) = 5af6bf31fa87a4d9951be6bc978ede5440380981

Index: pkgsrc/lang/tcl-expect/patches/patch-Makefile.in
diff -u pkgsrc/lang/tcl-expect/patches/patch-Makefile.in:1.4 pkgsrc/lang/tcl-expect/patches/patch-Makefile.in:1.5
--- pkgsrc/lang/tcl-expect/patches/patch-Makefile.in:1.4        Mon Aug 27 07:12:08 2018
+++ pkgsrc/lang/tcl-expect/patches/patch-Makefile.in    Tue Jun 14 10:56:15 2022
@@ -1,6 +1,20 @@
-$NetBSD: patch-Makefile.in,v 1.4 2018/08/27 07:12:08 wiz Exp $
+$NetBSD: patch-Makefile.in,v 1.5 2022/06/14 10:56:15 gdt Exp $
 
-New Makefile.in patch, no libtool
+(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.
+
+Include LDFLAGS when linking (for RELRO).
+
+Version the shlib and the expect binary.
+
+\todo Push changes upstream, or explain why that's not appropriate.
 
 --- 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.1 pkgsrc/lang/tcl-expect/patches/patch-configure:1.2
--- pkgsrc/lang/tcl-expect/patches/patch-configure:1.1  Tue Aug 21 21:33:58 2012
+++ pkgsrc/lang/tcl-expect/patches/patch-configure      Tue Jun 14 10:56:15 2022
@@ -1,6 +1,19 @@
-$NetBSD: patch-configure,v 1.1 2012/08/21 21:33:58 marino Exp $
+$NetBSD: patch-configure,v 1.2 2022/06/14 10:56:15 gdt Exp $
 
-New configure patch, no libtool
+(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.
+
+\todo Expain why PVNODOTS isn't the PACKAGE_VERSION_NO_DOTS that
+upstream configure already computes.
+
+\todo Push changes upstream, or explain why that's not appropriate.
 
 --- configure.orig     2010-09-16 20:46:47.000000000 +0000
 +++ configure