Update Haiku Makefile and recipe with suggestions from HaikuPorts (#426)

diff --git a/misc/haiku/Makefile b/misc/haiku/Makefile
index 9c8ff40ed06aa25e9e1d465b32875b8241db806b..a152c3cf07e8a1282c5a8288a2f60faaa7c750c7 100644 (file)
--- a/misc/haiku/Makefile
+++ b/misc/haiku/Makefile
@@ -1,7 +1,7 @@
 VERSION = $(shell grep -m1 VERSION $(SRC) | cut -f 2 -d'"')
 
 PREFIX ?= /boot/system/non-packaged
-MANPREFIX ?= /boot/system/non-packaged/documentation/man
+MANPREFIX ?= $(PREFIX)/documentation/man
 STRIP ?= strip
 PKG_CONFIG ?= pkg-config
 INSTALL ?= install

diff --git a/misc/haiku/nnn-master.recipe b/misc/haiku/nnn-master.recipe
index 0d2e5e5e8e6de1d83d8a3de529d3d1a9ace4521b..b9dadce5c4cc83384aab435aa806ac5fa8f5b906 100644 (file)
--- a/misc/haiku/nnn-master.recipe
+++ b/misc/haiku/nnn-master.recipe
@@ -1,52 +1,56 @@
 SUMMARY="The missing terminal file manager for X"
-DESCRIPTION="
-nnn is a full-featured terminal file manager. It's tiny and nearly 0-config with an incredible performance.
+DESCRIPTION="nnn is a full-featured terminal file manager. It's tiny and \
+nearly 0-config with an incredible performance.
 
-nnn is also a du analyzer, an app launcher, a batch renamer and a file picker. The plugin repository has tons of plugins and documentation to extend the capabilities further. You can plug new functionality and play with a custom keybind instantly. There's an independent (neo)vim plugin.
+nnn is also a du analyzer, an app launcher, a batch renamer and a file picker. \
+The plugin repository has tons of plugins and documentation to extend the \
+capabilities further. You can plug new functionality and play with a \
+custom keybind instantly. There's an independent (neo)vim plugin.
 
-It runs smoothly on the Raspberry Pi, Termux on Android, Linux, macOS, BSD, Cygwin, WSL and works seamlessly with DEs and GUI utilities.
+It runs smoothly on the Raspberry Pi, Termux on Android, Linux, macOS, BSD, \
+Cygwin, WSL and works seamlessly with DEs and GUI utilities.
 
-Visit the Wiki for concepts, program usage, how-tos and troubleshooting.
-"
+Visit the Wiki for concepts, program usage, how-tos and troubleshooting."
 HOMEPAGE="https://github.com/jarun/nnn"
 COPYRIGHT="2016-2020 Arun Prakash Jana"
 LICENSE="BSD (2-clause)"
 REVISION="1"
 SOURCE_URI="git://github.com/jarun/nnn.git"
 
-ARCHITECTURES="x86 x86_64"
+ARCHITECTURES="x86_64"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
-       nnn = $portVersion
+       nnn$secondaryArchSuffix = $portVersion
        cmd:nnn = $portVersion
        "
 REQUIRES="
-        haiku
-       lib:libncurses
-       lib:libreadline
-        "
+       haiku$secondaryArchSuffix
+       file$secondaryArchSuffix
+       lib:libncurses$secondaryArchSuffix
+       lib:libreadline$secondaryArchSuffix
+       "
 
 BUILD_REQUIRES="
-        haiku_devel
-       pkgconfig
-       devel:libncurses
-       devel:libreadline
-        "
-
+       haiku${secondaryArchSuffix}_devel
+       devel:libncurses$secondaryArchSuffix
+       devel:libreadline$secondaryArchSuffix
+       "
 BUILD_PREREQUIRES="
-       cmd:make
-       cmd:gcc
-       cmd:g++
-       cmd:ld
+       cmd:g++$secondaryArchSuffix
+       cmd:gcc$secondaryArchSuffix
        cmd:install
-"
+       cmd:ld$secondaryArchSuffix
+       cmd:make
+       cmd:pkg_config$secondaryArchSuffix
+       "
 
 BUILD()
 {
-       make -f misc/haiku/Makefile
+       make -f misc/haiku/Makefile $jobArgs
 }
 
 INSTALL()
 {
-       make -f misc/haiku/Makefile PREFIX=$prefix MANPREFIX=$manDir install
+       make -f misc/haiku/Makefile install PREFIX=$prefix
 }