git: 916356254024 - main - misc/clifm: update CliFM to version 1.7

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Alexey Dokuchaev <danfe_at_FreeBSD.org>
Date: Fri, 26 Aug 2022 07:26:00 UTC
The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9163562540248cda0e79f6e2e53c39a80d8d89e0

commit 9163562540248cda0e79f6e2e53c39a80d8d89e0
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2022-08-26 07:25:02 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2022-08-26 07:25:02 +0000

    misc/clifm: update CliFM to version 1.7
    
    - Chase extra color themes to the latest GitHub tag
    - Garbage-collect some no longer needed patchwork
    
    Reported by:    portscout
---
 misc/clifm/Makefile                     |  6 +--
 misc/clifm/distinfo                     | 10 ++---
 misc/clifm/files/patch-Makefile         |  9 ----
 misc/clifm/files/patch-plugins_fdups.sh | 74 ---------------------------------
 misc/clifm/files/patch-src_properties.c | 32 --------------
 misc/clifm/pkg-plist                    | 61 ++++++++++++++-------------
 6 files changed, 41 insertions(+), 151 deletions(-)

diff --git a/misc/clifm/Makefile b/misc/clifm/Makefile
index 18e81840a209..20158eedc9ca 100644
--- a/misc/clifm/Makefile
+++ b/misc/clifm/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	clifm
-PORTVERSION=	1.6
+PORTVERSION=	1.7
 DISTVERSIONPREFIX=	v
 CATEGORIES=	misc
 
@@ -15,12 +15,12 @@ USES=		desktop-file-utils gettext-runtime python:run \
 USE_GITHUB=	yes
 GH_ACCOUNT=	leo-arch
 GH_PROJECT=	${PORTNAME}-colors:cfmc
-GH_TAGNAME=	e9ee1c4:cfmc
+GH_TAGNAME=	b0e2dea:cfmc
 ALL_TARGET=	build
 SHEBANG_FILES=	misc/tools/manpages_comp_gen.py
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC_cfmc}/colors/*.cfm \
+	${INSTALL_DATA} ${WRKSRC_cfmc}/colors/*.clifm \
 		${STAGEDIR}${DATADIR}/colors
 
 post-stage:
diff --git a/misc/clifm/distinfo b/misc/clifm/distinfo
index 2ab15c6dd2c9..a86f8c9fea1d 100644
--- a/misc/clifm/distinfo
+++ b/misc/clifm/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1656397054
-SHA256 (leo-arch-clifm-v1.6_GH0.tar.gz) = 303f0ee2c6b19d3612de623c3ae0ee3ac110dcacfc348ec0f1d80015fc5f26e1
-SIZE (leo-arch-clifm-v1.6_GH0.tar.gz) = 1268633
-SHA256 (leo-arch-clifm-colors-e9ee1c4_GH0.tar.gz) = 697e1af046d55cb819ae76034a2c648705b1061525832d80384ac3d5e4530137
-SIZE (leo-arch-clifm-colors-e9ee1c4_GH0.tar.gz) = 993233
+TIMESTAMP = 1661361531
+SHA256 (leo-arch-clifm-v1.7_GH0.tar.gz) = 6408fe75c80646f33cd1ffab5b7e81ca098e70bd01cbd7b20d3ecbe870dc47c9
+SIZE (leo-arch-clifm-v1.7_GH0.tar.gz) = 1310379
+SHA256 (leo-arch-clifm-colors-b0e2dea_GH0.tar.gz) = fb0c203458ccc169cdd30a465286f8f147bd7862739f793b946c2b6875822a38
+SIZE (leo-arch-clifm-colors-b0e2dea_GH0.tar.gz) = 994898
diff --git a/misc/clifm/files/patch-Makefile b/misc/clifm/files/patch-Makefile
index aeae151c3fd1..1d19dac29dd6 100644
--- a/misc/clifm/files/patch-Makefile
+++ b/misc/clifm/files/patch-Makefile
@@ -9,12 +9,3 @@
  LIBS_NetBSD ?= -I/usr/pkg/include -L/usr/pkg/lib -Wl,-R/usr/pkg/lib -lreadline -lintl -lmagic
  LIBS_OpenBSD ?= -I/usr/local/include -L/usr/local/lib -lereadline -lintl -lmagic
  LIBS_Darwin ?= -I/opt/local/include -L/opt/local/lib -lreadline -lintl -lmagic
-@@ -39,7 +39,7 @@ clean:
- 	$(RM) -- $(BIN)
- 	$(RM) -f -- $(SRCDIR)/*.o
- 
--install: build
-+install: $(BIN)
- 	$(INSTALL) -m 0755 -d $(DESTDIR)$(PREFIX)/bin
- 	$(INSTALL) -m 0755 $(BIN) $(DESTDIR)$(PREFIX)/bin
- 	$(INSTALL) -m 0755 -d $(DESTDIR)$(PROG_DATADIR)
diff --git a/misc/clifm/files/patch-plugins_fdups.sh b/misc/clifm/files/patch-plugins_fdups.sh
deleted file mode 100644
index 747c786debbf..000000000000
--- a/misc/clifm/files/patch-plugins_fdups.sh
+++ /dev/null
@@ -1,74 +0,0 @@
---- plugins/fdups.sh.orig	2022-06-28 06:17:34 UTC
-+++ plugins/fdups.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- 
- # Plugin to find/remove duplicate files for CliFM
- #
-@@ -8,14 +8,12 @@
- # by MD5) in DIR (current directory if omitted) and allow the user to remove
- # one or more of them
- #
--# Dependencies: find md5sum sort uniq xargs sed stat
-+# Dependencies: gfind md5 sort guniq xargs sed stat
- #
- # Notes:
- # 1. If the file size exceeds SIZE_DIGITS digits the file will be misplaced.
- #    (12 digits amount to sizes up to 931GiB)
--# 2. Bash compatible shell required for mktemp(1)
- #
--# Shell: Bash
- # Based on https://github.com/jarun/nnn/blob/master/plugins/dups and modified
- # to fit our needs
- #
-@@ -25,14 +23,14 @@ no_dep=0
- me="clifm"
- no_dep=0
- 
--if ! type find > /dev/null 2>&1; then
--	printf "%s: find: command not found\n" "$me" >&2; no_dep=1
--elif ! type md5sum > /dev/null 2>&1; then
--	printf "%s: md5sum: command not found\n" "$me" >&2; no_dep=1
-+if ! type gfind > /dev/null 2>&1; then
-+	printf "%s: gfind: command not found\n" "$me" >&2; no_dep=1
-+elif ! type md5 > /dev/null 2>&1; then
-+	printf "%s: md5: command not found\n" "$me" >&2; no_dep=1
- elif ! type sort > /dev/null 2>&1; then
- 	printf "%s: sort: command not found\n" "$me" >&2; no_dep=1
--elif ! type uniq > /dev/null 2>&1; then
--	printf "%s: uniq: command not found\n" "$me" >&2; no_dep=1
-+elif ! type guniq > /dev/null 2>&1; then
-+	printf "%s: guniq: command not found\n" "$me" >&2; no_dep=1
- elif ! type xargs > /dev/null 2>&1; then
- 	printf "%s: xargs: command not found\n" "$me" >&2; no_dep=1
- elif ! type sed > /dev/null 2>&1; then
-@@ -72,20 +70,20 @@ printf "\
- " > "$tmp_file"
- 
- # shellcheck disable=SC2016
--find "$dir" -size +0 -type f -printf "%${size_digits}s %p\n" | sort -rn | uniq -w"${size_digits}" -D | sed -e '                                s/^ \{0,12\}\([0-9]\{0,12\}\) \(.*\)$/printf "%s %s\\n" "$(md5sum "\2")" "d\1"/                                                                       ' | tr '\n' '\0' | xargs -0 -n1 -r sh -c | sort | { uniq -w32 --all-repeated=separate; echo; } | sed -ne '
--h                                                           
-+gfind "$dir" -size +0 -type f -printf "%${size_digits}s %p\n" | sort -rn | guniq -w"${size_digits}" -D | sed -e 's/^ \{0,12\}\([0-9]\{0,12\}\) \(.*\)$/printf "%s %s\\n" "$(md5 -r "\2")" "d\1"/' | tr '\n' '\0' | xargs -0 -n1 -r sh -c | sort | { guniq -w32 --all-repeated=separate; echo; } | sed -ne '
-+h
- s/^\(.\{32\}\).* d\([0-9]*\)$/## md5sum: \1 size: \2 bytes/p
--g    
-+g
- :loop
--N             
--/.*\n$/!b loop                               
--p' | sed -e 's/^.\{32\}  \(.*\) d[0-9]*$/\1/' >> "$tmp_file"
-+N
-+/.*\n$/!b loop
-+p' | sed -e 's/^.\{32\} \(.*\) d[0-9]*$/\1/' >> "$tmp_file"
- 
--time_pre="$(stat -c '%Y' "$tmp_file")"
-+time_pre="$(stat -f '%m' "$tmp_file")"
- 
- "$EDITOR" "$tmp_file"
- 
--time_post="$(stat -c '%Y' "$tmp_file")"
-+time_post="$(stat -f '%m' "$tmp_file")"
- 
- if [ "$time_pre" = "$time_post" ]; then
- 	printf "%s: Nothing to do\n" "$me"
diff --git a/misc/clifm/files/patch-src_properties.c b/misc/clifm/files/patch-src_properties.c
deleted file mode 100644
index eeacb8c3c138..000000000000
--- a/misc/clifm/files/patch-src_properties.c
+++ /dev/null
@@ -1,32 +0,0 @@
---- src/properties.c.orig	2022-06-28 06:17:34 UTC
-+++ src/properties.c
-@@ -406,8 +406,8 @@ get_properties(char *filename, const int dsize)
- 	if (colorize == 1)
- 		printf("%s", cend);
- 
--#if defined(__OpenBSD__) || defined(__APPLE__)
--	printf(_("\tBlocks: %s%lld%s"), cbold, attr.st_blocks, cend);
-+#if defined(__OpenBSD__) || defined(__APPLE__) || defined(__FreeBSD__)
-+	printf(_("\tBlocks: %s%lld%s"), cbold, (long long)attr.st_blocks, cend);
- #else
- 	printf(_("\tBlocks: %s%ld%s"), cbold, attr.st_blocks, cend);
- #endif
-@@ -417,15 +417,15 @@ get_properties(char *filename, const int dsize)
- #else
- 	printf(_("\tIO Block: %s%ld%s"), cbold, attr.st_blksize, cend);
- #endif
--#if defined(__OpenBSD__) || defined(__APPLE__)
--	printf(_("\tInode: %s%llu%s\n"), cbold, attr.st_ino, cend);
-+#if defined(__OpenBSD__) || defined(__APPLE__) || defined(__FreeBSD__)
-+	printf(_("\tInode: %s%llu%s\n"), cbold, (unsigned long long)attr.st_ino, cend);
- #else
- 	printf(_("\tInode: %s%zu%s\n"), cbold, attr.st_ino, cend);
- #endif
- #if defined(__OpenBSD__) || defined(__APPLE__)
- 	printf(_("Device: %s%d%s"), cbold, attr.st_dev, cend);
- #else
--	printf(_("Device: %s%zu%s"), cbold, attr.st_dev, cend);
-+	printf(_("Device: %s%zu%s"), cbold, (size_t)attr.st_dev, cend);
- #endif
- 	printf(_("\tUid: %s%u (%s)%s"), cid, attr.st_uid, !owner ? _("unknown")
- 			: owner->pw_name, cend);
diff --git a/misc/clifm/pkg-plist b/misc/clifm/pkg-plist
index 62eb0cbc5cfe..f4c0ff5ece2c 100644
--- a/misc/clifm/pkg-plist
+++ b/misc/clifm/pkg-plist
@@ -2,36 +2,38 @@ bin/clifm
 man/man1/clifm.1.gz
 share/applications/clifm.desktop
 share/bash-completion/completions/clifm
-%%DATADIR%%/actions.cfm
+%%DATADIR%%/actions.clifm
 %%DATADIR%%/clifmrc
-%%DATADIR%%/colors/amber-256.cfm
-%%DATADIR%%/colors/aqua.cfm
-%%DATADIR%%/colors/base16.cfm
-%%DATADIR%%/colors/c64.cfm
-%%DATADIR%%/colors/cga.cfm
-%%DATADIR%%/colors/cold.cfm
-%%DATADIR%%/colors/default.cfm
-%%DATADIR%%/colors/dracula-vivid.cfm
-%%DATADIR%%/colors/dracula.cfm
-%%DATADIR%%/colors/gameboy.cfm
-%%DATADIR%%/colors/green-256.cfm
-%%DATADIR%%/colors/gruvbox.cfm
-%%DATADIR%%/colors/jellybeans-vivid.cfm
-%%DATADIR%%/colors/light.cfm
-%%DATADIR%%/colors/molokai.cfm
-%%DATADIR%%/colors/nocolor.cfm
-%%DATADIR%%/colors/nord.cfm
-%%DATADIR%%/colors/one-dark.cfm
-%%DATADIR%%/colors/solarized.cfm
-%%DATADIR%%/colors/white-256.cfm
-%%DATADIR%%/colors/white.cfm
-%%DATADIR%%/colors/zenburn.cfm
+%%DATADIR%%/colors/amber-256.clifm
+%%DATADIR%%/colors/aqua.clifm
+%%DATADIR%%/colors/base16.clifm
+%%DATADIR%%/colors/c64.clifm
+%%DATADIR%%/colors/cga.clifm
+%%DATADIR%%/colors/cold.clifm
+%%DATADIR%%/colors/default.clifm
+%%DATADIR%%/colors/dracula-vivid.clifm
+%%DATADIR%%/colors/dracula.clifm
+%%DATADIR%%/colors/gameboy.clifm
+%%DATADIR%%/colors/green-256.clifm
+%%DATADIR%%/colors/gruvbox.clifm
+%%DATADIR%%/colors/jellybeans-vivid.clifm
+%%DATADIR%%/colors/light.clifm
+%%DATADIR%%/colors/molokai.clifm
+%%DATADIR%%/colors/nocolor.clifm
+%%DATADIR%%/colors/nord.clifm
+%%DATADIR%%/colors/one-dark.clifm
+%%DATADIR%%/colors/paul-tol.clifm
+%%DATADIR%%/colors/penumbra-dark.clifm
+%%DATADIR%%/colors/solarized.clifm
+%%DATADIR%%/colors/white-256.clifm
+%%DATADIR%%/colors/white.clifm
+%%DATADIR%%/colors/zenburn.clifm
 %%DATADIR%%/functions/cd_on_quit.sh
 %%DATADIR%%/functions/file_picker.sh
 %%DATADIR%%/functions/subshell_notice.sh
-%%DATADIR%%/keybindings.cfm
-%%DATADIR%%/mimelist.cfm
-%%DATADIR%%/nets.cfm
+%%DATADIR%%/keybindings.clifm
+%%DATADIR%%/mimelist.clifm
+%%DATADIR%%/nets.clifm
 %%DATADIR%%/plugins/BFG.cfg
 %%DATADIR%%/plugins/BFG.sh
 %%DATADIR%%/plugins/batch_copy.sh
@@ -40,8 +42,10 @@ share/bash-completion/completions/clifm
 %%DATADIR%%/plugins/clip.sh
 %%DATADIR%%/plugins/colors.sh
 %%DATADIR%%/plugins/cprm.sh
+%%DATADIR%%/plugins/decrypt.sh
 %%DATADIR%%/plugins/disk_analyzer.sh
 %%DATADIR%%/plugins/dragondrop.sh
+%%DATADIR%%/plugins/encrypt.sh
 %%DATADIR%%/plugins/fdups.sh
 %%DATADIR%%/plugins/finder.sh
 %%DATADIR%%/plugins/fzcd.sh
@@ -64,9 +68,10 @@ share/bash-completion/completions/clifm
 %%DATADIR%%/plugins/rgfind.sh
 %%DATADIR%%/plugins/update.sh
 %%DATADIR%%/plugins/vid_viewer.sh
+%%DATADIR%%/plugins/virtualize.sh
 %%DATADIR%%/plugins/wallpaper_setter.sh
-%%DATADIR%%/prompts.cfm
-%%DATADIR%%/readline.cfm
+%%DATADIR%%/prompts.clifm
+%%DATADIR%%/readline.clifm
 %%DATADIR%%/tools/deroff.py
 %%DATADIR%%/tools/manpages_comp_gen.py
 share/icons/hicolor/scalable/apps/clifm.svg