From d5c4d27dd16b8e96eb3335f2bce24cea6b45c86b Mon Sep 17 00:00:00 2001 From: jca Date: Fri, 12 Aug 2022 19:02:22 +0000 Subject: [PATCH] Install bash-completion files in the regular place, plus other tweaks - this uses pledge(2) - simplify DISTNAME, no need for extra variable V - regen PLIST after adding gettext to LIB_DEPENDS --- math/datamash/Makefile | 6 ++++-- math/datamash/pkg/PLIST | 30 +++--------------------------- 2 files changed, 7 insertions(+), 29 deletions(-) diff --git a/math/datamash/Makefile b/math/datamash/Makefile index d01f06340e7..2499f72a3f1 100644 --- a/math/datamash/Makefile +++ b/math/datamash/Makefile @@ -1,7 +1,7 @@ COMMENT= perform basic numeric, textual and statistical operations -V = 1.8 -DISTNAME= datamash-${V} +DISTNAME= datamash-1.8 +REVISION= 0 CATEGORIES= math @@ -11,9 +11,11 @@ MASTER_SITES= ${MASTER_SITE_GNU:=datamash/} # GPLv3 PERMIT_PACKAGE= Yes +# uses pledge() WANTLIB= c m iconv intl LIB_DEPENDS= devel/gettext CONFIGURE_STYLE=gnu +CONFIGURE_ARGS= --with-bash-completion-dir=${PREFIX}/share/bash-completion/completions/ .include diff --git a/math/datamash/pkg/PLIST b/math/datamash/pkg/PLIST index 2ffa01b36b1..a5bc1e6a513 100644 --- a/math/datamash/pkg/PLIST +++ b/math/datamash/pkg/PLIST @@ -3,49 +3,25 @@ @info info/datamash.info @man man/man1/datamash.1 @man man/man1/decorate.1 +share/bash-completion/ +share/bash-completion/completions/ +share/bash-completion/completions/datamash share/datamash/ -share/datamash/bash-completion.d/ -share/datamash/bash-completion.d/datamash share/datamash/examples/ share/datamash/examples/genes.txt share/datamash/examples/genes_h.txt share/datamash/examples/readme.md share/datamash/examples/scores.txt share/datamash/examples/scores_h.txt -share/locale/ -share/locale/da/ -share/locale/da/LC_MESSAGES/ share/locale/da/LC_MESSAGES/datamash.mo -share/locale/de/ -share/locale/de/LC_MESSAGES/ share/locale/de/LC_MESSAGES/datamash.mo -share/locale/eo/ -share/locale/eo/LC_MESSAGES/ share/locale/eo/LC_MESSAGES/datamash.mo -share/locale/es/ -share/locale/es/LC_MESSAGES/ share/locale/es/LC_MESSAGES/datamash.mo -share/locale/fr/ -share/locale/fr/LC_MESSAGES/ share/locale/fr/LC_MESSAGES/datamash.mo -share/locale/nb/ -share/locale/nb/LC_MESSAGES/ share/locale/nb/LC_MESSAGES/datamash.mo -share/locale/nl/ -share/locale/nl/LC_MESSAGES/ share/locale/nl/LC_MESSAGES/datamash.mo -share/locale/pt_BR/ -share/locale/pt_BR/LC_MESSAGES/ share/locale/pt_BR/LC_MESSAGES/datamash.mo -share/locale/sr/ -share/locale/sr/LC_MESSAGES/ share/locale/sr/LC_MESSAGES/datamash.mo -share/locale/sv/ -share/locale/sv/LC_MESSAGES/ share/locale/sv/LC_MESSAGES/datamash.mo -share/locale/uk/ -share/locale/uk/LC_MESSAGES/ share/locale/uk/LC_MESSAGES/datamash.mo -share/locale/vi/ -share/locale/vi/LC_MESSAGES/ share/locale/vi/LC_MESSAGES/datamash.mo