git: 4fe2fada927d - main - misc/xdelta3: Update to 3.2.0 and take maintainership

The branch main has been updated by tagattie:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4fe2fada927d063c57cf7006de4f0dfacb8913aa

commit 4fe2fada927d063c57cf7006de4f0dfacb8913aa
Author:     Thomas Barabosch <[email protected]>
AuthorDate: 2026-08-16 08:23:01 +0000
Commit:     Hiroki Tagato <[email protected]>
CommitDate: 2026-08-16 08:27:43 +0000

    misc/xdelta3: Update to 3.2.0 and take maintainership
    
    Port changes:
    - Switch the upstream build from Autotools to CMake
      (see https://github.com/jmacd/xdelta)
    - Update the declared license from GPLv2+ to Apache 2.0
      (as per https://github.com/jmacd/xdelta)
    - Enable armor support and the static-library build
    - Install the public header, static library, pkg-config file, and CMake
      package metadata
    - Remove the obsolete regtest patch (not required anymore due to
      changes to the build infrastructure)
    - Update WWW, COMMENT, and pkg-descr to reflect these chagnes
    - Add a complete pkg-plist
    
    Changelog: https://github.com/jmacd/xdelta/releases/tag/v3.2.0
    
    PR:             297302
    Reported by:    Thomas Barabosch <[email protected]> (new maintainer)
    Reviewed by:    diizzy
---
 misc/xdelta3/Makefile                       | 33 ++++++++++++++++-------------
 misc/xdelta3/distinfo                       |  6 +++---
 misc/xdelta3/files/patch-CMakeLists.txt     | 10 +++++++++
 misc/xdelta3/files/patch-testing_regtest.cc | 11 ----------
 misc/xdelta3/pkg-descr                      |  7 +++---
 misc/xdelta3/pkg-plist                      |  9 ++++++++
 6 files changed, 43 insertions(+), 33 deletions(-)

diff --git a/misc/xdelta3/Makefile b/misc/xdelta3/Makefile
index f7ab3e118d25..0f73d40e6129 100644
--- a/misc/xdelta3/Makefile
+++ b/misc/xdelta3/Makefile
@@ -1,26 +1,29 @@
 PORTNAME=	xdelta
-PORTVERSION=	3.1.0
-PORTREVISION=	4
-DISTVERSIONPREFIX=	v
+DISTVERSION=	3.2.0
 PORTEPOCH=	1
-CATEGORIES?=	misc devel
+CATEGORIES=	misc devel
+MASTER_SITES=	https://github.com/jmacd/xdelta/releases/download/v${DISTVERSION}/
 PKGNAMESUFFIX=	3
+DISTNAME=	xdelta3-${DISTVERSION}
 
-MAINTAINER=	[email protected]
-COMMENT=	Open-source binary diff, VCDIFF/RFC 3284 delta compression
-WWW=		http://xdelta.org/
+MAINTAINER=	[email protected]
+COMMENT=	Binary diff and VCDIFF/RFC 3284 delta compression tool
+WWW=		https://github.com/jmacd/xdelta
 
-LICENSE=	GPLv2+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		autoreconf compiler:c++11-lang gmake
-GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
-USE_GITHUB=	yes
-GH_ACCOUNT=	jmacd
+LIB_DEPENDS=	libblake3.so:devel/libblake3
 
-WRKSRC_SUBDIR=	xdelta3
+USES=		cmake:testing compiler:c++11-lang pathfix
+
+CMAKE_ARGS=	-DFETCHCONTENT_TRY_FIND_PACKAGE_MODE=ALWAYS \
+		-DXD3_LZMA_MODE=on
+CMAKE_ON=	XD3_ARMOR XD3_BUILD_LIB
+CMAKE_OFF=	XD3_BUILD_TESTS XD3_LZMA_FETCH
+CMAKE_TESTING_ON=	XD3_BUILD_TESTS
 
-PLIST_FILES=	bin/xdelta3 share/man/man1/xdelta3.1.gz
+WRKSRC_SUBDIR=	xdelta3
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git a/misc/xdelta3/distinfo b/misc/xdelta3/distinfo
index f7a651712721..1bd84e1351d3 100644
--- a/misc/xdelta3/distinfo
+++ b/misc/xdelta3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1529879623
-SHA256 (jmacd-xdelta-v3.1.0_GH0.tar.gz) = 7515cf5378fca287a57f4e2fee1094aabc79569cfe60d91e06021a8fd7bae29d
-SIZE (jmacd-xdelta-v3.1.0_GH0.tar.gz) = 1036904
+TIMESTAMP = 1786817563
+SHA256 (xdelta3-3.2.0.tar.gz) = 89c368ac627fd89b96a7ecb555d9dd63f455a8c524103c8117f64787a78e5709
+SIZE (xdelta3-3.2.0.tar.gz) = 348621
diff --git a/misc/xdelta3/files/patch-CMakeLists.txt b/misc/xdelta3/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..faf04166ef39
--- /dev/null
+++ b/misc/xdelta3/files/patch-CMakeLists.txt
@@ -0,0 +1,10 @@
+--- CMakeLists.txt.orig	2026-06-21 04:42:48 UTC
++++ CMakeLists.txt
+@@ -252,7 +252,7 @@ if(XD3_ARMOR)
+     ${XD3_FETCHCONTENT_EXCLUDE})
+   FetchContent_MakeAvailable(blake3)
+-  set(XD3_ARMOR_LIBRARIES blake3)
++  set(XD3_ARMOR_LIBRARIES BLAKE3::blake3)
+   message(STATUS "xdelta3: armor mode enabled (BLAKE3 ${XD3_BLAKE3_TAG})")
+ else()
+   message(STATUS "xdelta3: armor mode disabled")
diff --git a/misc/xdelta3/files/patch-testing_regtest.cc b/misc/xdelta3/files/patch-testing_regtest.cc
deleted file mode 100644
index 972bcd6b0d04..000000000000
--- a/misc/xdelta3/files/patch-testing_regtest.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- testing/regtest.cc.orig	2016-02-15 23:07:07 UTC
-+++ testing/regtest.cc
-@@ -1006,7 +1006,7 @@ void FourWayMergeTest(const FileSpec &sp
-   ExtFile d01, d12, d23;
-   Options options;
-   options.encode_srcwin_maxsz =
--    std::max(spec0.Size(), options.encode_srcwin_maxsz);
-+    std::max((unsigned long long)spec0.Size(), (unsigned long long)options.encode_srcwin_maxsz);
- 
-   spec0.WriteTmpFile(&f0);
-   spec1.WriteTmpFile(&f1);
diff --git a/misc/xdelta3/pkg-descr b/misc/xdelta3/pkg-descr
index 420008e463d0..dbd25d0804f0 100644
--- a/misc/xdelta3/pkg-descr
+++ b/misc/xdelta3/pkg-descr
@@ -1,4 +1,3 @@
-Xdelta is a tool and library for differential compression.  Xdelta
-release version 3 supports VCDIFF encoding and decoding.  This is a BETA
-release, but almost stable.  Supports compressing 64 bit files on
-Windows, *nux, etc.
+Xdelta3 is a binary differencing tool and library that implements VCDIFF
+(RFC 3284) delta compression. It encodes and decodes deltas for large files
+and provides command-line and reusable static-library interfaces.
diff --git a/misc/xdelta3/pkg-plist b/misc/xdelta3/pkg-plist
new file mode 100644
index 000000000000..f2b077f02365
--- /dev/null
+++ b/misc/xdelta3/pkg-plist
@@ -0,0 +1,9 @@
+bin/xdelta3
+include/xdelta3.h
+lib/cmake/xdelta3/xdelta3Config.cmake
+lib/cmake/xdelta3/xdelta3ConfigVersion.cmake
+lib/cmake/xdelta3/xdelta3Targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/xdelta3/xdelta3Targets.cmake
+lib/libxdelta3.a
+libdata/pkgconfig/xdelta3.pc
+share/man/man1/xdelta3.1.gz