git: 95c2c5572648 - main - security/kdbxviewer: Update to 0.1.10

The branch main has been updated by otis:

URL: https://cgit.FreeBSD.org/ports/commit/?id=95c2c55726488c5ebc0e1b1235bb128da8975dee

commit 95c2c55726488c5ebc0e1b1235bb128da8975dee
Author:     Juraj Lutter <otis@FreeBSD.org>
AuthorDate: 2021-11-03 15:22:32 +0000
Commit:     Juraj Lutter <otis@FreeBSD.org>
CommitDate: 2021-11-03 15:23:32 +0000

    security/kdbxviewer: Update to 0.1.10
    
    - Update to 0.1.10 where FreeBSD patches from 0.1.9 were incorporated
---
 security/kdbxviewer/Makefile               |  2 +-
 security/kdbxviewer/distinfo               |  6 +--
 security/kdbxviewer/files/patch-src_main.c | 70 ------------------------------
 security/kdbxviewer/files/patch-src_tui.c  | 11 -----
 4 files changed, 4 insertions(+), 85 deletions(-)

diff --git a/security/kdbxviewer/Makefile b/security/kdbxviewer/Makefile
index 6e2e8706733e..b6c319dfff13 100644
--- a/security/kdbxviewer/Makefile
+++ b/security/kdbxviewer/Makefile
@@ -1,7 +1,7 @@
 # Created by: Ben Woods <woodsb02@FreeBSD.org>
 
 PORTNAME=	kdbxviewer
-PORTVERSION=	0.1.9
+PORTVERSION=	0.1.10
 DISTVERSIONPREFIX=v
 CATEGORIES=	security
 
diff --git a/security/kdbxviewer/distinfo b/security/kdbxviewer/distinfo
index 4010666bde65..98e9295e771f 100644
--- a/security/kdbxviewer/distinfo
+++ b/security/kdbxviewer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1635946423
-SHA256 (pepa65-kdbxviewer-v0.1.9_GH0.tar.gz) = ab9c26971be2e5fdf623e795173a7f6604fe96615b186db1033b09dcd76334d5
-SIZE (pepa65-kdbxviewer-v0.1.9_GH0.tar.gz) = 140205
+TIMESTAMP = 1635952892
+SHA256 (pepa65-kdbxviewer-v0.1.10_GH0.tar.gz) = 0ef77f637b34cb603634b7c2f8247fb5f38e12951961c8e2ae6b7dbf7858fc6d
+SIZE (pepa65-kdbxviewer-v0.1.10_GH0.tar.gz) = 140203
diff --git a/security/kdbxviewer/files/patch-src_main.c b/security/kdbxviewer/files/patch-src_main.c
deleted file mode 100644
index b1eaf090b2dd..000000000000
--- a/security/kdbxviewer/files/patch-src_main.c
+++ /dev/null
@@ -1,70 +0,0 @@
---- src/main.c.orig	2021-10-10 14:14:08 UTC
-+++ src/main.c
-@@ -198,7 +198,7 @@ int main(int argc, char **argv) {
- 		case 'i':
- 		case 'h':
- 		case 'V':
--			if (command != 0) abort(-1, "%sMultiple commands not allowed\n", ERRC);
-+			if (command != 0) abort(-1, "%sMultiple commands not allowed%s\n", ERRC, NORMAL);
- 			command = opt;
- 			break;
- 		case 'v':
-@@ -215,15 +215,15 @@ int main(int argc, char **argv) {
- 			searchall = TRUE;
- 		case 's':
- 			if (search != NULL)
--				abort(-2, "%sSuperfluous search term: %s\n", ERRC, optarg);
-+				abort(-2, "%sSuperfluous search term: %s%s\n", ERRC, optarg, NORMAL);
- 			search = optarg;
- 			break;
- 		case 'd':
- 			if ((kdbxfile = fopen(optarg, "r")) == NULL)
--				abort(-3, "%sCan't open database file: %s\n", ERRC, optarg);
-+				abort(-3, "%sCan't open database file: %s%s\n", ERRC, optarg, NORMAL);
- 			kdbxfilename = optarg;
- 		default:
--			abort(-4, "%sUnrecognized argument -%s\n", ERRC, argv[optind]);
-+			abort(-4, "%sUnrecognized argument -%s%s\n", ERRC, argv[optind], NORMAL);
- 		}
- 	}
- 
-@@ -238,10 +238,10 @@ int main(int argc, char **argv) {
- 
- 	if (optind < argc) // Must be [-s] argument, unless already given
- 		if (search == NULL) search = argv[optind++];
--		else abort(-5, "%sSuperfluous argument: %s\n", ERRC, argv[optind]);
-+		else abort(-5, "%sSuperfluous argument: %s%s\n", ERRC, argv[optind], NORMAL);
- 
- 	if (optind < argc)
--		abort(-6, "%sSuperfluous argument: %s\n", ERRC, argv[optind]);
-+		abort(-6, "%sSuperfluous argument: %s%s\n", ERRC, argv[optind], NORMAL);
- 
- 	if (*kdbxfilename == 0) { // Try configfile for database filename
- 		*filename = 0;
-@@ -253,22 +253,22 @@ int main(int argc, char **argv) {
- 				*filename = 0;
- 			}
- 		if (*kdbxfilename == 0)
--			abort(-7, "%sNo database specified on commandline or in configfile\n",
--				ERRC);
-+			abort(-7, "%sNo database specified on commandline or in configfile%s\n",
-+				ERRC, NORMAL);
- 		else strcpy(filename, kdbxfilename);
- 	}
- 
- 	// Set default mode depending on search
- 	if (search != NULL) { // Search requested
- 		if (command == 'i' || command == 'x')
--			abort(-8, "%sCannot Search with -i/--interactive or -x/--xml\n", ERRC);
-+			abort(-8, "%sCannot Search with -i/--interactive or -x/--xml%s\n", ERRC, NORMAL);
- 		if (command == 0) command = 't';
- 	} else { // No search
- 		if (command == 0) command = 'i';
- 	}
- 
- 	// Open the database
--	warn("%skdbxviewer", RESET);
-+	warn("%skdbxviewer", NORMAL);
- 	if (password == NULL) {
- 		warn(" - Opening KDBX database %s%s\n%sPassword: %s", FIELD, kdbxfilename, PWC, NORMAL);
- 		password = getpass("");
diff --git a/security/kdbxviewer/files/patch-src_tui.c b/security/kdbxviewer/files/patch-src_tui.c
deleted file mode 100644
index 84b31ba93cdf..000000000000
--- a/security/kdbxviewer/files/patch-src_tui.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/tui.c.orig	2021-10-04 12:08:30 UTC
-+++ src/tui.c
-@@ -13,7 +13,7 @@
- #include <locale.h>
- #include "helper.h"
- 
--int unmask;
-+extern int unmask;
- #define WIDE(str) stfl_ipool_towc(ipool, str)
- #define MAXFIELDLEN 32768
-