diff --git a/sys-apps/less/less-542.recipe b/sys-apps/less/less-550.recipe similarity index 95% rename from sys-apps/less/less-542.recipe rename to sys-apps/less/less-550.recipe index bd482bb44..99fde4f75 100644 --- a/sys-apps/less/less-542.recipe +++ b/sys-apps/less/less-550.recipe @@ -10,7 +10,7 @@ COPYRIGHT="1984-2018 Mark Nudelman" LICENSE="GNU GPL v3" REVISION="1" SOURCE_URI="http://www.greenwoodsoftware.com/less/less-$portVersion.tar.gz" -CHECKSUM_SHA256="4dfe50b2f98bc15cbfafa847c8179e0cde104203453fadf916768c4f3edd96c7" +CHECKSUM_SHA256="6a53639f08d7ed05b6e104b82c32193f79ac01a3eddb20e114e1c261948bd57b" PATCHES="less-$portVersion.patchset" ADDITIONAL_FILES="sysless.in" diff --git a/sys-apps/less/patches/less-542.patchset b/sys-apps/less/patches/less-550.patchset similarity index 87% rename from sys-apps/less/patches/less-542.patchset rename to sys-apps/less/patches/less-550.patchset index cfedf34b1..7558c8dc1 100644 --- a/sys-apps/less/patches/less-542.patchset +++ b/sys-apps/less/patches/less-550.patchset @@ -1,16 +1,16 @@ -From 4ac7dd380f1bb5eac3def440024ffb74dc75cc6d Mon Sep 17 00:00:00 2001 +From f37c832e4c028a392e04ef0e0731d98e39fe7570 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 29 Jun 2017 17:06:55 +0200 Subject: import fix from previous version diff --git a/cmdbuf.c b/cmdbuf.c -index ccca0c8..a025fef 100644 +index 0648aec..7e7cf68 100644 --- a/cmdbuf.c +++ b/cmdbuf.c -@@ -1399,7 +1399,11 @@ mlist_size(ml) +@@ -1401,7 +1401,11 @@ mlist_size(ml) static char * - histfile_name() + histfile_name(VOID_PARAM) { +#ifdef __HAIKU__ + char home[B_PATH_NAME_LENGTH+B_FILE_NAME_LENGTH]; @@ -20,7 +20,7 @@ index ccca0c8..a025fef 100644 char *name; int len; -@@ -1417,6 +1421,13 @@ histfile_name() +@@ -1419,6 +1423,13 @@ histfile_name(VOID_PARAM) if (strcmp(LESSHISTFILE, "") == 0 || strcmp(LESSHISTFILE, "-") == 0) return (NULL); @@ -33,8 +33,8 @@ index ccca0c8..a025fef 100644 +#else /* Otherwise, file is in $HOME. */ home = lgetenv("HOME"); - if (home == NULL || *home == '\0') -@@ -1427,6 +1438,7 @@ histfile_name() + if (isnullenv(home)) +@@ -1429,6 +1440,7 @@ histfile_name(VOID_PARAM) #endif return (NULL); } @@ -43,7 +43,7 @@ index ccca0c8..a025fef 100644 name = (char *) ecalloc(len, sizeof(char)); SNPRINTF2(name, len, "%s/%s", home, LESSHISTFILE); diff --git a/configure.ac b/configure.ac -index 6dae556..60fc5de 100644 +index 7a69398..bf9f78e 100644 --- a/configure.ac +++ b/configure.ac @@ -610,11 +610,17 @@ AH_TOP([ @@ -66,7 +66,7 @@ index 6dae556..60fc5de 100644 /* Settings always true on Unix. */ diff --git a/filename.c b/filename.c -index b70acd4..52a9b98 100644 +index 7c3ccd2..c813a68 100644 --- a/filename.c +++ b/filename.c @@ -259,12 +259,23 @@ homefile(filename) @@ -94,7 +94,7 @@ index b70acd4..52a9b98 100644 /* * Try $INIT/filename. diff --git a/less.h b/less.h -index 85dbcf1..8234176 100644 +index 7ec58c3..75b5516 100644 --- a/less.h +++ b/less.h @@ -100,6 +100,11 @@ @@ -110,7 +110,7 @@ index 85dbcf1..8234176 100644 #include #endif diff --git a/lesskey.c b/lesskey.c -index bb85017..056a1f5 100644 +index 96a4462..912010c 100644 --- a/lesskey.c +++ b/lesskey.c @@ -250,8 +250,19 @@ homefile(filename) @@ -134,5 +134,5 @@ index bb85017..056a1f5 100644 else if ((p = getenv("INIT")) != NULL && *p != '\0') pathname = mkpathname(p, filename); -- -2.17.0 +2.19.1