git: f39f32cb3356 - main - devel/libical: Improve port

The branch main has been updated by diizzy:

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

commit f39f32cb3356a2e3981cac7cfa004810033ed74f
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2025-01-28 20:51:09 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2025-01-28 21:01:54 +0000

    devel/libical: Improve port
    
    * Replace PORTVERSION with DISTVERSION
    * Enable "make test"
    * Remove local patch
    * Some layout changes to port Makefile
    
    PR:             283554
    Reviewed by:    desktop (arrowd)
---
 devel/libical/Makefile                                | 19 ++++++++++++++-----
 devel/libical/files/patch-src__libical__icaltz-util.c | 13 -------------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/devel/libical/Makefile b/devel/libical/Makefile
index 600f90384126..62deaae36da5 100644
--- a/devel/libical/Makefile
+++ b/devel/libical/Makefile
@@ -1,7 +1,8 @@
 PORTNAME=	libical
 DISTVERSION=	3.0.19
+PORTREVISION=	1
 CATEGORIES=	devel
-MASTER_SITES=	https://github.com/libical/libical/releases/download/v${PORTVERSION}/
+MASTER_SITES=	https://github.com/libical/libical/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	desktop@FreeBSD.org
 COMMENT=	Implementation of the IETF Calendaring and Scheduling protocols
@@ -12,27 +13,35 @@ LICENSE_COMB=	dual
 
 LIB_DEPENDS=	libicuuc.so:devel/icu
 
-USES=		cmake compiler:c++11-lib cpe gnome pathfix perl5 pkgconfig
+USES=		cmake:testing compiler:c++11-lib cpe gnome pathfix perl5 \
+		pkgconfig
 CPE_VENDOR=	libical_project
 USE_LDCONFIG=	yes
 USE_PERL5=	build
 
 DOCSDIR=	${PREFIX}/share/gtk-doc/html/libical-glib
 
-PLIST_SUB=	VERSION=${PORTVERSION}
+PLIST_SUB=	VERSION=${DISTVERSION}
+
+CMAKE_TESTING_ON=	LIBICAL_BUILD_TESTING
+
+CMAKE_OFF=	LIBICAL_BUILD_TESTING
+CMAKE_ON=	CMAKE_DISABLE_FIND_PACKAGE_BerkeleyDB \
+		CMAKE_DISABLE_FIND_PACKAGE_Doxygen
 
 OPTIONS_DEFINE=		DOCS GLIB INTROSPECTION VAPI
 OPTIONS_DEFAULT=	GLIB INTROSPECTION VAPI
 OPTIONS_SUB=		yes
 
+GLIB_DESC=		Build GLib bindings
+INTROSPECTION_DESC=	Build GObject Introspection
+
 DOCS_BUILD_DEPENDS=	gtkdoc-scan:textproc/gtk-doc
 DOCS_CMAKE_BOOL=	ICAL_BUILD_DOCS
 
-GLIB_DESC=		Build GLib bindings
 GLIB_USE=		GNOME=glib20,libxml2
 GLIB_CMAKE_BOOL=	ICAL_GLIB
 
-INTROSPECTION_DESC=		Build GObject Introspection
 INTROSPECTION_USE=		gnome=introspection:build
 INTROSPECTION_CMAKE_BOOL=	GOBJECT_INTROSPECTION
 
diff --git a/devel/libical/files/patch-src__libical__icaltz-util.c b/devel/libical/files/patch-src__libical__icaltz-util.c
deleted file mode 100644
index a4452c531f52..000000000000
--- a/devel/libical/files/patch-src__libical__icaltz-util.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/libical/icaltz-util.c.orig	2022-10-17 20:53:57 UTC
-+++ src/libical/icaltz-util.c
-@@ -82,6 +82,10 @@
- #define bswap_64 __builtin_bswap64
- #endif
- 
-+#if defined(__FreeBSD__) && !defined(bswap_64)
-+#define bswap_64(x) __bswap64(x)
-+#endif
-+
- typedef struct
- {
-     char magic[4];