CVS commit: pkgsrc/devel/libslang2

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel/libslang2
From: "Kevin Bloom" <ktnb%netbsd.org@localhost>
Date: Sun, 5 Jan 2025 16:35:10 +0000

Module Name:    pkgsrc
Committed By:   ktnb
Date:           Sun Jan  5 16:35:09 UTC 2025

Modified Files:
        pkgsrc/devel/libslang2: Makefile PLIST distinfo
        pkgsrc/devel/libslang2/patches: patch-autoconf_slangpc.in
            patch-src_slproc.c
Added Files:
        pkgsrc/devel/libslang2/patches: patch-src_Makefile.in
Removed Files:
        pkgsrc/devel/libslang2/patches: patch-aa patch-ae patch-af

Log Message:
libslang2: update to 2.3.3

Many bug fixes, updates, and enhancements since 2.2.4


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/devel/libslang2/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/libslang2/PLIST
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/libslang2/distinfo
cvs rdiff -u -r1.4 -r0 pkgsrc/devel/libslang2/patches/patch-aa
cvs rdiff -u -r1.5 -r0 pkgsrc/devel/libslang2/patches/patch-ae
cvs rdiff -u -r1.3 -r0 pkgsrc/devel/libslang2/patches/patch-af
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/libslang2/patches/patch-autoconf_slangpc.in \
    pkgsrc/devel/libslang2/patches/patch-src_slproc.c
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/libslang2/patches/patch-src_Makefile.in

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

Modified files:

Index: pkgsrc/devel/libslang2/Makefile
diff -u pkgsrc/devel/libslang2/Makefile:1.26 pkgsrc/devel/libslang2/Makefile:1.27
--- pkgsrc/devel/libslang2/Makefile:1.26        Sun Sep 29 02:21:41 2024
+++ pkgsrc/devel/libslang2/Makefile     Sun Jan  5 16:35:09 2025
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2024/09/29 02:21:41 ktnb Exp $
+# $NetBSD: Makefile,v 1.27 2025/01/05 16:35:09 ktnb Exp $
 
-DISTNAME=      slang-2.2.4
+DISTNAME=      slang-2.3.3
 PKGNAME=       lib${DISTNAME:slang%=slang2%}
-PKGREVISION=   5
 CATEGORIES=    devel
-MASTER_SITES=  ftp://space.mit.edu/pub/davis/slang/v2.2/
-MASTER_SITES+= ftp://ftp.ntua.gr/pub/lang/slang/slang/v2.2/
+MASTER_SITES=  https://www.jedsoft.org/releases/slang/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -35,13 +33,6 @@ INSTALL_MAKE_FLAGS+= DEST_SLSH_CONF_DIR=
 
 CONFIGURE_ARGS+=       --includedir=${PREFIX}/include/slang2
 
-# Supposedly there is a bug when compiling libslang with -O2.
-# The following fixes issues with editors/jed not being able
-# to open things.
-# https://bugzilla.redhat.com/show_bug.cgi?id=843109#c2
-BUILDLINK_TRANSFORM+=  rm:-O2
-CFLAGS+=       -O0
-
 .include "../../mk/termcap.buildlink3.mk"
 
 .if ${TERMCAP_TYPE} == "termcap"
@@ -57,7 +48,8 @@ REPLACE.slsh.old=     slsh
 REPLACE.slsh.new=      ${PREFIX}/bin/slsh
 REPLACE_FILES.slsh=    slsh/scripts/jpegsize slsh/scripts/lsrpm \
                        slsh/scripts/sldb slsh/scripts/slprof \
-                       slsh/scripts/svnsh slsh/scripts/slstkchk
+                       slsh/scripts/svnsh slsh/scripts/slstkchk \
+                       slsh/scripts/slcov
 
 USE_FEATURES=          # empty (used in options.mk)
 .include "options.mk"

Index: pkgsrc/devel/libslang2/PLIST
diff -u pkgsrc/devel/libslang2/PLIST:1.5 pkgsrc/devel/libslang2/PLIST:1.6
--- pkgsrc/devel/libslang2/PLIST:1.5    Wed Dec  7 19:49:00 2011
+++ pkgsrc/devel/libslang2/PLIST        Sun Jan  5 16:35:09 2025
@@ -1,24 +1,31 @@
-@comment $NetBSD: PLIST,v 1.5 2011/12/07 19:49:00 drochner Exp $
+@comment $NetBSD: PLIST,v 1.6 2025/01/05 16:35:09 ktnb Exp $
 bin/slsh
 include/slang2/slang.h
 include/slang2/slcurses.h
-lib/libslang2.la
+lib/libslang2.so
+lib/libslang2.so.2
+lib/libslang2.so.${PKGVERSION}
 lib/pkgconfig/slang.pc
-lib/slang/v2/modules/csv-module.la
-lib/slang/v2/modules/fcntl-module.la
-lib/slang/v2/modules/fork-module.la
-lib/slang/v2/modules/iconv-module.la
+lib/slang/v2/modules/base64-module.so
+lib/slang/v2/modules/chksum-module.so
+lib/slang/v2/modules/csv-module.so
+lib/slang/v2/modules/fcntl-module.so
+lib/slang/v2/modules/fork-module.so
+lib/slang/v2/modules/histogram-module.so
+lib/slang/v2/modules/iconv-module.so
+lib/slang/v2/modules/json-module.so
 ${PLIST.oniguruma}lib/slang/v2/modules/onig-module.la
 ${PLIST.pcre}lib/slang/v2/modules/pcre-module.la
 ${PLIST.png}lib/slang/v2/modules/png-module.la
-lib/slang/v2/modules/rand-module.la
-lib/slang/v2/modules/select-module.la
-lib/slang/v2/modules/slsmg-module.la
-lib/slang/v2/modules/socket-module.la
-lib/slang/v2/modules/sysconf-module.la
-lib/slang/v2/modules/termios-module.la
-lib/slang/v2/modules/varray-module.la
-lib/slang/v2/modules/zlib-module.la
+lib/slang/v2/modules/rand-module.so
+lib/slang/v2/modules/select-module.so
+lib/slang/v2/modules/slsmg-module.so
+lib/slang/v2/modules/socket-module.so
+lib/slang/v2/modules/stats-module.so
+lib/slang/v2/modules/sysconf-module.so
+lib/slang/v2/modules/termios-module.so
+lib/slang/v2/modules/varray-module.so
+lib/slang/v2/modules/zlib-module.so
 man/man1/slsh.1
 share/doc/slang/v2/COPYING
 share/doc/slang/v2/changes.txt
@@ -28,6 +35,10 @@ share/doc/slang/v2/slang.txt
 share/doc/slang/v2/slangdoc.html
 share/doc/slang/v2/slangfun.txt
 share/doc/slsh/html/slshfun-1.html
+share/doc/slsh/html/slshfun-10.html
+share/doc/slsh/html/slshfun-11.html
+share/doc/slsh/html/slshfun-12.html
+share/doc/slsh/html/slshfun-13.html
 share/doc/slsh/html/slshfun-2.html
 share/doc/slsh/html/slshfun-3.html
 share/doc/slsh/html/slshfun-4.html
@@ -40,12 +51,17 @@ share/doc/slsh/html/slshfun.html
 share/examples/libslang2/slsh.rc
 share/slsh/arrayfuns.sl
 share/slsh/autoload.sl
+share/slsh/base64.sl
+share/slsh/chksum.sl
 share/slsh/cmaps/cool.map
 share/slsh/cmaps/coolwarm.map
 share/slsh/cmaps/copper.map
+share/slsh/cmaps/cubicl.map
+share/slsh/cmaps/cubicyf.map
 share/slsh/cmaps/drywet.map
 share/slsh/cmaps/ds9b.map
 share/slsh/cmaps/ds9sls.map
+share/slsh/cmaps/edge.map
 share/slsh/cmaps/gebco.map
 share/slsh/cmaps/globe.map
 share/slsh/cmaps/gray.map
@@ -67,12 +83,19 @@ share/slsh/cmdopt.sl
 share/slsh/csv.sl
 share/slsh/fcntl.sl
 share/slsh/fork.sl
+share/slsh/fswalk.sl
 share/slsh/glob.sl
 share/slsh/help/arrayfuns.hlp
+share/slsh/help/base64funs.hlp
+share/slsh/help/chksumfuns.hlp
 share/slsh/help/cmdopt.hlp
 share/slsh/help/csvfuns.hlp
 share/slsh/help/forkfuns.hlp
+share/slsh/help/fswalk.hlp
 share/slsh/help/glob.hlp
+share/slsh/help/histfuns.hlp
+share/slsh/help/jsonfuns.hlp
+share/slsh/help/listfuns.hlp
 share/slsh/help/onigfuns.hlp
 share/slsh/help/pcrefuns.hlp
 share/slsh/help/pngfuns.hlp
@@ -85,8 +108,13 @@ share/slsh/help/require.hlp
 share/slsh/help/setfuns.hlp
 share/slsh/help/slsmg.hlp
 share/slsh/help/sockfuns.hlp
+share/slsh/help/statsfuns.hlp
 share/slsh/help/structfuns.hlp
+share/slsh/help/timestamp.hlp
+share/slsh/histogram.sl
 share/slsh/iconv.sl
+share/slsh/json.sl
+share/slsh/listfuns.sl
 share/slsh/onig.sl
 share/slsh/pcre.sl
 share/slsh/png.sl
@@ -106,6 +134,7 @@ share/slsh/rline/slrline.rc
 share/slsh/rline/vikeys.sl
 share/slsh/scripts/jpegsize
 share/slsh/scripts/lsrpm
+share/slsh/scripts/slcov
 share/slsh/scripts/sldb
 share/slsh/scripts/slprof
 share/slsh/scripts/slstkchk
@@ -119,10 +148,15 @@ share/slsh/slshhelp.sl
 share/slsh/slshrl.sl
 share/slsh/slsmg.sl
 share/slsh/socket.sl
+share/slsh/stats.sl
+share/slsh/statslib/ad_test.sl
+share/slsh/statslib/ks_test.sl
+share/slsh/statslib/kuiper.sl
 share/slsh/stkcheck.sl
 share/slsh/structfuns.sl
 share/slsh/sysconf.sl
 share/slsh/termios.sl
+share/slsh/timestamp.sl
 share/slsh/varray.sl
 share/slsh/zlib.sl
 @pkgdir share/slsh/local-packages

Index: pkgsrc/devel/libslang2/distinfo
diff -u pkgsrc/devel/libslang2/distinfo:1.11 pkgsrc/devel/libslang2/distinfo:1.12
--- pkgsrc/devel/libslang2/distinfo:1.11        Tue Oct 26 10:15:28 2021
+++ pkgsrc/devel/libslang2/distinfo     Sun Jan  5 16:35:09 2025
@@ -1,14 +1,12 @@
-$NetBSD: distinfo,v 1.11 2021/10/26 10:15:28 nia Exp $
+$NetBSD: distinfo,v 1.12 2025/01/05 16:35:09 ktnb Exp $
 
-BLAKE2s (slang-2.2.4.tar.bz2) = b86e9fd2f6927981462cc60634a07185756add7f5fcebe2eed4148f44df25b9f
-SHA512 (slang-2.2.4.tar.bz2) = aaf0dcea5f1583487732098bd9dfe47f4fd968d81783955f58ed7bbffb852c217cde8999f2a515d77c22d44efc79047fc841eea6fecc48f18b402461ce6a848f
-Size (slang-2.2.4.tar.bz2) = 1427363 bytes
-SHA1 (patch-aa) = a323b479be021fe229a8f17684a6e3b9ba1323f9
+BLAKE2s (slang-2.3.3.tar.bz2) = d8ba51ad216a71ec3da2ee5ea994f73223c632c8197a87b5cb1e53b8b9463e61
+SHA512 (slang-2.3.3.tar.bz2) = f882f09e3fcd53427de0f233c9fc3ab15497f2323007be9a084696c8cf810ffe2726cd003149e757df26198b390b9f8c1ff411dc6473513457bd0f94722f8490
+Size (slang-2.3.3.tar.bz2) = 1646311 bytes
 SHA1 (patch-ab) = 1f5743569c43bcfebb925b275d7032f853a34943
 SHA1 (patch-ac) = 1181b6ce5de5c7c149aa8692dbcded981bda688e
 SHA1 (patch-ad) = 9ab953b8d850832f49f8af9bdb397f474af209eb
-SHA1 (patch-ae) = 85cc759196617a81cee65460e5aabb3a966a6a77
-SHA1 (patch-af) = 15ae3f27d727492c3bebcbfbca005a78455b8774
 SHA1 (patch-ag) = 25be7b526b2adb90d7b83645cc93fa67743fe86f
-SHA1 (patch-autoconf_slangpc.in) = face2e156e75854bb9ce07882ee02bbdc077aba5
-SHA1 (patch-src_slproc.c) = 297723830b85ebed124ec4ff7bd6608bf2e23f29
+SHA1 (patch-autoconf_slangpc.in) = 543e41ebb2a364d7869f4a1fac1d7c90332333d0
+SHA1 (patch-src_Makefile.in) = ed771bffaf4133b18a783218d7983eb68b3a8f03
+SHA1 (patch-src_slproc.c) = 5e321481cd983c0c03a4938c6b66dd194f5badb3

Index: pkgsrc/devel/libslang2/patches/patch-autoconf_slangpc.in
diff -u pkgsrc/devel/libslang2/patches/patch-autoconf_slangpc.in:1.1 pkgsrc/devel/libslang2/patches/patch-autoconf_slangpc.in:1.2
--- pkgsrc/devel/libslang2/patches/patch-autoconf_slangpc.in:1.1        Thu Sep 30 08:33:21 2021
+++ pkgsrc/devel/libslang2/patches/patch-autoconf_slangpc.in    Sun Jan  5 16:35:09 2025
@@ -1,14 +1,14 @@
-$NetBSD: patch-autoconf_slangpc.in,v 1.1 2021/09/30 08:33:21 wiz Exp $
+$NetBSD: patch-autoconf_slangpc.in,v 1.2 2025/01/05 16:35:09 ktnb Exp $
 
 Fix library name.
 
---- autoconf/slangpc.in.orig   2011-04-11 02:37:07.000000000 +0000
+--- autoconf/slangpc.in.orig   2022-08-05 10:33:27.000000000 +0000
 +++ autoconf/slangpc.in
 @@ -7,6 +7,6 @@ Name: slang
  Description: S-Lang programming library and interpreter
  URL: http://www.jedsoft.org/slang/
  Version: @slang_version@
 -Libs: -L${libdir} -lslang
-+Libs: -L${libdir} -lslang2
++Libs: -Wl,-R${libdir} -Wl,-R${libdir} -Wl,-R${libdir} -Wl,-R${libdir} -L${libdir} -lslang2
  Libs.private: @TERMCAP@ @DYNAMIC_LINK_LIB@ @LIBS@ @M_LIB@
  Cflags: -I${includedir}
Index: pkgsrc/devel/libslang2/patches/patch-src_slproc.c
diff -u pkgsrc/devel/libslang2/patches/patch-src_slproc.c:1.1 pkgsrc/devel/libslang2/patches/patch-src_slproc.c:1.2
--- pkgsrc/devel/libslang2/patches/patch-src_slproc.c:1.1       Thu May 17 10:35:59 2018
+++ pkgsrc/devel/libslang2/patches/patch-src_slproc.c   Sun Jan  5 16:35:09 2025
@@ -1,16 +1,16 @@
-$NetBSD: patch-src_slproc.c,v 1.1 2018/05/17 10:35:59 jperkin Exp $
+$NetBSD: patch-src_slproc.c,v 1.2 2025/01/05 16:35:09 ktnb Exp $
 
 Set _XOPEN_SOURCE correctly on SunOS.
 
---- src/slproc.c.orig  2011-04-11 02:37:07.000000000 +0000
+--- src/slproc.c.orig  2022-08-05 10:33:27.000000000 +0000
 +++ src/slproc.c
-@@ -20,12 +20,14 @@ Foundation, Inc., 59 Temple Place - Suit
- USA.
- */
+@@ -28,12 +28,14 @@ USA.
+ # define _DEFAULT_SOURCE 1
+ #endif
  
 +#if !defined(__sun) || (!defined(_XOPEN_SOURCE) && (__STDC_VERSION__-0 < 199901L))
  #ifndef _XOPEN_SOURCE
- # define _XOPEN_SOURCE
+ # define _XOPEN_SOURCE 1
  #endif
  #ifndef _XOPEN_SOURCE_EXTENDED
  # define _XOPEN_SOURCE_EXTENDED 1

Added files:

Index: pkgsrc/devel/libslang2/patches/patch-src_Makefile.in
diff -u /dev/null pkgsrc/devel/libslang2/patches/patch-src_Makefile.in:1.1
--- /dev/null   Sun Jan  5 16:35:10 2025
+++ pkgsrc/devel/libslang2/patches/patch-src_Makefile.in        Sun Jan  5 16:35:09 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_Makefile.in,v 1.1 2025/01/05 16:35:09 ktnb Exp $
+
+Use slang2 since slang1 still exists in pkgsrc
+
+--- src/Makefile.in.orig       2022-08-05 10:33:27.000000000 +0000
++++ src/Makefile.in
+@@ -81,7 +81,7 @@ CP           = cp
+ #---------------------------------------------------------------------------
+ # There should be no need to change anything below here.
+ #---------------------------------------------------------------------------
+-THIS_LIB              = slang#
++THIS_LIB              = slang2#
+ DLL_IMPLIB_NAME               = @DLL_IMPLIB_NAME@
+ OTHERSTUFF            =
+ THIS_LIB_DEFINES      = -DSLANG

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index