[maintainer update] difftastic 0.40

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/difftastic/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile 8 Nov 2022 14:54:43 -0000 1.1.1.1
+++ Makefile 29 Dec 2022 13:16:59 -0000
@@ -2,7 +2,7 @@ COMMENT = diff tool that compares files

GH_ACCOUNT = Wilfred
GH_PROJECT = difftastic
-GH_TAGNAME = 0.37.0
+GH_TAGNAME = 0.40.0

HOMEPAGE = https://difftastic.wilfred.me.uk/

@@ -13,14 +13,11 @@ CATEGORIES = devel
# MIT
PERMIT_PACKAGE = Yes

-# as devel/cargo MODULES adds DISTFILES, GH_* didn't
-DISTFILES += ${DISTNAME}${EXTRACT_SUFX}
+DISTFILES += ${GH_DISTFILE}
MODULES = devel/cargo
BUILD_DEPENDS = textproc/mdbook
-
-WANTLIB += c c++ c++abi m pthread
-
-.include "crates.inc"
+COMPILER = base-clang ports-gcc
+WANTLIB += ${MODCARGO_WANTLIB} ${COMPILER_LIBCXX} m

CONFIGURE_STYLE = cargo

@@ -41,4 +38,5 @@ post-install:
${INSTALL_DATA_DIR} ${DOCDIR}
cp -r ${WRKSRC}/html_manual/* ${DOCDIR}

+.include "crates.inc"
.include <bsd.port.mk>
Index: crates.inc
===================================================================
RCS file: /cvs/ports/devel/difftastic/crates.inc,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 crates.inc
--- crates.inc 8 Nov 2022 14:54:43 -0000 1.1.1.1
+++ crates.inc 29 Dec 2022 13:16:59 -0000
@@ -67,7 +67,7 @@ MODCARGO_CRATES += terminal_size 0.1.17
MODCARGO_CRATES += terminal_size 0.2.1 # MIT OR Apache-2.0
MODCARGO_CRATES += textwrap 0.15.0 # MIT
MODCARGO_CRATES += tree-sitter 0.20.9 # MIT
-MODCARGO_CRATES += tree_magic_mini 3.0.3 # MIT
+MODCARGO_CRATES += tree_magic_mini 3.0.3 # MIT
MODCARGO_CRATES += typed-arena 2.0.1 # MIT
MODCARGO_CRATES += unicode-ident 1.0.0 # MIT OR Apache-2.0
MODCARGO_CRATES += unicode-width 0.1.9 # MIT/Apache-2.0
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/difftastic/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 8 Nov 2022 14:54:43 -0000 1.1.1.1
+++ distinfo 29 Dec 2022 13:16:59 -0000
@@ -85,7 +85,7 @@ SHA256 (cargo/windows_i686_msvc-0.36.1.t
SHA256 (cargo/windows_x86_64_gnu-0.36.1.tar.gz) = Tc0XG4d2xBuXUh5doSei2GrSgBFIB9Cyqx5GK8dk2eE=
SHA256 (cargo/windows_x86_64_msvc-0.36.1.tar.gz) = yBHKSoyFPvQgq9hZK6U927rJBBD6tpA7PnmXKmMfdoA=
SHA256 (cargo/wu-diff-0.1.2.tar.gz) = jj5nNfzeBkMocNuNydfjqxuTcnwU6u8ymWlCYpnyiJM=
-SHA256 (difftastic-0.37.0.tar.gz) = pJoym83hhXToFSsFXVu9KhCqnISSymd/v4lj+tMiCUk=
+SHA256 (difftastic-0.40.0.tar.gz) = xURXP5TY0eRkaDyd/V1jAOBQL8yb6jSdLJQiz05M70E=
SIZE (cargo/aho-corasick-0.7.18.tar.gz) = 112923
SIZE (cargo/ansi_term-0.12.1.tar.gz) = 24838
SIZE (cargo/atty-0.2.14.tar.gz) = 5470
@@ -173,4 +173,4 @@ SIZE (cargo/windows_i686_msvc-0.36.1.tar
SIZE (cargo/windows_x86_64_gnu-0.36.1.tar.gz) = 790934
SIZE (cargo/windows_x86_64_msvc-0.36.1.tar.gz) = 661999
SIZE (cargo/wu-diff-0.1.2.tar.gz) = 33439
-SIZE (difftastic-0.37.0.tar.gz) = 28624498
+SIZE (difftastic-0.40.0.tar.gz) = 28787155
Index: patches/patch-Cargo_lock
===================================================================
RCS file: patches/patch-Cargo_lock
diff -N patches/patch-Cargo_lock
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Cargo_lock 29 Dec 2022 13:16:59 -0000
@@ -0,0 +1,17 @@
+Revert upstream patch to tree_magic_mini. We cannot pull from github during build.
+https://github.com/Wilfred/difftastic/commit/b662a2220b9e9eae5f69ecbc31195bcfcc5216e1
+Index: Cargo.lock
+--- Cargo.lock.orig
++++ Cargo.lock
+@@ -637,8 +637,9 @@ dependencies = [
+
+ [[package]]
+ name = "tree_magic_mini"
+-version = "3.0.2"
+-source = "git+https://github.com/Wilfred/tree_magic?branch=fix-panic-for-empty-strings#13dd6dda15c7062bd8f7dd5bc9bb5b16ce9ee613"
++version = "3.0.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "91adfd0607cacf6e4babdb870e9bec4037c1c4b151cfd279ccefc5e0c7feaa6d"
+ dependencies = [
+ "bytecount",
+ "fnv",
Index: patches/patch-Cargo_toml
===================================================================
RCS file: patches/patch-Cargo_toml
diff -N patches/patch-Cargo_toml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Cargo_toml 29 Dec 2022 13:16:59 -0000
@@ -0,0 +1,21 @@
+Revert upstream patch to tree_magic_mini. We cannot pull from github during build.
+https://github.com/Wilfred/difftastic/commit/b662a2220b9e9eae5f69ecbc31195bcfcc5216e1
+Index: Cargo.toml
+--- Cargo.toml.orig
++++ Cargo.toml
+@@ -51,7 +51,7 @@ const_format = "0.2.22"
+ owo-colors = "3.3.0"
+ wu-diff = "0.1.2"
+ rayon = "1.5.2"
+-tree_magic_mini = "3.0.2"
++tree_magic_mini = "3.0.3"
+ bumpalo = "3.9.1"
+ unicode-width = "0.1.9"
+ term_size = "0.3.2"
+@@ -73,6 +73,3 @@ path = "src/main.rs"
+
+ [features]
+
+-[patch.crates-io]
+-# https://github.com/mbrubeck/tree_magic/pull/13 hasn't been merged yet.
+-tree_magic_mini = { git = 'https://github.com/Wilfred/tree_magic', branch = 'fix-panic-for-empty-strings' }
Here's the diff with your suggestions and difftastic updated to 0.40
https://github.com/Wilfred/difftastic/releases/tag/0.40.0

On 12/29/22 13:40, Omar Polo wrote:
> On 2022/12/27 17:11:39 +0100, Volker Schlecht <openbsd-ports@schlecht.dev> wrote:
>> bump
>
> quickly tested with some C files, works fine and is interesting.
>
> slightly improved diff. need to set COMPILER when using c++,
> rearranged WANTLIBs, used GH_DISTFILE and move the include crates.inc
> below.
>
> ok?