diff --git a/sys-apps/less/less-458.recipe b/sys-apps/less/less-458.recipe new file mode 100644 index 000000000..23b558fed --- /dev/null +++ b/sys-apps/less/less-458.recipe @@ -0,0 +1,67 @@ +SUMMARY="Less is a free, open-source file pager." +DESCRIPTION="GNU less is a program similar to more, but which allows \ +backward movement in the file as well as forward movement. Also, less \ +does not have to read the entire input file before starting, so with \ +large input files it starts up faster than text editors like vi. Less uses \ +termcap (or terminfo on some systems), so it can run on a variety of \ +terminals. There is even limited support for hardcopy terminals. +" +HOMEPAGE="http://www.greenwoodsoftware.com/less/" +SRC_URI="http://www.greenwoodsoftware.com/less/less-$portVersion.tar.gz" +CHECKSUM_SHA256="e536c7819ede54b3d487f0ffc4c14b3620bed83734d92a81e89f62346db0fcac" +LICENSE="GNU GPL v3" +COPYRIGHT="1984-2014 Mark Nudelman" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PATCHES="less-$portVersion.patchset" + +PROVIDES=" + less = $portVersion + cmd:less + cmd:lessecho + cmd:lesskey + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libncurses$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libncurses$secondaryArchSuffix + " + +BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix + cmd:make + cmd:ld$secondaryArchSuffix + cmd:autoconf + cmd:aclocal + " + +GLOBAL_WRITABLE_FILES=" + settings/etc/sysless.src keep-old + settings/etc/sysless keep-old +" + +BUILD() +{ + autoconf + runConfigure ./configure --with-editor=nano \ + --sysconfdir=$settingsDir/etc + make +} + +INSTALL() +{ + make install + + syslessDir=$settingsDir/etc + mkdir $syslessDir + cp "$portDir/additional-files/sysless.in" \ + "$syslessDir/sysless.src" + $binDir/lesskey -o "$syslessDir/sysless" \ + "$syslessDir/sysless.src" +} diff --git a/sys-apps/less/less-466.recipe b/sys-apps/less/less-466.recipe index c6e60ee28..e3553701c 100644 --- a/sys-apps/less/less-466.recipe +++ b/sys-apps/less/less-466.recipe @@ -12,7 +12,7 @@ CHECKSUM_SHA256="8305f5a06764ff094ed3428f94f29059541e2483eae201991f90823da655721 LICENSE="GNU GPL v3" COPYRIGHT="1984-2014 Mark Nudelman" REVISION="1" -ARCHITECTURES="x86_gcc2 x86 x86_64" +ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64" PATCHES="less-$portVersion.patchset" diff --git a/sys-apps/less/patches/less-436.patch b/sys-apps/less/patches/less-458.patchset similarity index 69% rename from sys-apps/less/patches/less-436.patch rename to sys-apps/less/patches/less-458.patchset index 4c7f04d90..314419c62 100644 --- a/sys-apps/less/patches/less-436.patch +++ b/sys-apps/less/patches/less-458.patchset @@ -1,7 +1,14 @@ -diff -up less-436/cmdbuf.c.orig less-436/cmdbuf.c ---- less-436/cmdbuf.c.orig 2010-01-01 16:33:39.000000000 -0700 -+++ less-436/cmdbuf.c 2010-01-01 16:39:46.000000000 -0700 -@@ -1325,7 +1325,11 @@ cmd_lastpattern() +From 84d816bea8e0c4bf9a8073ac66ffb6d8d9a3a06d Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Wed, 3 Sep 2014 15:09:24 +0000 +Subject: haiku patch + + +diff --git a/cmdbuf.c b/cmdbuf.c +index 604c536..e9b7957 100755 +--- a/cmdbuf.c ++++ b/cmdbuf.c +@@ -1378,7 +1378,11 @@ mlist_size(ml) static char * histfile_name() { @@ -13,7 +20,7 @@ diff -up less-436/cmdbuf.c.orig less-436/cmdbuf.c char *name; int len; -@@ -1339,6 +1343,13 @@ histfile_name() +@@ -1392,6 +1396,13 @@ histfile_name() return (save(name)); } @@ -27,7 +34,7 @@ diff -up less-436/cmdbuf.c.orig less-436/cmdbuf.c /* Otherwise, file is in $HOME. */ home = lgetenv("HOME"); if (home == NULL || *home == '\0') -@@ -1349,6 +1360,8 @@ histfile_name() +@@ -1402,6 +1413,8 @@ histfile_name() #endif return (NULL); } @@ -36,10 +43,11 @@ diff -up less-436/cmdbuf.c.orig less-436/cmdbuf.c len = strlen(home) + strlen(LESSHISTFILE) + 2; name = (char *) ecalloc(len, sizeof(char)); SNPRINTF2(name, len, "%s/%s", home, LESSHISTFILE); -diff -up less-436/configure.ac.orig less-436/configure.ac ---- less-436/configure.ac.orig 2010-01-01 16:06:56.000000000 -0700 -+++ less-436/configure.ac 2010-01-01 16:16:09.000000000 -0700 -@@ -562,10 +562,17 @@ AH_TOP([ +diff --git a/configure.ac b/configure.ac +index 4ac9a35..d9e299a 100755 +--- a/configure.ac ++++ b/configure.ac +@@ -596,10 +596,17 @@ AH_TOP([ * LESSHISTFILE is the filename of the history file * (in the HOME directory). */ @@ -61,10 +69,11 @@ diff -up less-436/configure.ac.orig less-436/configure.ac /* Settings always true on Unix. */ -diff -up less-436/filename.c.orig less-436/filename.c ---- less-436/filename.c.orig 2010-01-01 16:25:25.000000000 -0700 -+++ less-436/filename.c 2010-01-01 16:23:03.000000000 -0700 -@@ -267,12 +267,23 @@ homefile(filename) +diff --git a/filename.c b/filename.c +index 68fdadb..5d2b614 100755 +--- a/filename.c ++++ b/filename.c +@@ -266,12 +266,23 @@ homefile(filename) { register char *pathname; @@ -88,10 +97,11 @@ diff -up less-436/filename.c.orig less-436/filename.c #if OS2 /* * Try $INIT/filename. -diff -up less-436/less.h.orig less-436/less.h ---- less-436/less.h.orig 2010-01-01 16:27:31.000000000 -0700 -+++ less-436/less.h 2010-01-01 16:28:33.000000000 -0700 -@@ -94,6 +94,11 @@ +diff --git a/less.h b/less.h +index 15c55af..56bfa64 100755 +--- a/less.h ++++ b/less.h +@@ -93,6 +93,11 @@ #include #endif @@ -103,10 +113,11 @@ diff -up less-436/less.h.orig less-436/less.h #if MSDOS_COMPILER==WIN32C || OS2 #include #endif -diff -up less-436/lesskey.c.orig less-436/lesskey.c ---- less-436/lesskey.c.orig 2010-01-01 16:25:42.000000000 -0700 -+++ less-436/lesskey.c 2010-01-01 16:24:17.000000000 -0700 -@@ -244,8 +244,19 @@ homefile(filename) +diff --git a/lesskey.c b/lesskey.c +index 3408647..da8aba3 100755 +--- a/lesskey.c ++++ b/lesskey.c +@@ -246,8 +246,19 @@ homefile(filename) char *p; char *pathname; @@ -126,3 +137,6 @@ diff -up less-436/lesskey.c.orig less-436/lesskey.c #if OS2 else if ((p = getenv("INIT")) != NULL && *p != '\0') pathname = mkpathname(p, filename); +-- +1.8.3.4 +