[pkgsrc/trunk]: pkgsrc/devel/libslang2 update to 2.2.4

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/devel/libslang2 update to 2.2.4
From: drochner <drochner%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 11:37:07 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/fff415110f87
branches:  trunk
changeset: 596529:fff415110f87
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Wed Dec 07 19:49:00 2011 +0000

description:
update to 2.2.4
changes: misc fixes and improvements - see the changes.txt file

diffstat:

 devel/libslang2/Makefile         |    7 +-
 devel/libslang2/PLIST            |   29 +++++++-
 devel/libslang2/distinfo         |   16 ++--
 devel/libslang2/patches/patch-aa |   20 ++--
 devel/libslang2/patches/patch-ab |   22 ++--
 devel/libslang2/patches/patch-ae |  148 ++++++++++++++++++++++++--------------
 devel/libslang2/patches/patch-af |   51 +++++++-----
 7 files changed, 180 insertions(+), 113 deletions(-)

diffs (truncated from 502 to 300 lines):

diff -r d5981542899a -r fff415110f87 devel/libslang2/Makefile
--- a/devel/libslang2/Makefile  Wed Dec 07 18:52:22 2011 +0000
+++ b/devel/libslang2/Makefile  Wed Dec 07 19:49:00 2011 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2011/06/10 10:14:14 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2011/12/07 19:49:00 drochner Exp $
 #
 
-DISTNAME=      slang-2.2.2
+DISTNAME=      slang-2.2.4
 PKGNAME=       lib${DISTNAME:slang%=slang2%}
-PKGREVISION=   2
 SVR4_PKGNAME=  lslan
 CATEGORIES=    devel
 MASTER_SITES=  ftp://space.mit.edu/pub/davis/slang/v2.2/ \
@@ -53,7 +52,7 @@
 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/svnsh slsh/scripts/slstkchk
 
 USE_FEATURES=          # empty (used in options.mk)
 .include "options.mk"
diff -r d5981542899a -r fff415110f87 devel/libslang2/PLIST
--- a/devel/libslang2/PLIST     Wed Dec 07 18:52:22 2011 +0000
+++ b/devel/libslang2/PLIST     Wed Dec 07 19:49:00 2011 +0000
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.4 2009/12/16 23:07:39 zafer Exp $
+@comment $NetBSD: PLIST,v 1.5 2011/12/07 19:49:00 drochner Exp $
 bin/slsh
 include/slang2/slang.h
 include/slang2/slcurses.h
 lib/libslang2.la
 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
@@ -40,6 +41,7 @@
 share/slsh/arrayfuns.sl
 share/slsh/autoload.sl
 share/slsh/cmaps/cool.map
+share/slsh/cmaps/coolwarm.map
 share/slsh/cmaps/copper.map
 share/slsh/cmaps/drywet.map
 share/slsh/cmaps/ds9b.map
@@ -62,10 +64,28 @@
 share/slsh/cmaps/topo.map
 share/slsh/cmaps/wysiwyg.map
 share/slsh/cmdopt.sl
+share/slsh/csv.sl
 share/slsh/fcntl.sl
 share/slsh/fork.sl
 share/slsh/glob.sl
-share/slsh/help
+share/slsh/help/arrayfuns.hlp
+share/slsh/help/cmdopt.hlp
+share/slsh/help/csvfuns.hlp
+share/slsh/help/forkfuns.hlp
+share/slsh/help/glob.hlp
+share/slsh/help/onigfuns.hlp
+share/slsh/help/pcrefuns.hlp
+share/slsh/help/pngfuns.hlp
+share/slsh/help/print.hlp
+share/slsh/help/process.hlp
+share/slsh/help/profile.hlp
+share/slsh/help/randfuns.hlp
+share/slsh/help/readascii.hlp
+share/slsh/help/require.hlp
+share/slsh/help/setfuns.hlp
+share/slsh/help/slsmg.hlp
+share/slsh/help/sockfuns.hlp
+share/slsh/help/structfuns.hlp
 share/slsh/iconv.sl
 share/slsh/onig.sl
 share/slsh/pcre.sl
@@ -78,16 +98,20 @@
 share/slsh/require.sl
 share/slsh/rline/complete.sl
 share/slsh/rline/editfuns.sl
+share/slsh/rline/editor.sl
 share/slsh/rline/emacskeys.sl
 share/slsh/rline/history.sl
+share/slsh/rline/histsrch.sl
 share/slsh/rline/slrline.rc
 share/slsh/rline/vikeys.sl
 share/slsh/scripts/jpegsize
 share/slsh/scripts/lsrpm
 share/slsh/scripts/sldb
 share/slsh/scripts/slprof
+share/slsh/scripts/slstkchk
 share/slsh/scripts/svnsh
 share/slsh/select.sl
+share/slsh/setfuns.sl
 share/slsh/sldb.sl
 share/slsh/sldbcore.sl
 share/slsh/sldbsock.sl
@@ -101,3 +125,4 @@
 share/slsh/termios.sl
 share/slsh/varray.sl
 share/slsh/zlib.sl
+@pkgdir share/slsh/local-packages
diff -r d5981542899a -r fff415110f87 devel/libslang2/distinfo
--- a/devel/libslang2/distinfo  Wed Dec 07 18:52:22 2011 +0000
+++ b/devel/libslang2/distinfo  Wed Dec 07 19:49:00 2011 +0000
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.4 2010/08/09 12:21:48 drochner Exp $
+$NetBSD: distinfo,v 1.5 2011/12/07 19:49:00 drochner Exp $
 
-SHA1 (slang-2.2.2.tar.bz2) = 13bb6344f71779cad8c05e1b6b1ef2d073888d58
-RMD160 (slang-2.2.2.tar.bz2) = d642c7d513aee198ad5d6d1b710c5c0f65dc381a
-Size (slang-2.2.2.tar.bz2) = 1366850 bytes
-SHA1 (patch-aa) = ce77fba22cd04aff3ddc3f30774d1de53dcb6465
-SHA1 (patch-ab) = 45d8e13a3672d30620e2cac458838d1c366f8013
+SHA1 (slang-2.2.4.tar.bz2) = 34e68a993888d0ae2ebc7bc31b40bc894813a7e2
+RMD160 (slang-2.2.4.tar.bz2) = fc023080f021201a99263d686ab4a8b87bbb575a
+Size (slang-2.2.4.tar.bz2) = 1427363 bytes
+SHA1 (patch-aa) = 3e962a751d1aeabef1a8216ed32509a71120f748
+SHA1 (patch-ab) = 1f5743569c43bcfebb925b275d7032f853a34943
 SHA1 (patch-ac) = 1181b6ce5de5c7c149aa8692dbcded981bda688e
 SHA1 (patch-ad) = 9ab953b8d850832f49f8af9bdb397f474af209eb
-SHA1 (patch-ae) = c87b6d9a18dc3cc90afa870f7b17f412e34f527d
-SHA1 (patch-af) = 225817d482d438e46f39831fe3a193f2c469fc82
+SHA1 (patch-ae) = 85cc759196617a81cee65460e5aabb3a966a6a77
+SHA1 (patch-af) = 15ae3f27d727492c3bebcbfbca005a78455b8774
 SHA1 (patch-ag) = 25be7b526b2adb90d7b83645cc93fa67743fe86f
diff -r d5981542899a -r fff415110f87 devel/libslang2/patches/patch-aa
--- a/devel/libslang2/patches/patch-aa  Wed Dec 07 18:52:22 2011 +0000
+++ b/devel/libslang2/patches/patch-aa  Wed Dec 07 19:49:00 2011 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2009/12/16 19:16:58 zafer Exp $
+$NetBSD: patch-aa,v 1.3 2011/12/07 19:49:01 drochner Exp $
 
---- src/Makefile.in.orig       2009-12-05 20:03:51.000000000 +0100
+--- src/Makefile.in.orig       2011-04-11 02:37:07.000000000 +0000
 +++ src/Makefile.in
 @@ -4,7 +4,7 @@
  #---------------------------------------------------------------------------
@@ -20,8 +20,8 @@
  ELFDIR = @ELFDIR@# Location of elf objects
  VERSION_SCRIPT        = $(SRCDIR)/slang.ver
  
-@@ -87,11 +87,11 @@ INSTALL_ELFLIB_TARGET      = @INSTALL_ELFLIB_
- CONFIG_H              = config.h
+@@ -87,11 +87,11 @@ CONFIG_H           = config.h
+ TERMINFO_INC          = terminfo/@TERMINFO_LAYOUT@.inc
  ALL_CFLAGS            = $(CFLAGS) -Dunix $(THIS_LIB_DEFINES)
  ALL_ELF_CFLAGS                = $(ELF_CFLAGS) -Dunix $(THIS_LIB_DEFINES)
 -COMPILE_CMD           = $(CC) -c $(ALL_CFLAGS)
@@ -46,16 +46,16 @@
  
  $(OBJDIR_NORMAL_LIB): $(OBJDIR) $(CONFIG_H) $(OBJS)
 -      -$(RM) $(OBJDIR_NORMAL_LIB)
--      cd $(OBJDIR); $(AR_CR) $(NORMAL_LIB) $(OFILES)
+-      cd $(OBJDIR) && $(AR_CR) $(NORMAL_LIB) $(OFILES)
 -      $(RANLIB) $(OBJDIR_NORMAL_LIB)
 +      cd $(OBJDIR); $(LIBTOOL) --mode=link $(LIBTOOL_FLAGS) \
-+              $(CC) -o $(NORMAL_LIB) $(OFILES:.o=.lo) \
-+                      $(LIBTOOL_LDFLAGS) -rpath $(PREFIX)/lib \
-+                      $(DL_LIB) -lm -ltermcap -version-info 2:1
++          $(CC) -o $(NORMAL_LIB) $(OFILES:.o=.lo) \
++          $(LIBTOOL_LDFLAGS) -rpath $(PREFIX)/lib \
++          $(DL_LIB) -lm -ltermcap -version-info 2:1
        @echo ""
        @echo $(NORMAL_LIB) created in $(OBJDIR)
  
-@@ -186,10 +186,9 @@ install-docs: $(DEST_DOCDIR)
+@@ -187,10 +187,9 @@ install-docs: $(DEST_DOCDIR)
                echo $(INSTALL_DATA) $$i $(DEST_DOCDIR)/; \
                $(INSTALL_DATA) $$i $(DEST_DOCDIR)/; \
        done
@@ -68,7 +68,7 @@
  install-elf-and-links:
        -$(RM) $(DEST_LIBDIR)/$(ELFLIB)
        -$(RM) $(DEST_LIBDIR)/$(ELFLIB_MAJOR)
-@@ -207,9 +206,9 @@ install-elf-cygwin:
+@@ -208,9 +207,9 @@ install-elf-cygwin:
        $(INSTALL_DATA) $(ELFDIR_DLL_LIB) $(DEST_LIBDIR)/
        $(MKINSDIR) $(DEST_BINDIR)
        $(INSTALL) $(ELFDIR_ELF_LIB) $(DEST_BINDIR)/
diff -r d5981542899a -r fff415110f87 devel/libslang2/patches/patch-ab
--- a/devel/libslang2/patches/patch-ab  Wed Dec 07 18:52:22 2011 +0000
+++ b/devel/libslang2/patches/patch-ab  Wed Dec 07 19:49:00 2011 +0000
@@ -1,29 +1,29 @@
-$NetBSD: patch-ab,v 1.2 2009/12/16 19:16:58 zafer Exp $
+$NetBSD: patch-ab,v 1.3 2011/12/07 19:49:01 drochner Exp $
 
---- configure.orig     2009-12-05 20:03:51.000000000 +0100
+--- configure.orig     2011-04-11 02:37:07.000000000 +0000
 +++ configure
-@@ -11918,6 +11918,7 @@ fi
+@@ -6787,6 +6787,7 @@ fi
  
  
  fi
 +if false; then
- { echo "$as_me:$LINENO: checking for terminfo" >&5
- echo $ECHO_N "checking for terminfo... $ECHO_C" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for terminfo" >&5
+ $as_echo_n "checking for terminfo... " >&6; }
  if test "$nc5config" != "no"
-@@ -11943,6 +11944,7 @@ echo "${ECHO_T}yes" >&6; }
+@@ -6812,6 +6813,7 @@ $as_echo "yes" >&6; }
        break
     fi
  done
 +fi
  if test "$TERMCAP"; then
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
-@@ -11988,8 +11990,8 @@ then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -6857,8 +6859,8 @@ then
    fi
  fi
  
--OBJDIR=$SRCDIR/"$ARCH"objs
--ELFDIR=$SRCDIR/elf"$ARCH"objs
+-OBJDIR=$SRCDIR/"\$(ARCH)"objs
+-ELFDIR=$SRCDIR/"\$(ARCH)"elfobjs
 +OBJDIR=$SRCDIR/
 +ELFDIR=$OBJDIR
  
diff -r d5981542899a -r fff415110f87 devel/libslang2/patches/patch-ae
--- a/devel/libslang2/patches/patch-ae  Wed Dec 07 18:52:22 2011 +0000
+++ b/devel/libslang2/patches/patch-ae  Wed Dec 07 19:49:00 2011 +0000
@@ -1,88 +1,124 @@
-$NetBSD: patch-ae,v 1.4 2010/08/09 12:21:48 drochner Exp $
+$NetBSD: patch-ae,v 1.5 2011/12/07 19:49:01 drochner Exp $
 
---- modules/Makefile.in.orig   2009-12-05 19:03:51.000000000 +0000
+--- modules/Makefile.in.orig   2011-04-11 02:37:07.000000000 +0000
 +++ modules/Makefile.in
 @@ -1,4 +1,5 @@
  # -*- sh -*-
 +MODULE_LIBTOOL_FLAGS=--tag=disable-static
  MODULES = slsmg-module.so termios-module.so select-module.so fcntl-module.so \
-   varray-module.so socket-module.so rand-module.so fork-module.so @PCRE_MODULE@ @PNG_MODULE@ \
-   @ICONV_MODULE@ @ONIG_MODULE@ @ZLIB_MODULE@ @SYSCONF_MODULE@
-@@ -75,9 +76,10 @@ DEST_HELPDIR        = $(DESTDIR)$(HELP_DIR)
+   varray-module.so socket-module.so rand-module.so fork-module.so \
+   csv-module.so @PCRE_MODULE@ @PNG_MODULE@ \
+@@ -77,8 +78,9 @@ DEST_HELPDIR = $(DESTDIR)$(HELP_DIR)
  #---------------------------------------------------------------------------
  RPATH = @RPATH@
  
 -LIBS = $(LDFLAGS) $(RPATH) $(SLANG_LIB) $(DL_LIB) @M_LIB@
 +LIBS = $(LDFLAGS) -module -avoid-version -rpath $(PREFIX)/lib $(SLANG_LIB) $(DL_LIB) @M_LIB@
- #LIBS = $(RPATH) $(DL_LIB) @M_LIB@
- INCS = $(SLANG_INC)
-+CC_SHARED:=${LIBTOOL} --mode=link ${MODULE_LIBTOOL_FLAGS} ${CC} 
- 
+ INCS = $(SLANG_SRCINC)
++CC_SHARED:=${LIBTOOL} --mode=link ${MODULE_LIBTOOL_FLAGS} ${CC}
+ #---------------------------------------------------------------------------
  all: $(MODULES)
  
-@@ -85,43 +87,58 @@ config.h: ../src/config.h
-       cp ../src/config.h .
- 
- slsmg-module.so: slsmg-module.c config.h
--      $(CC_SHARED) $(INCS) slsmg-module.c -o slsmg-module.so $(LIBS)
+@@ -87,62 +89,62 @@ config.h: ../src/config.h
+ $(OBJDIR):
+       -$(MKINSDIR) $(OBJDIR)
+ #
+-slsmg-module.so: $(OBJDIR) $(OBJDIR)/slsmg-module.so
+-$(OBJDIR)/slsmg-module.so: slsmg-module.c config.h
+-      cd $(OBJDIR) && $(CC_SHARED) $(INCS) $(SRCDIR)/slsmg-module.c -o slsmg-module.so $(LIBS)
+-rand-module.so: $(OBJDIR) $(OBJDIR)/rand-module.so
+-$(OBJDIR)/rand-module.so: rand-module.c config.h
+-      cd $(OBJDIR) && $(CC_SHARED) $(INCS) $(SRCDIR)/rand-module.c -o rand-module.so $(LIBS)
+-newt-module.so: $(OBJDIR) $(OBJDIR)/newt-module.so
+-$(OBJDIR)/newt-module.so: newt-module.c config.h
+-      cd $(OBJDIR) && $(CC_SHARED) $(INCS) $(SRCDIR)/newt-module.c -o newt-module.so -lnewt $(LIBS)
+-termios-module.so: $(OBJDIR) $(OBJDIR)/termios-module.so
+-$(OBJDIR)/termios-module.so: termios-module.c config.h
+-      cd $(OBJDIR) && $(CC_SHARED) $(INCS) $(SRCDIR)/termios-module.c -o termios-module.so $(LIBS)
+-select-module.so: $(OBJDIR) $(OBJDIR)/select-module.so
+-$(OBJDIR)/select-module.so: select-module.c config.h
+-      cd $(OBJDIR) && $(CC_SHARED) $(INCS) $(SRCDIR)/select-module.c -o select-module.so $(LIBS)
+-fcntl-module.so: $(OBJDIR) $(OBJDIR)/fcntl-module.so
+-$(OBJDIR)/fcntl-module.so: fcntl-module.c config.h
+-      cd $(OBJDIR) && $(CC_SHARED) $(INCS) $(SRCDIR)/fcntl-module.c -o fcntl-module.so $(LIBS)
+-varray-module.so: $(OBJDIR) $(OBJDIR)/varray-module.so
+-$(OBJDIR)/varray-module.so: varray-module.c config.h
+-      cd $(OBJDIR) && $(CC_SHARED) $(INCS) $(SRCDIR)/varray-module.c -o varray-module.so $(LIBS)
+-pcre-module.so: $(OBJDIR) $(OBJDIR)/pcre-module.so
+-$(OBJDIR)/pcre-module.so: pcre-module.c config.h
+-      cd $(OBJDIR) && $(CC_SHARED) $(INCS) $(PCRE_INC) $(SRCDIR)/pcre-module.c -o pcre-module.so $(PCRE_LIB) $(LIBS)
+-onig-module.so: $(OBJDIR) $(OBJDIR)/onig-module.so
+-$(OBJDIR)/onig-module.so: onig-module.c config.h
+-      cd $(OBJDIR) && $(CC_SHARED) $(INCS) $(ONIG_INC) $(SRCDIR)/onig-module.c -o onig-module.so $(ONIG_LIB) $(LIBS)
+-png-module.so: $(OBJDIR) $(OBJDIR)/png-module.so
+-$(OBJDIR)/png-module.so: png-module.c config.h
+-      cd $(OBJDIR) && $(CC_SHARED) $(INCS) $(PNG_INC) $(SRCDIR)/png-module.c -o png-module.so $(PNG_LIB) $(LIBS)
+-socket-module.so: $(OBJDIR) $(OBJDIR)/socket-module.so
+-$(OBJDIR)/socket-module.so: socket-module.c config.h
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Added textproc/heirloom-bfs version 070715
Next by Date: [pkgsrc/trunk]: pkgsrc/sysutils/heirloom-ln heirloom-ln utility
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Added textproc/heirloom-bfs version 070715
Next by Thread: [pkgsrc/trunk]: pkgsrc/sysutils/heirloom-ln heirloom-ln utility
Indexes:
Home | Main Index | Thread Index | Old Index