From nobody Sun Feb 16 08:57:41 2025 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YwfnL0j7Cz5p7wF; Sun, 16 Feb 2025 08:57:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YwfnL07Pcz3N0d; Sun, 16 Feb 2025 08:57:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739696262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PV4ASbzUyYefTpcH4iSOdpfhUIqDgezaAMhB2uEstJ8=; b=Vs7IOli/vetP5fKLyWV+bx+ieqopDZpKDaWEhnjo+I3JLolAqrcmpPEdkolyjRh6fJm75c 4FLXf2Br4QF8RkA+ZnWhmL2b8b1Rz3qGZ4LE1c+HrKt+mHB0+DwHIsEPP5F18gYpMSeWgb OOnMTAhMZpPUv8HDXpz970QAbB+PfueqjqH3i1tNa3CBlC0DcwQM8mLjhgVJTpc0VeiZHW W4xNAWJh3/I51Ub6gwrp/piAKgFfdqmkSnG92nH3mvcJS6GtHmdA5ikhZO3lu8u8kMliHP XbEJtSFFSxNhaoA4d1OViAcJAYK4WYTaG15Vw2Tu0V3GcTJCGCj82y3VM65Wgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739696262; a=rsa-sha256; cv=none; b=TrsP7okLCNtaiy565BDq44qmNlHBV8SgOuuhW7bcpbmw1Q3N51b3Eimtspdmd4+Bs400Lf 4OR9q0GCdaOt5TcWXpCsuU2D4rDQRw/7wJ5/jroYCSyxOg78WVxETdEa/9xzLZHHLrO17L oHRajqwS6d+Gqik9A+FSqI4kw0oPLvbmPPtSA+x1U1U9Md6NGeCPyU8uY0VfiMh1LsJxHD KzoobrORtghFCCNfIO5YVGU+MGAsg9wZAgzSUCeoA2oUm/9TnNBWoAy5dUZCKc8nQU4iXb j4Wp9yilgJIlZ6JCeADbU9dmf1q36gD+8TxDWkhPXqb6seL09GK+tWOJF43rJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739696262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PV4ASbzUyYefTpcH4iSOdpfhUIqDgezaAMhB2uEstJ8=; b=nVP3WILnwICF186oMoUfOjvPqYRvcqUWp0N7Uk5/rEMAqubABaNTUk1RNPDsAJSQc3IEzc h6f5+Vl8VCr60hGe/kDLA2u9dmVzEkiyOxNQilKNAw5aRwgtsdJXKh3PqEeV07/G6N21ub nniRqsq5soBWQ/i8LREnsnFGMrJOjPUuJIS42v/T4o97HSX+FUnA+JGyRoD/7JNb0+iP10 paVo40UNgtCQOvkR/XqSjmFJpLl188knAw4AM/oS1PXtFLFiMXO5i8PrZC7beMdYbm6o+B 4NInGrvWYpMstdOjDzeQ3kzB5jUlWEkQb0vT8928mgEoTrXeFAxUvo4hdWCZUw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YwfnK5zXkzgst; Sun, 16 Feb 2025 08:57:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51G8vfoh075745; Sun, 16 Feb 2025 08:57:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51G8vfoK075742; Sun, 16 Feb 2025 08:57:41 GMT (envelope-from git) Date: Sun, 16 Feb 2025 08:57:41 GMT Message-Id: <202502160857.51G8vfoK075742@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Richard Gallamore Subject: git: bb774f9509ac - main - net/guacamole-server: Fix build List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ultima X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bb774f9509ac447c8cb22c3c175e7110c8dd3c4e Auto-Submitted: auto-generated The branch main has been updated by ultima: URL: https://cgit.FreeBSD.org/ports/commit/?id=bb774f9509ac447c8cb22c3c175e7110c8dd3c4e commit bb774f9509ac447c8cb22c3c175e7110c8dd3c4e Author: Richard Gallamore AuthorDate: 2025-02-16 08:56:12 +0000 Commit: Richard Gallamore CommitDate: 2025-02-16 08:56:12 +0000 net/guacamole-server: Fix build for real this time... --- net/guacamole-server/files/patch-configure.ac | 25 ---------------------- .../files/patch-src_libguac_Makefile.am | 10 --------- net/guacamole-server/pkg-plist | 4 ++-- 3 files changed, 2 insertions(+), 37 deletions(-) diff --git a/net/guacamole-server/files/patch-configure.ac b/net/guacamole-server/files/patch-configure.ac deleted file mode 100644 index 6cdc27a80700..000000000000 --- a/net/guacamole-server/files/patch-configure.ac +++ /dev/null @@ -1,25 +0,0 @@ ---- configure.ac.orig 2024-01-11 03:31:49 UTC -+++ configure.ac -@@ -68,6 +68,14 @@ AC_CHECK_LIB([pthread], [pthread_create], [PTHREAD_LIB - AC_DEFINE([HAVE_LIBPTHREAD],, - [Whether libpthread was found])]) - -+# librt -+AC_CHECK_FUNC([timer_create], [AC_MSG_RESULT([timer_create was found without librt.])], -+ [AC_CHECK_LIB([rt], [timer_create], -+ [AC_MSG_RESULT([timer_create was found in librt.]) -+ RT_LIBS=-lrt], -+ [AC_MSG_ERROR([timer_create could not be found.])]) -+ ]) -+ - # Include libdl for dlopen() if necessary - AC_CHECK_LIB([dl], [dlopen], - [DL_LIBS=-ldl], -@@ -128,6 +136,7 @@ AC_SUBST(MATH_LIBS) - AC_SUBST(PNG_LIBS) - AC_SUBST(JPEG_LIBS) - AC_SUBST(CAIRO_LIBS) -+AC_SUBST(RT_LIBS) - AC_SUBST(PTHREAD_LIBS) - AC_SUBST(UUID_LIBS) - AC_SUBST(CUNIT_LIBS) diff --git a/net/guacamole-server/files/patch-src_libguac_Makefile.am b/net/guacamole-server/files/patch-src_libguac_Makefile.am deleted file mode 100644 index aa5873bb604e..000000000000 --- a/net/guacamole-server/files/patch-src_libguac_Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ ---- src/libguac/Makefile.am.orig 2024-01-11 03:33:47 UTC -+++ src/libguac/Makefile.am -@@ -167,6 +167,7 @@ libguac_la_LDFLAGS = \ - @JPEG_LIBS@ \ - @PNG_LIBS@ \ - @PTHREAD_LIBS@ \ -+ @RT_LIBS@ \ - @SSL_LIBS@ \ - @UUID_LIBS@ \ - @VORBIS_LIBS@ \ diff --git a/net/guacamole-server/pkg-plist b/net/guacamole-server/pkg-plist index 0303899e3170..e998fbc11d47 100644 --- a/net/guacamole-server/pkg-plist +++ b/net/guacamole-server/pkg-plist @@ -71,8 +71,8 @@ include/guacamole/wol.h %%VNC%%lib/libguac-client-vnc.so.0.0.0 lib/libguac.a lib/libguac.so -lib/libguac.so.23 -lib/libguac.so.23.0.0 +lib/libguac.so.24 +lib/libguac.so.24.0.0 %%TERMINAL%%lib/libguac-terminal.a %%TERMINAL%%lib/libguac-terminal.so %%TERMINAL%%lib/libguac-terminal.so.0