git: 9a4fe7c6ba1b - main - print/cups: Update to 2.4.10

From: Tijl Coosemans <tijl_at_FreeBSD.org>
Date: Fri, 21 Jun 2024 10:42:08 UTC
The branch main has been updated by tijl:

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

commit 9a4fe7c6ba1b371db3b8dc0dd5fc6a024c8e2a4d
Author:     Tijl Coosemans <tijl@FreeBSD.org>
AuthorDate: 2024-06-21 08:36:22 +0000
Commit:     Tijl Coosemans <tijl@FreeBSD.org>
CommitDate: 2024-06-21 10:40:06 +0000

    print/cups: Update to 2.4.10
    
    Pet portclippy/portfmt.
    
    PR:             278920, 279883
---
 print/cups/Makefile | 51 ++++++++++++++++++++++++++-------------------------
 print/cups/distinfo |  6 +++---
 2 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/print/cups/Makefile b/print/cups/Makefile
index 3b2bbd02a83b..667bc609cf0f 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,8 +1,8 @@
 PORTNAME=	cups
-DISTVERSION=	2.4.8
+DISTVERSION=	2.4.10
 CATEGORIES=	print
-MASTER_SITES=	https://github.com/OpenPrinting/cups/releases/download/v${DISTVERSION}/
-EXTRACT_SUFX=	-source.tar.gz
+MASTER_SITES=	https://github.com/OpenPrinting/${PORTNAME}/releases/download/v${DISTVERSION}/
+DISTNAME=	${PORTNAME}-${DISTVERSION}-source
 
 MAINTAINER=	tijl@FreeBSD.org
 COMMENT=	Common UNIX Printing System
@@ -13,33 +13,37 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		compiler:c++11-lang cpe gmake iconv localbase pkgconfig
 CPE_VENDOR=	linuxfoundation
-
-CONFLICTS=	LPRng
+USE_LDCONFIG=	yes
+USE_RC_SUBR=	cupsd
 
 GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
-CONFIGURE_ARGS=	--enable-relro						\
-		--with-cups-user=${USERS}				\
-		--with-cups-group=${GROUPS}				\
-		--with-system-groups=wheel				\
-		--with-dbusdir="${PREFIX}/etc/dbus-1"			\
-		--with-icondir="${PREFIX}/share/icons"			\
-		--with-menudir="${DESKTOPDIR}"				\
-		--with-printcap="${PREFIX}/etc/printcap"		\
-		--with-rcdir=no						\
-		--with-optim=" "					\
-		--with-pam-module="unix"				\
+CONFIGURE_ARGS=	--enable-relro \
+		--with-cups-group=${GROUPS} \
+		--with-cups-user=${USERS} \
+		--with-dbusdir="${PREFIX}/etc/dbus-1" \
+		--with-icondir="${PREFIX}/share/icons" \
+		--with-menudir="${DESKTOPDIR}" \
+		--with-optim=" " \
+		--with-pam-module="unix" \
+		--with-printcap="${PREFIX}/etc/printcap" \
+		--with-rcdir=no \
+		--with-system-groups=wheel \
 		--without-ondemand
-USE_LDCONFIG=	yes
-USE_RC_SUBR=	cupsd
 
-GROUPS=		cups
+CONFLICTS=	LPRng
+
+WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
+
 USERS=		cups
+GROUPS=		cups
 
 OPTIONS_DEFINE=		AVAHI DBUS DOCS GNUTLS IPPTOOL LIBPAPER NLS X11
 OPTIONS_DEFAULT=	AVAHI DBUS GNUTLS LIBPAPER
 OPTIONS_SUB=		yes
 
+IPPTOOL_DESC=	Internet Printing Protocol testing tool
+X11_DESC=	Install desktop menu item
+
 AVAHI_LIB_DEPENDS=	libavahi-client.so:net/avahi-app
 AVAHI_CONFIGURE_WITH=	dnssd=avahi
 AVAHI_SUB_LIST=		AVAHI_DAEMON=avahi_daemon
@@ -53,12 +57,9 @@ DBUS_SUB_LIST_OFF=	DBUS_DAEMON=
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_WITH=	tls=gnutls
 
-IPPTOOL_DESC=		Internet Printing Protocol testing tool
-
-LIBPAPER_LIB_DEPENDS=	libpaper.so:print/libpaper
-LIBPAPER_CONFIGURE_ENABLE=libpaper
+LIBPAPER_LIB_DEPENDS=		libpaper.so:print/libpaper
+LIBPAPER_CONFIGURE_ENABLE=	libpaper
 
-X11_DESC=		Install desktop menu item
 X11_BUILD_DEPENDS=	xdg-open:devel/xdg-utils
 X11_RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
diff --git a/print/cups/distinfo b/print/cups/distinfo
index a0230498d61c..82c989e2bf8a 100644
--- a/print/cups/distinfo
+++ b/print/cups/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1715366483
-SHA256 (cups-2.4.8-source.tar.gz) = 75c326b4ba73975efcc9a25078c4b04cdb4ee333caaad0d0823dbd522c6479a0
-SIZE (cups-2.4.8-source.tar.gz) = 8142007
+TIMESTAMP = 1718957749
+SHA256 (cups-2.4.10-source.tar.gz) = d75757c2bc0f7a28b02ee4d52ca9e4b1aa1ba2affe16b985854f5336940e5ad7
+SIZE (cups-2.4.10-source.tar.gz) = 8145236