freetalk: Update to 4.2

[Greg Troxel (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Wed Oct 7 10:41:00 2026 -0400
Changeset:	c7e7a0a2e9f635f1be08f9d74b3f441fe038bc55

Modified Files:
	freetalk/Makefile
	freetalk/distinfo
	freetalk/patches/patch-configure.ac

Log Message:
freetalk: Update to 4.2

Welcome to 2022!  Upstream publishes no NEWS, but there's a few very
deteiled ChangeLog entries.   More or less:

  - allow guile 2.2 and 3.0

  - start using argp (which is linuxy), without checking for it or
    adding the lib on !Linux.

  - rename autogen.sh to bootstrap for no apparent reason

packging changes:

  - change to guile 3.0
  - depend on argp, try to link it, give up and leave a note
  - follow churn

(ok leot@ to remove/rototill)

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

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

diffstat:
 freetalk/Makefile                   | 12 +++++++++---
 freetalk/distinfo                   |  8 ++++----
 freetalk/patches/patch-configure.ac | 20 +++++++++++---------
 3 files changed, 24 insertions(+), 16 deletions(-)

diffs:
diff --git a/freetalk/Makefile b/freetalk/Makefile
index 5c292dba82..5de487b5db 100644
--- a/freetalk/Makefile
+++ b/freetalk/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=	freetalk-4.1
+DISTNAME=	freetalk-4.2
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_GNU:=freetalk/}
 
@@ -18,10 +18,16 @@ CONFIGURE_ARGS+=	--infodir=${PREFIX}/${PKGINFODIR}
 USE_LANGUAGES=	c c++
 
 pre-configure:
-	${RUN} cd ${WRKSRC} && ./autogen.sh
+	${RUN} cd ${WRKSRC} && ./bootstrap
+
+# This is needed on NetBSD, probably on !Linux, but upstream
+# Makefile.am does not seem to have a hook for extra libs.
+# Reported to freetalk-dev%gnu.org@localhost 20261007.
+LDLFLAGS+=	"-largp"
 
 .include "../../chat/loudmouth/buildlink3.mk"
+.include "../../devel/argp/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
-.include "../../lang/guile20/buildlink3.mk"
+.include "../../lang/guile30/buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/freetalk/distinfo b/freetalk/distinfo
index 61b392b630..cbaad54e0d 100644
--- a/freetalk/distinfo
+++ b/freetalk/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-RMD160 (freetalk-4.1.tar.gz) = da82eca19441ec572ff34706ee2473a0c8f008c0
-SHA512 (freetalk-4.1.tar.gz) = 97a5d193f80c06926b5b3012383eb02613146cda36a170e43ea4c1a15803bd00eb7e0cf54464b584a507211063e6bd634e7883cc8b2aa4310b186ad66c820717
-Size (freetalk-4.1.tar.gz) = 134009 bytes
-SHA1 (patch-configure.ac) = e6e90165c1cdfb721622752e9feb5c5b32d5a62a
+BLAKE2s (freetalk-4.2.tar.gz) = 4d1de4158a71589546a2dfb53d93e7391a306ad47c7e65f86ffbb28541237fe7
+SHA512 (freetalk-4.2.tar.gz) = 372bea97e3737b1ab7cb37b255c90c2cee9822702cda08e073aa94472e9da3df8ac7202bd7325ffbdf84bf7ce10e40fceb3141ee099172125df694edb2381d1d
+Size (freetalk-4.2.tar.gz) = 331897 bytes
+SHA1 (patch-configure.ac) = 297bd63a12847fb893acfd599347e186f1967388
diff --git a/freetalk/patches/patch-configure.ac b/freetalk/patches/patch-configure.ac
index 343c6463f9..78d0839fa6 100644
--- a/freetalk/patches/patch-configure.ac
+++ b/freetalk/patches/patch-configure.ac
@@ -1,10 +1,12 @@
 $NetBSD$
 
-Avoid non-standard `==' test(1) operator.
+Remediate bashism.
 
---- configure.ac.orig	2014-12-20 06:11:16.000000000 +0000
+Reported to freetalk-dev%gnu.org@localhost 20261007.
+
+--- configure.ac.orig	2022-06-09 20:08:35.000000000 +0000
 +++ configure.ac
-@@ -59,7 +59,7 @@ AC_CHECK_LIB([readline -lcurses],[readli
+@@ -49,7 +49,7 @@ AC_CHECK_LIB([readline -lcurses],[readli
  AC_CHECK_LIB([readline -ltermcap],[readline],[RLLIBS="-lreadline -ltermcap"])
  AC_CHECK_LIB([readline -lncurses],[readline],[RLLIBS="-lreadline -lncurses"])
  
@@ -13,13 +15,13 @@ Avoid non-standard `==' test(1) operator.
     AC_MSG_ERROR([ERROR! readline not found..])
  fi
  AC_SUBST(RLLIBS)
-@@ -72,15 +72,15 @@ if test "x$PKGCONFIG" = "xno"; then
- fi
- 
+@@ -64,15 +64,15 @@ fi
  PKG_CHECK_MODULES([GUILE], [guile-2.0], [HAVE_GUILE_2="yes"], [HAVE_GUILE_2="no"])
--if test "x$HAVE_GUILE_2" == "xno"; then
-+if test "x$HAVE_GUILE_2" = "xno"; then
-    AC_MSG_ERROR([ERROR! guile-2.0 not found...])
+ PKG_CHECK_MODULES([GUILE], [guile-2.2], [HAVE_GUILE_2_2="yes"], [HAVE_GUILE_2_2="no"])
+ PKG_CHECK_MODULES([GUILE], [guile-3.0], [HAVE_GUILE_3="yes"], [HAVE_GUILE_3="no"])
+-if test "x$HAVE_GUILE_2" == "xno" && test "x$HAVE_GUILE_2_2" == "xno" && test "x$HAVE_GUILE_3" == "xno"; then
++if test "x$HAVE_GUILE_2" = "xno" && test "x$HAVE_GUILE_2_2" = "xno" && test "x$HAVE_GUILE_3" = "xno"; then
+    AC_MSG_ERROR([ERROR! guile-2.0, or guile-2.2, or guile-3.0 not found...])
  fi
  PKG_CHECK_MODULES([GLIB], [glib-2.0], [HAVE_GLIB_2="yes"], [HAVE_GLIB_2="no"])
 -if test "x$HAVE_GLIB_2" == "xno"; then