git: 3d472dc668c6 - main - net/tigervnc-*: Update to 1.14.0

The branch main has been updated by meta:

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

commit 3d472dc668c6b9181505049e0bf7a38defd5364f
Author:     Koichiro Iwao <meta@FreeBSD.org>
AuthorDate: 2024-07-31 02:17:14 +0000
Commit:     Koichiro Iwao <meta@FreeBSD.org>
CommitDate: 2024-07-31 04:35:56 +0000

    net/tigervnc-*: Update to 1.14.0
    
    Changes:        https://github.com/TigerVNC/tigervnc/releases/tag/v1.14.0
    
    A prominent change that affects FreeBSD port is:
    
    * The viewers and servers now follow the XDG Base Directory
      Specification, like "~/.config", for storing files in the home
      directory. Existing users will continue using the legacy "~/.vnc"
      directory, but new users will get the XDG directories.
    
    While here,
    - Adjust BUILD_DEPENDS and LIB_DEPENDS reported in stage-qa
---
 net/tigervnc-server/Makefile           | 18 +++++++-----------
 net/tigervnc-server/Makefile.common.mk |  2 +-
 net/tigervnc-server/distinfo           |  6 +++---
 net/tigervnc-viewer-java/Makefile      |  1 -
 net/tigervnc-viewer/Makefile           | 10 +++-------
 5 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/net/tigervnc-server/Makefile b/net/tigervnc-server/Makefile
index 8846bcf4c58f..94e7e0910730 100644
--- a/net/tigervnc-server/Makefile
+++ b/net/tigervnc-server/Makefile
@@ -1,4 +1,3 @@
-PORTREVISION=	4
 PKGNAMESUFFIX=	-server
 
 COMMENT=	TigerVNC Server
@@ -7,18 +6,19 @@ WWW=		https://tigervnc.org/
 PATCH_DEPENDS+=	${NONEXISTENT}:x11-servers/xorg-server:patch
 BUILD_DEPENDS+=	${LOCALBASE}/include/GL/internal/dri_interface.h:graphics/mesa-dri \
 		${LOCALBASE}/libdata/pkgconfig/fontutil.pc:x11-fonts/font-util \
+		${LOCALBASE}/include/libxcvt/libxcvt.h:x11/libxcvt \
 		bash:shells/bash
 LIB_DEPENDS=	libxshmfence.so:x11/libxshmfence \
-		libxcvt.so:x11/libxcvt \
 		libnettle.so:security/nettle \
-		libgmp.so:math/gmp
+		libgmp.so:math/gmp \
+		libavcodec.so:multimedia/ffmpeg
 # almost equivalent to x11-servers/xorg-server's
 RUN_DEPENDS+=	${LOCALBASE}/share/X11/xkb/rules/base:x11/xkeyboard-config \
 		xkbcomp:x11/xkbcomp
 
 USES+=		autoreconf:build compiler:c11 gl jpeg libtool perl5 pkgconfig ssl shebangfix xorg
 USE_LDCONFIG=	yes
-USE_GL+=	gl
+USE_GL+=	gbm gl
 USE_XORG+=	ice pixman sm x11 xau xdamage xdmcp xext xfixes xfont2 \
 		xkbfile xorg-macros xorgproto xrandr xrender xtrans xtst
 
@@ -30,10 +30,7 @@ OPTIONS_DEFAULT=	GNUTLS PAM
 OPTIONS_SUB=	yes
 GNUTLS_CMAKE_BOOL=	ENABLE_GNUTLS
 GNUTLS_CONFIGURE_ARGS=	--enable-glx-tls
-GNUTLS_LIB_DEPENDS=	libtasn1.so:security/libtasn1 \
-			libgcrypt.so:security/libgcrypt \
-			libgpg-error.so:security/libgpg-error \
-			libgnutls.so:security/gnutls
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 PAM_CMAKE_BOOL=	ENABLE_PAM
 
 CONFIGURE_ARGS+=	\
@@ -70,13 +67,12 @@ CFLAGS+=	-I${LOCALBASE}/include/libdrm
 # - server is not internationalized
 CMAKE_ARGS+=	-DBUILD_VIEWER:BOOL=false -DENABLE_NLS:BOOL=false
 
-TIGERVNC_XORG_PATCH_VER=	${MAKE} -C "${.CURDIR}/../../x11-servers/xorg-server" -V PORTVERSION:R:S,\.,,g
+# TIGERVNC_XOG_PATCH_VER will be 21 when xorg-server 21.1.13
+TIGERVNC_XORG_PATCH_VER=	${MAKE} -C "${.CURDIR}/../../x11-servers/xorg-server" -V PORTVERSION:R:R
 XORG_WRKSRC=	${MAKE} -C ${.CURDIR}/../../x11-servers/xorg-server -VWRKSRC
 
 pre-patch:
 	${CP} -R $$(${XORG_WRKSRC})/ ${WRKSRC}/unix/xserver/
-	# workaround: upstream changed patch naming
-	${LN} -sf ${WRKSRC}/unix/xserver21.1.1.patch ${WRKSRC}/unix/xserver211.patch
 
 post-patch:
 	# do not build tests
diff --git a/net/tigervnc-server/Makefile.common.mk b/net/tigervnc-server/Makefile.common.mk
index 0dcb4abe7c15..476901ee66e5 100644
--- a/net/tigervnc-server/Makefile.common.mk
+++ b/net/tigervnc-server/Makefile.common.mk
@@ -1,6 +1,6 @@
 PORTNAME=	tigervnc
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.13.1
+DISTVERSION=	1.14.0
 CATEGORIES=	net x11-servers
 
 MAINTAINER?=	meta@FreeBSD.org
diff --git a/net/tigervnc-server/distinfo b/net/tigervnc-server/distinfo
index b60061a5e3b7..2f99534df03d 100644
--- a/net/tigervnc-server/distinfo
+++ b/net/tigervnc-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1678235423
-SHA256 (TigerVNC-tigervnc-v1.13.1_GH0.tar.gz) = b7c5b8ed9e4e2c2f48c7b2c9f21927db345e542243b4be88e066b2daa3d1ae25
-SIZE (TigerVNC-tigervnc-v1.13.1_GH0.tar.gz) = 1989081
+TIMESTAMP = 1722387402
+SHA256 (TigerVNC-tigervnc-v1.14.0_GH0.tar.gz) = 5700f9919802a2f0529cc058b8caded03281cdbf0335581f2dcc7df03f783419
+SIZE (TigerVNC-tigervnc-v1.14.0_GH0.tar.gz) = 2090452
diff --git a/net/tigervnc-viewer-java/Makefile b/net/tigervnc-viewer-java/Makefile
index cc05684b4145..0a9ae19cc674 100644
--- a/net/tigervnc-viewer-java/Makefile
+++ b/net/tigervnc-viewer-java/Makefile
@@ -1,5 +1,4 @@
 PKGNAMESUFFIX=	-viewer-java
-PORTREVISION=	1
 CATEGORIES=	net java
 
 COMMENT=	TigerVNC Viewer
diff --git a/net/tigervnc-viewer/Makefile b/net/tigervnc-viewer/Makefile
index 259078c5f632..e9161161ec94 100644
--- a/net/tigervnc-viewer/Makefile
+++ b/net/tigervnc-viewer/Makefile
@@ -1,5 +1,4 @@
 PKGNAMESUFFIX=	-viewer
-PORTREVISION=	2
 CATEGORIES=	net
 
 COMMENT=	TigerVNC Viewer
@@ -9,10 +8,10 @@ USES+=		gnome iconv jpeg magick:7,build xorg
 USE_XORG+=	ice pixman sm x11 xcursor xext xfixes xft xi xinerama xrender xrandr
 
 LIB_DEPENDS+=	libfontconfig.so:x11-fonts/fontconfig \
-		libpng.so:graphics/png \
 		libfltk.so:x11-toolkits/fltk \
 		libnettle.so:security/nettle \
-		libgmp.so:math/gmp
+	 	libgmp.so:math/gmp \
+		libavcodec.so:multimedia/ffmpeg
 
 OPTIONS_DEFINE=	DOCS GNUTLS NLS
 OPTIONS_DEFAULT=	GNUTLS
@@ -20,10 +19,7 @@ OPTIONS_SUB=	yes
 NLS_CMAKE_BOOL=	ENABLE_NLS
 NLS_USES=	gettext
 GNUTLS_CMAKE_BOOL=	ENABLE_GNUTLS
-GNUTLS_LIB_DEPENDS=	libtasn1.so:security/libtasn1 \
-			libgcrypt.so:security/libgcrypt \
-			libgpg-error.so:security/libgpg-error \
-			libgnutls.so:security/gnutls
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 
 DESKTOP_ENTRIES=	"TigerVNC viewer" "Connect to VNC server and display remote desktop" \
 				"${PORTNAME}" "vncviewer" "Network;" false