CVS commit: pkgsrc/lang/jimtcl

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Dec  7 17:51:21 UTC 2021

Modified Files:
        pkgsrc/lang/jimtcl: Makefile PLIST distinfo
Added Files:
        pkgsrc/lang/jimtcl/patches: patch-autosetup_cc-shared.tcl
            patch-jim-aio.c

Log Message:
jimtcl: Update to 0.81.  Fix Darwin and SunOS.

This release contains bug fixes plus a number of additional features. A
summary is below. See git for the full changelog.

Thanks to everyone who contributed to this release.

Bugs fixed in version 0.81

 - info complete - return 0 if the script is missing an end quote
 - sqlite3 - return integers as 64 bit values, not 32 bit

Features and improvements added in version 0.81

 - New redis client extension
 - expr - TIP 582 - support comments in expressions
 - Many commands now accept “safe” integer expressions rather than simple
   integers: loop, range, incr, string repeat, lrepeat, pack, unpack, rand
 - string and list indexes now accept “safe” integer expressions
 - loop can now omit the start value
 - New xtrace command for execution trace support
 - Add history keep
 - Add support for lsearch -index and lsearch -stride, the latter per TIP 351
 - lsort -index now supports multiple indices
 - Add support for lsort -stride
 - open now supports POSIX-style access arguments
 - sdl extension now supports SDL2, and basic text support is added as well
   as polling support
 - ABI version checking is now available to allow dynamic modules to verify
   they are loaded into a compatible interpreter

Possible incompatibilities in version 0.81

 - If the --compat configure option is not set, expr now only allows a single
   argument (per TIP 526)


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/jimtcl/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/jimtcl/PLIST
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/jimtcl/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/jimtcl/patches/patch-autosetup_cc-shared.tcl \
    pkgsrc/lang/jimtcl/patches/patch-jim-aio.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/jimtcl/Makefile
diff -u pkgsrc/lang/jimtcl/Makefile:1.6 pkgsrc/lang/jimtcl/Makefile:1.7
--- pkgsrc/lang/jimtcl/Makefile:1.6     Thu May  6 15:19:39 2021
+++ pkgsrc/lang/jimtcl/Makefile Tue Dec  7 17:51:20 2021
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2021/05/06 15:19:39 tnn Exp $
+# $NetBSD: Makefile,v 1.7 2021/12/07 17:51:20 jperkin Exp $
 
-DISTNAME=      jimtcl-0.80
-PKGREVISION=   1
+DISTNAME=      jimtcl-0.81
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=msteveb/}
 
@@ -23,12 +22,20 @@ CONFIGURE_ARGS+=    --disable-jim-regexp
 REPLACE_INTERPRETER+=  jimsh
 REPLACE.jimsh.old=     /usr/bin/env jimsh
 REPLACE.jimsh.new=     ${PREFIX}/bin/jimsh
-REPLACE_FILES.jimsh=   build-jim-ext.in
+REPLACE_FILES.jimsh=   build-jim-ext.in jimdb
 
 TEST_TARGET=   test
 
+OPSYSVARS+=    SOEXT SONAME
+SOEXT.Darwin=  dylib
+SONAME.Darwin= libjim.${PKGVERSION_NOREV}.${SOEXT}
+SOEXT.*=       so
+SONAME.*=      libjim.${SOEXT}.${PKGVERSION_NOREV}
+
+PLIST_SUBST+=  SOEXT=${SOEXT} SONAME=${SONAME}
+
 post-install:
-       ${LN} -sf libjim.so.${PKGVERSION_NOREV} ${DESTDIR}${PREFIX}/lib/libjim.so
+       ${LN} -sf ${SONAME} ${DESTDIR}${PREFIX}/lib/libjim.${SOEXT}
 
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/lang/jimtcl/PLIST
diff -u pkgsrc/lang/jimtcl/PLIST:1.5 pkgsrc/lang/jimtcl/PLIST:1.6
--- pkgsrc/lang/jimtcl/PLIST:1.5        Thu May  6 15:19:39 2021
+++ pkgsrc/lang/jimtcl/PLIST    Tue Dec  7 17:51:20 2021
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.5 2021/05/06 15:19:39 tnn Exp $
+@comment $NetBSD: PLIST,v 1.6 2021/12/07 17:51:20 jperkin Exp $
 bin/build-jim-ext
+bin/jimdb
 bin/jimsh
 include/jim-config.h
 include/jim-eventloop.h
@@ -9,7 +10,7 @@ include/jim-win32compat.h
 include/jim.h
 lib/jim/README.extensions
 lib/jim/tcltest.tcl
-lib/libjim.so
-lib/libjim.so.${PKGVERSION}
+lib/libjim.${SOEXT}
+lib/${SONAME}
 lib/pkgconfig/jimtcl.pc
 share/doc/jimtcl/Tcl.html

Index: pkgsrc/lang/jimtcl/distinfo
diff -u pkgsrc/lang/jimtcl/distinfo:1.7 pkgsrc/lang/jimtcl/distinfo:1.8
--- pkgsrc/lang/jimtcl/distinfo:1.7     Tue Oct 26 10:51:39 2021
+++ pkgsrc/lang/jimtcl/distinfo Tue Dec  7 17:51:20 2021
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.7 2021/10/26 10:51:39 nia Exp $
+$NetBSD: distinfo,v 1.8 2021/12/07 17:51:20 jperkin Exp $
 
-BLAKE2s (jimtcl-0.80.tar.gz) = a55c037039b8e5a6cd70889cdf57113669c189bc05285e3418b7f770c58a4f52
-SHA512 (jimtcl-0.80.tar.gz) = 37f14263f2101caaa632acf5e426dd7f1d6f75143875359c1daed59a039a9c64bbdf7941ce12b76bf9b209521b3967fd2b1d94a6afde7b2a8dd173d160858225
-Size (jimtcl-0.80.tar.gz) = 3130592 bytes
+BLAKE2s (jimtcl-0.81.tar.gz) = b21d50988993b0dc9ca0a987c0120a5d42699c747329480b99ab249b807385f7
+SHA512 (jimtcl-0.81.tar.gz) = 5f798b15fd32673e2e2769e25c4dfeee43696e5bbd2d3ec3fd2f312fa49da9ef057fb4de81a10d3812dc07fb2e40ed79924b024e537e064d3213b10e06a416b6
+Size (jimtcl-0.81.tar.gz) = 3977705 bytes
+SHA1 (patch-autosetup_cc-shared.tcl) = 02b663ec07499c04fec1e0c462fdede37dc9ab3f
+SHA1 (patch-jim-aio.c) = 0da49b824d60e5d6303dd69922f5953272434925

Added files:

Index: pkgsrc/lang/jimtcl/patches/patch-autosetup_cc-shared.tcl
diff -u /dev/null pkgsrc/lang/jimtcl/patches/patch-autosetup_cc-shared.tcl:1.1
--- /dev/null   Tue Dec  7 17:51:21 2021
+++ pkgsrc/lang/jimtcl/patches/patch-autosetup_cc-shared.tcl    Tue Dec  7 17:51:21 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-autosetup_cc-shared.tcl,v 1.1 2021/12/07 17:51:21 jperkin Exp $
+
+Fix install_name on Darwin.
+
+--- autosetup/cc-shared.tcl.orig       2021-11-27 23:06:54.000000000 +0000
++++ autosetup/cc-shared.tcl
+@@ -48,7 +48,7 @@ switch -glob -- [get-define host] {
+               define SH_LINKFLAGS ""
+               define SH_SOEXT .dylib
+               define SH_SOEXTVER .%s.dylib
+-              define SH_SOPREFIX -Wl,-install_name,
++              define SH_SOPREFIX -Wl,-install_name,$prefix/lib/
+               define SH_SOFULLPATH
+               define LD_LIBRARY_PATH DYLD_LIBRARY_PATH
+               define STRIPLIBFLAGS -x
Index: pkgsrc/lang/jimtcl/patches/patch-jim-aio.c
diff -u /dev/null pkgsrc/lang/jimtcl/patches/patch-jim-aio.c:1.1
--- /dev/null   Tue Dec  7 17:51:21 2021
+++ pkgsrc/lang/jimtcl/patches/patch-jim-aio.c  Tue Dec  7 17:51:21 2021
@@ -0,0 +1,39 @@
+$NetBSD: patch-jim-aio.c,v 1.1 2021/12/07 17:51:21 jperkin Exp $
+
+Avoid sun define on SunOS.
+
+--- jim-aio.c.orig     2021-11-27 23:06:54.000000000 +0000
++++ jim-aio.c
+@@ -132,7 +132,7 @@ union sockaddr_any {
+     struct sockaddr_in6 sin6;
+ #endif
+ #if UNIX_SOCKETS
+-    struct sockaddr_un sun;
++    struct sockaddr_un sockun;
+ #endif
+ };
+ 
+@@ -530,9 +530,9 @@ static int JimParseIpAddress(Jim_Interp
+ #if UNIX_SOCKETS
+ static int JimParseDomainAddress(Jim_Interp *interp, const char *path, union sockaddr_any *sa, socklen_t *salen)
+ {
+-    sa->sun.sun_family = PF_UNIX;
+-    snprintf(sa->sun.sun_path, sizeof(sa->sun.sun_path), "%s", path);
+-    *salen = strlen(sa->sun.sun_path) + 1 + sizeof(sa->sun.sun_family);
++    sa->sockun.sun_family = PF_UNIX;
++    snprintf(sa->sockun.sun_path, sizeof(sa->sockun.sun_path), "%s", path);
++    *salen = strlen(sa->sockun.sun_path) + 1 + sizeof(sa->sockun.sun_family);
+ 
+     return JIM_OK;
+ }
+@@ -567,8 +567,8 @@ static Jim_Obj *JimFormatSocketAddress(J
+     switch (sa->sa.sa_family) {
+ #if UNIX_SOCKETS
+         case PF_UNIX:
+-            addr = sa->sun.sun_path;
+-            addrlen = salen - 1 - sizeof(sa->sun.sun_family);
++            addr = sa->sockun.sun_path;
++            addrlen = salen - 1 - sizeof(sa->sockun.sun_family);
+             if (addrlen < 0) {
+                 addrlen = 0;
+             }