diff --git a/sys-libs/slang/patches/slang-2.3.2.patchset b/sys-libs/slang/patches/slang-2.3.3.patchset similarity index 85% rename from sys-libs/slang/patches/slang-2.3.2.patchset rename to sys-libs/slang/patches/slang-2.3.3.patchset index adc5ecf14..bd9c67a8a 100644 --- a/sys-libs/slang/patches/slang-2.3.2.patchset +++ b/sys-libs/slang/patches/slang-2.3.3.patchset @@ -1,11 +1,11 @@ -From 32dbe81d28e20d6053fef4047b7fc6bcd7bba595 Mon Sep 17 00:00:00 2001 +From 79d5f32623b8706a25d5ae88d814f96d703cdb28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= Date: Fri, 24 Mar 2017 18:46:52 +0100 Subject: Updated Haiku patchset diff --git a/modules/Makefile.in b/modules/Makefile.in -index f82f0ed..13623ff 100644 +index 34ac674..950053f 100644 --- a/modules/Makefile.in +++ b/modules/Makefile.in @@ -75,7 +75,7 @@ INSTALL = @INSTALL@ @@ -18,7 +18,7 @@ index f82f0ed..13623ff 100644 HELP_DIR = $(SLSH_DIR)/help # --------------------------------------------------------------------------- diff --git a/slsh/Makefile.in b/slsh/Makefile.in -index cba9d81..82982df 100644 +index addd343..8a18560 100644 --- a/slsh/Makefile.in +++ b/slsh/Makefile.in @@ -34,7 +34,7 @@ MKINSDIR = $(CONFIG_DIR)/autoconf/mkinsdir.sh @@ -29,23 +29,24 @@ index cba9d81..82982df 100644 +SLSH_DOC_DIR = @docdir@/slsh SLSH_LOCALLIB_DIR = $(SLSH_LIB_DIR)/local-packages SLSH_SCRIPT_DIR = $(SLSH_LIB_DIR)/scripts - SCRIPTS = jpegsize lsrpm sldb svnsh slprof slstkchk + SCRIPTS = jpegsize lsrpm sldb svnsh slprof slstkchk slcov diff --git a/slsh/slsh.c b/slsh/slsh.c -index 623c94a..01d3021 100644 +index 6070ed1..e57ac30 100644 --- a/slsh/slsh.c +++ b/slsh/slsh.c -@@ -26,6 +26,10 @@ USA. - # include +@@ -27,6 +27,11 @@ USA. # include #endif + +#ifdef __HAIKU__ +#include +#include +#endif - ++ #include -@@ -56,7 +60,11 @@ static SLFUTURE_CONST char *Slsh_Version = "0.9.4-0"; + #ifdef HAVE_UNISTD_H +@@ -56,7 +61,11 @@ static SLFUTURE_CONST char *Slsh_Version = "0.9.4-0"; # define SLSH_LIB_DIR_ENV "SLSH_LIB_DIR" #endif @@ -58,7 +59,7 @@ index 623c94a..01d3021 100644 /* # define DEFAULT_LIBRARY_PATH "/usr/local/share/slsh:/usr/local/lib/slsh:/usr/share/slsh:/usr/lib/slsh"; */ /* # define DEFAULT_CONF_PATH "/usr/local/etc:/usr/local/etc/slsh:/etc:/etc/slsh"; */ # define DEFAULT_CONF_PATH NULL -@@ -536,6 +544,9 @@ int main (int argc, char **argv) +@@ -536,6 +545,9 @@ int main (int argc, char **argv) int test_mode = 0; char *exec_string = NULL; int quiet = 0; @@ -68,7 +69,7 @@ index 623c94a..01d3021 100644 #ifdef SLSYSWRAP (void) SLsyswrap_set_syscall_failure (0); -@@ -565,8 +576,13 @@ int main (int argc, char **argv) +@@ -565,8 +577,13 @@ int main (int argc, char **argv) #endif /* FIXME for other systems */ @@ -84,7 +85,7 @@ index 623c94a..01d3021 100644 init_file_dir = getenv ("HOME"); #endif diff --git a/src/Makefile.in b/src/Makefile.in -index 6068142..7de6c1a 100644 +index b5f2b9d..ac8b114 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -47,7 +47,7 @@ exec_prefix = @exec_prefix@ @@ -97,7 +98,7 @@ index 6068142..7de6c1a 100644 MODULE_INSTALL_DIR = @libdir@/slang/v@slang_major_version@/modules #--------------------------------------------------------------------------- diff --git a/src/slstd.c b/src/slstd.c -index eaf5236..b1e4136 100644 +index c4aaa92..a802960 100644 --- a/src/slstd.c +++ b/src/slstd.c @@ -1340,6 +1340,9 @@ int SLang_init_slang (void) /*{{{*/ @@ -111,20 +112,20 @@ index eaf5236..b1e4136 100644 "SLANG_DOUBLE_TYPE", #endif -- -2.35.1 +2.42.1 -From 8d225856018f4540ef403a14d2581f82d609fd6e Mon Sep 17 00:00:00 2001 +From ad7993cee7289d38d9a2654c791f3d1e0d7826b0 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Tue, 17 May 2022 18:32:53 -0600 Subject: add Haiku terminfo dir diff --git a/autoconf/aclocal.m4 b/autoconf/aclocal.m4 -index 2b5c447..3d76444 100644 +index b2dfcd3..c17be8b 100644 --- a/autoconf/aclocal.m4 +++ b/autoconf/aclocal.m4 -@@ -507,6 +507,10 @@ then +@@ -509,6 +509,10 @@ then else MISC_TERMINFO_DIRS="" fi @@ -136,5 +137,5 @@ index 2b5c447..3d76444 100644 /usr/lib/terminfo \ /usr/share/terminfo \ -- -2.35.1 +2.42.1 diff --git a/sys-libs/slang/slang-2.3.2.recipe b/sys-libs/slang/slang-2.3.3.recipe similarity index 69% rename from sys-libs/slang/slang-2.3.2.recipe rename to sys-libs/slang/slang-2.3.3.recipe index fbf427007..51de23c5f 100644 --- a/sys-libs/slang/slang-2.3.2.recipe +++ b/sys-libs/slang/slang-2.3.3.recipe @@ -12,21 +12,20 @@ part of the S-Lang distribution." HOMEPAGE="http://www.jedsoft.org/slang/" COPYRIGHT="2004-2016 John E. Davis" LICENSE="GNU GPL v2" -REVISION="2" +REVISION="1" SOURCE_URI="http://www.jedsoft.org/releases/slang/slang-$portVersion.tar.bz2" -CHECKSUM_SHA256="fc9e3b0fc4f67c3c1f6d43c90c16a5c42d117b8e28457c5b46831b8b5d3ae31a" -PATCHES="slang-${portVersion}.patchset" +CHECKSUM_SHA256="f9145054ae131973c61208ea82486d5dd10e3c5cdad23b7c4a0617743c8f5a18" +PATCHES="slang-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" GLOBAL_WRITABLE_FILES=" - settings/slsh.rc keep-old + settings/slsh.rc keep-old " PROVIDES=" slang$secondaryArchSuffix = $portVersion compat >= 2.3 - cmd:slsh$secondaryArchSuffix = $portVersion compat >= 2.3 lib:libslang$secondaryArchSuffix = $portVersion compat >= 2.3 " REQUIRES=" @@ -38,12 +37,21 @@ REQUIRES=" lib:libz$secondaryArchSuffix " +PROVIDES_tools=" + slang${secondaryArchSuffix}_tools = $portVersion compat >= 2.3 + cmd:slsh$secondaryArchSuffix = $portVersion compat >= 2.3 + " +REQUIRES_tools=" + slang$secondaryArchSuffix == $portVersion + haiku$secondaryArchSuffix + " + PROVIDES_devel=" slang${secondaryArchSuffix}_devel = $portVersion compat >= 2.3 devel:libslang$secondaryArchSuffix = $portVersion compat >= 2.3 " REQUIRES_devel=" - slang$secondaryArchSuffix == $portVersion + slang$secondaryArchSuffix == $portVersion base " BUILD_REQUIRES=" @@ -74,27 +82,39 @@ BUILD() export LDFLAGS="-lnetwork -lbsd" runConfigure ./configure \ - --with-pnglib=$libDir \ - --with-pnginc=$includeDir \ - --with-zlib=$libDir \ - --with-zinc=$includeDir \ - --with-iconvlib=$libDir \ - --with-iconvinc=$includeDir \ - --with-pcrelib=$libDir \ - --with-pcreinc=$includeDir - #--with-oniglib=$libDir \ - #--with-oniginc=$includeDir - - make + --with-pnglib=$libDir \ + --with-pnginc=$includeDir \ + --with-zlib=$libDir \ + --with-zinc=$includeDir \ + --with-iconvlib=$libDir \ + --with-iconvinc=$includeDir \ + --with-pcrelib=$libDir \ + --with-pcreinc=$includeDir + #--with-oniglib=$libDir \ + #--with-oniginc=$includeDir + make $jobArgs } INSTALL() { make install + prepareInstalledDevelLib libslang fixPkgconfig - prepareInstalledDevelLibs libslang + packageEntries tools \ + $binDir \ + $dataDir \ + $manDir - packageEntries devel $developDir + packageEntries devel \ + $developDir \ + $documentationDir +} + +TEST() +{ + export LDFLAGS="-lbsd" + export LIBRARY_PATH="$sourceDir/src/elfobjs:$sourceDir/modules/objs:$LIBRARY_PATH" + make check }