From 93df1cf8e177122d7db1b9eb490ec94e890fd539 Mon Sep 17 00:00:00 2001 From: sthen Date: Sat, 6 Aug 2022 12:03:54 +0000 Subject: [PATCH] update to libslang-2.3.3 --- devel/libslang/Makefile | 4 +-- devel/libslang/distinfo | 4 +-- .../patches/patch-autoconf_aclocal_m4 | 30 +------------------ devel/libslang/patches/patch-src_slgetkey_c | 13 -------- devel/libslang/pkg/PLIST | 3 ++ 5 files changed, 8 insertions(+), 46 deletions(-) delete mode 100644 devel/libslang/patches/patch-src_slgetkey_c diff --git a/devel/libslang/Makefile b/devel/libslang/Makefile index 62692dc1779..eb8a425e101 100644 --- a/devel/libslang/Makefile +++ b/devel/libslang/Makefile @@ -1,9 +1,9 @@ COMMENT= stack-based interpreter for terminal applications -DISTNAME= slang-2.3.2 +DISTNAME= slang-2.3.3 PKGNAME= lib${DISTNAME} EXTRACT_SUFX= .tar.bz2 -SHARED_LIBS= slang 16.1 +SHARED_LIBS= slang 17.0 CATEGORIES= devel MASTER_SITES= http://www.jedsoft.org/releases/slang/ \ diff --git a/devel/libslang/distinfo b/devel/libslang/distinfo index 670f331acbd..4949ea468ec 100644 --- a/devel/libslang/distinfo +++ b/devel/libslang/distinfo @@ -1,2 +1,2 @@ -SHA256 (slang-2.3.2.tar.bz2) = /J47D8T2fDwfbUPJDBalxC0Re44oRXxbRoMbi1064xo= -SIZE (slang-2.3.2.tar.bz2) = 1586720 +SHA256 (slang-2.3.3.tar.bz2) = +RRQVK4TGXPGEgjqgkhtXdEOPFza0jt8SgYXdDyPWhg= +SIZE (slang-2.3.3.tar.bz2) = 1646311 diff --git a/devel/libslang/patches/patch-autoconf_aclocal_m4 b/devel/libslang/patches/patch-autoconf_aclocal_m4 index ae6546c3308..6639a580b64 100644 --- a/devel/libslang/patches/patch-autoconf_aclocal_m4 +++ b/devel/libslang/patches/patch-autoconf_aclocal_m4 @@ -1,7 +1,7 @@ Index: autoconf/aclocal.m4 --- autoconf/aclocal.m4.orig +++ autoconf/aclocal.m4 -@@ -600,13 +600,13 @@ fi +@@ -604,13 +604,13 @@ fi dnl #Some defaults ELFLIB="lib\$(THIS_LIB).so" @@ -18,31 +18,3 @@ Index: autoconf/aclocal.m4 INSTALL_MODULE="\$(INSTALL)" SLANG_DLL_CFLAGS="" M_LIB="-lm" -@@ -742,6 +742,27 @@ case "$host_os" in - ELF_DEP_LIBS="\$(DL_LIB)" - CC_SHARED_FLAGS="-shared -fPIC" - CC_SHARED="\$(CC) $CC_SHARED_FLAGS \$(CFLAGS)" -+ ;; -+ *openbsd* ) -+ case `arch -s` in -+ sparc64) -+ PIC_FLAG="-fPIC" -+ ;; -+ *) -+ PIC_FLAG="-fpic" -+ ;; -+ esac -+ DYNAMIC_LINK_FLAGS="" -+ ELF_CC="$CC" -+ ELF_CFLAGS="$CFLAGS $PIC_FLAG" -+ ELF_LINK="$CC -shared $ELF_CFLAGS" -+ ELF_LINK_CMD="\$(ELF_LINK)" -+ ELF_DEP_LIBS= -+ CC_SHARED_FLAGS="-shared $PIC_FLAG" -+ CC_SHARED="$CC $CC_SHARED_FLAGS $CFLAGS" -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then -+ DYNAMIC_LINK_FLAGS="-Wl,-E" -+ fi - ;; - * ) - echo "Note: ELF compiler for host_os=$host_os may be wrong" diff --git a/devel/libslang/patches/patch-src_slgetkey_c b/devel/libslang/patches/patch-src_slgetkey_c deleted file mode 100644 index 0514018ad0e..00000000000 --- a/devel/libslang/patches/patch-src_slgetkey_c +++ /dev/null @@ -1,13 +0,0 @@ -backwards memcpy - ---- src/slgetkey.c.orig Fri Jan 30 12:01:25 2015 -+++ src/slgetkey.c Fri Jan 30 12:03:19 2015 -@@ -45,7 +45,7 @@ unsigned int SLang_getkey (void) - SLang_Input_Buffer_Len--; - imax = SLang_Input_Buffer_Len; - -- SLMEMCPY ((char *) SLang_Input_Buffer, -+ memmove ((char *) SLang_Input_Buffer, - (char *) (SLang_Input_Buffer + 1), imax); - } - else if (SLANG_GETKEY_ERROR == (ch = _pSLsys_getkey ())) return ch; diff --git a/devel/libslang/pkg/PLIST b/devel/libslang/pkg/PLIST index 97db421003c..60a7f58ad4a 100644 --- a/devel/libslang/pkg/PLIST +++ b/devel/libslang/pkg/PLIST @@ -120,6 +120,7 @@ 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 @@ -146,6 +147,7 @@ share/slsh/rline/vikeys.sl share/slsh/scripts/ share/slsh/scripts/jpegsize share/slsh/scripts/lsrpm +share/slsh/scripts/slcov share/slsh/scripts/sldb share/slsh/scripts/slprof share/slsh/scripts/slstkchk @@ -168,5 +170,6 @@ 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