From 4eb3573c296f125043810de9bd634f1c3f0ea85f Mon Sep 17 00:00:00 2001 From: Low-power Date: Sat, 21 Jan 2023 01:38:24 +0800 Subject: [PATCH] sys-process/htop: update to Haiku-supported version 2.3.0 (#6980) --- .../{htop-2.0.2.recipe => htop-2.3.0.recipe} | 23 +++++++-------- sys-process/htop/patches/htop-2.0.2.patchset | 29 ------------------- 2 files changed, 11 insertions(+), 41 deletions(-) rename sys-process/htop/{htop-2.0.2.recipe => htop-2.3.0.recipe} (54%) delete mode 100644 sys-process/htop/patches/htop-2.0.2.patchset diff --git a/sys-process/htop/htop-2.0.2.recipe b/sys-process/htop/htop-2.3.0.recipe similarity index 54% rename from sys-process/htop/htop-2.0.2.recipe rename to sys-process/htop/htop-2.3.0.recipe index 7962e660a..642b6a97f 100644 --- a/sys-process/htop/htop-2.0.2.recipe +++ b/sys-process/htop/htop-2.3.0.recipe @@ -1,13 +1,16 @@ SUMMARY="An interactive process viewer for Unix" DESCRIPTION="This is htop, an interactive process viewer for Unix systems. It \ -is a text-mode application (for console or X terminals) and requires ncurses." -HOMEPAGE="http://hisham.hm/htop/" -COPYRIGHT="2004-2016 Hisham Muhammad" +is a terminal UI application uses ncurses." +HOMEPAGE="https://sourceforge.net/projects/htop.rivoreo.p/" +COPYRIGHT=" + 2004-2018 Hisham Muhammad + 2015-2022 Rivoreo" LICENSE="GNU GPL v2" -REVISION="2" -SOURCE_URI="https://github.com/hishamhm/htop/archive/$portVersion.tar.gz" -CHECKSUM_SHA256="1e93e6743dddad254fac2ad0d83b00a82173c75ecbd6ef6f7d55da690eb64b92" -PATCHES="htop-$portVersion.patchset" +REVISION="1" +SOURCE_URI="https://sourceforge.net/projects/htop.rivoreo.p/files/htop-$portVersion-src.tar.bz2/download" +SOURCE_FILENAME="htop-$portVersion-src.tar.bz2" +CHECKSUM_SHA256="14c3eba4ea509332f1e7029e6ea650e4de937ce155eceec6abe12f8bbc51c3a8" +SOURCE_DIR="" ARCHITECTURES="?all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" @@ -29,17 +32,13 @@ BUILD_PREREQUIRES=" cmd:aclocal cmd:autoreconf cmd:gcc$secondaryArchSuffix - cmd:libtoolize$secondaryArchSuffix cmd:make - cmd:pkg_config$secondaryArchSuffix - cmd:python " BUILD() { autogen.sh - sed -i 's/-lm//g' configure - CFLAGS=-D_BSD_SOURCE LDFLAGS=-lbsd runConfigure ./configure + runConfigure ./configure make $jobArgs } diff --git a/sys-process/htop/patches/htop-2.0.2.patchset b/sys-process/htop/patches/htop-2.0.2.patchset deleted file mode 100644 index b5077016e..000000000 --- a/sys-process/htop/patches/htop-2.0.2.patchset +++ /dev/null @@ -1,29 +0,0 @@ -From e1f3cb8a03ad80ddd92c1c194a95334dce2f793f Mon Sep 17 00:00:00 2001 -From: Sergei Reznikov -Date: Fri, 25 Mar 2016 14:36:50 +0300 -Subject: Haiku doesn't have {get,set}priority yet - - -diff --git a/Process.c b/Process.c -index 8e2abb6..c5e7680 100644 ---- a/Process.c -+++ b/Process.c -@@ -520,6 +520,7 @@ void Process_toggleTag(Process* this) { - bool Process_setPriority(Process* this, int priority) { - uid_t euid = geteuid(); - (void) seteuid(getuid()); -+#ifdef HAVE_SETPRIORITY - int old_prio = getpriority(PRIO_PROCESS, this->pid); - int err = setpriority(PRIO_PROCESS, this->pid, priority); - (void) seteuid(euid); -@@ -527,6 +528,7 @@ bool Process_setPriority(Process* this, int priority) { - this->nice = priority; - } - return (err == 0); -+#endif - } - - bool Process_changePriorityBy(Process* this, size_t delta) { --- -2.13.1 -