git: bb774f9509ac - main - net/guacamole-server: Fix build

From: Richard Gallamore <ultima_at_FreeBSD.org>
Date: Sun, 16 Feb 2025 08:57:41 UTC
The branch main has been updated by ultima:

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

commit bb774f9509ac447c8cb22c3c175e7110c8dd3c4e
Author:     Richard Gallamore <ultima@FreeBSD.org>
AuthorDate: 2025-02-16 08:56:12 +0000
Commit:     Richard Gallamore <ultima@FreeBSD.org>
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