From ea03e161a65163892d5c5eb754d7e43e4d6b4b8a Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Mon, 31 May 2021 16:48:06 +0200 Subject: [PATCH] misc: simplify PLUGIN_NO_ABI and use it for themes --- Mk/defaults.mk | 2 ++ Mk/plugins.mk | 4 ++-- misc/theme-cicada/Makefile | 1 + misc/theme-rebellion/Makefile | 1 + misc/theme-tukan/Makefile | 1 + misc/theme-vicuna/Makefile | 1 + 6 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Mk/defaults.mk b/Mk/defaults.mk index 6210fd1e8..518004e55 100644 --- a/Mk/defaults.mk +++ b/Mk/defaults.mk @@ -23,6 +23,8 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. +OSABIPREFIX= FreeBSD + LOCALBASE?= /usr/local PAGER?= less diff --git a/Mk/plugins.mk b/Mk/plugins.mk index 73b260565..27de43371 100644 --- a/Mk/plugins.mk +++ b/Mk/plugins.mk @@ -104,8 +104,8 @@ manifest: check @echo "licenselogic: \"single\"" @echo "licenses: [ \"BSD2CLAUSE\" ]" .if defined(PLUGIN_NO_ABI) - @echo "arch: `pkg config abi | tr '[:upper:]' '[:lower:]' | cut -d: -f1`:*:*" - @echo "abi: `pkg config abi | cut -d: -f1`:*:*" + @echo "arch: \"${OSABIPREFIX:tl}:*:*\"" + @echo "abi: \"${OSABIPREFIX}:*:*\"" .endif .if defined(PLUGIN_DEPENDS) @echo "deps: {" diff --git a/misc/theme-cicada/Makefile b/misc/theme-cicada/Makefile index 33e19692f..f2a49f3d4 100644 --- a/misc/theme-cicada/Makefile +++ b/misc/theme-cicada/Makefile @@ -2,5 +2,6 @@ PLUGIN_NAME= theme-cicada PLUGIN_VERSION= 1.28 PLUGIN_COMMENT= The cicada theme - dark grey PLUGIN_MAINTAINER= rene@team-rebellion.net +PLUGIN_NO_ABI= yes .include "../../Mk/plugins.mk" diff --git a/misc/theme-rebellion/Makefile b/misc/theme-rebellion/Makefile index f83bf6f1c..d50e43e6e 100644 --- a/misc/theme-rebellion/Makefile +++ b/misc/theme-rebellion/Makefile @@ -2,5 +2,6 @@ PLUGIN_NAME= theme-rebellion PLUGIN_VERSION= 1.8.7 PLUGIN_COMMENT= A suitably dark theme PLUGIN_MAINTAINER= team-rebellion@queens-park.com +PLUGIN_NO_ABI= yes .include "../../Mk/plugins.mk" diff --git a/misc/theme-tukan/Makefile b/misc/theme-tukan/Makefile index 4d9f9cc95..7c959ab18 100644 --- a/misc/theme-tukan/Makefile +++ b/misc/theme-tukan/Makefile @@ -2,5 +2,6 @@ PLUGIN_NAME= theme-tukan PLUGIN_VERSION= 1.25 PLUGIN_COMMENT= The tukan theme - blue/white PLUGIN_MAINTAINER= rene@team-rebellion.net +PLUGIN_NO_ABI= yes .include "../../Mk/plugins.mk" diff --git a/misc/theme-vicuna/Makefile b/misc/theme-vicuna/Makefile index 0bfdb6476..58d940a98 100644 --- a/misc/theme-vicuna/Makefile +++ b/misc/theme-vicuna/Makefile @@ -2,5 +2,6 @@ PLUGIN_NAME= theme-vicuna PLUGIN_VERSION= 1.4 PLUGIN_COMMENT= The vicuna theme - dark anthrazit PLUGIN_MAINTAINER= rene@team-rebellion.net +PLUGIN_NO_ABI= yes .include "../../Mk/plugins.mk"