From 5aa132d21ebf7b8d8aca9e05127361ee3bbde08b Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Mon, 4 Sep 2023 05:35:07 +0000 Subject: [PATCH] nnn, bump version (#9344) --- .../nnn/additional-files/nnn_link_plugins.sh | 6 ++++ .../nnn/{nnn-4.5.recipe => nnn-4.9.recipe} | 36 +++++++++++++++++-- .../{nnn-4.5.patchset => nnn-4.9.patchset} | 0 3 files changed, 39 insertions(+), 3 deletions(-) create mode 100755 app-misc/nnn/additional-files/nnn_link_plugins.sh rename app-misc/nnn/{nnn-4.5.recipe => nnn-4.9.recipe} (59%) rename app-misc/nnn/patches/{nnn-4.5.patchset => nnn-4.9.patchset} (100%) diff --git a/app-misc/nnn/additional-files/nnn_link_plugins.sh b/app-misc/nnn/additional-files/nnn_link_plugins.sh new file mode 100755 index 000000000..9e84c95f9 --- /dev/null +++ b/app-misc/nnn/additional-files/nnn_link_plugins.sh @@ -0,0 +1,6 @@ +#!/bin/sh +dataDir=`finddir B_SYSTEM_DATA_DIRECTORY` +pluginDir=`finddir B_USER_SETTINGS_DIRECTORY` +mkdir -p ~/config/settings/nnn/plugins +ln -sf $dataDir/nnn/plugins/* $pluginDir/nnn/plugins +ln -sf $dataDir/nnn/plugins/.nnn-plugin-helper $pluginDir/nnn/plugins diff --git a/app-misc/nnn/nnn-4.5.recipe b/app-misc/nnn/nnn-4.9.recipe similarity index 59% rename from app-misc/nnn/nnn-4.5.recipe rename to app-misc/nnn/nnn-4.9.recipe index 1a5d2573c..815d0c1b6 100644 --- a/app-misc/nnn/nnn-4.5.recipe +++ b/app-misc/nnn/nnn-4.9.recipe @@ -12,16 +12,21 @@ Cygwin, WSL, Haiku and works seamlessly with DEs and GUI utilities. Visit the Wiki for concepts, program usage, how-tos and troubleshooting." HOMEPAGE="https://github.com/jarun/nnn" -COPYRIGHT="2016-2022 Arun Prakash Jana" +COPYRIGHT="2014-2016 Lazaros Koromilas + 2014-2016 Dimitris Papastamos + 2016-2023 Arun Prakash Jana" LICENSE="BSD (2-clause)" -REVISION="3" +REVISION="1" SOURCE_URI="https://github.com/jarun/nnn/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="fadc15bd6d4400c06e5ccc47845b42e60774f368570e475bd882767ee18749aa" +CHECKSUM_SHA256="9e25465a856d3ba626d6163046669c0d4010d520f2fb848b0d611e1ec6af1b22" PATCHES="nnn-$portVersion.patchset" +ADDITIONAL_FILES="nnn_link_plugins.sh" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" +POST_INSTALL_SCRIPTS="$relativePostInstallDir/nnn_link_plugins.sh" + PROVIDES=" nnn$secondaryArchSuffix = $portVersion cmd:nnn = $portVersion @@ -47,6 +52,12 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " +PATCH() +{ + # mentioned at https://github.com/jarun/nnn/issues/1493 + sed -i -e 's/install: all/install:/' misc/haiku/Makefile +} + BUILD() { CFLAGS="-I/boot/system/develop/headers/bsd -D_DEFAULT_SOURCE" \ @@ -58,5 +69,24 @@ INSTALL() { make -f misc/haiku/Makefile install PREFIX=$prefix + # install plugins + mkdir -p $dataDir/nnn/plugins + cp -r plugins/* $dataDir/nnn/plugins/ + cp -r plugins/.nnn-plugin-helper $dataDir/nnn/plugins/ + + # remove not needed from plugins directory + rm $dataDir/nnn/plugins/{README.md,getplugs} + + # copy bash/fixh/zsh completions + mkdir -p $dataDir/{bash-completion,fish}/completions + mkdir -p $dataDir/zsh/site-functions + cp misc/auto-completion/bash/nnn-completion.bash $dataDir/bash-completion/completions/nnn + cp misc/auto-completion/fish/nnn.fish $dataDir/fish/completions/nnn.fish + cp misc/auto-completion/zsh/_nnn $dataDir/zsh/site-functions/_nnn + addResourcesToBinaries misc/haiku/nnn.rdef $prefix/bin/nnn + + # install postinstallscript + mkdir -p $postInstallDir + install -t $postInstallDir $portDir/additional-files/nnn_link_plugins.sh } diff --git a/app-misc/nnn/patches/nnn-4.5.patchset b/app-misc/nnn/patches/nnn-4.9.patchset similarity index 100% rename from app-misc/nnn/patches/nnn-4.5.patchset rename to app-misc/nnn/patches/nnn-4.9.patchset