4 files changed, 34 insertions, 13 deletions
diff --git a/net/guacamole-server/Makefile b/net/guacamole-server/Makefile
index 4e4d4ed89657..f335b7ca4018 100644
--- a/net/guacamole-server/Makefile
+++ b/net/guacamole-server/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	guacamole-server
-DISTVERSION=	1.5.5
+DISTVERSION=	1.6.0
 CATEGORIES=	net
 MASTER_SITES=	APACHE/guacamole/${DISTVERSION}/source/
 
diff --git a/net/guacamole-server/distinfo b/net/guacamole-server/distinfo
index 1e6e2036c4d3..2eef90b041b5 100644
--- a/net/guacamole-server/distinfo
+++ b/net/guacamole-server/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1739487171
-SHA256 (guacamole-server-1.5.5.tar.gz) = 67499611c2e22d9c933763adc5408e716a4bfd08a3eb8a5ba2fc6f8f70868f6b
-SIZE (guacamole-server-1.5.5.tar.gz) = 1136892
-SHA256 (5cf408ebbba9544fb5dfb297d98d5a1e1751a56d.patch) = fe104f8eeade04051b1ba86ecb69307dc172746b11c10892dd24ea4a8593d083
-SIZE (5cf408ebbba9544fb5dfb297d98d5a1e1751a56d.patch) = 3222
+TIMESTAMP = 1750962604
+SHA256 (guacamole-server-1.6.0.tar.gz) = 8bc45675da96d7b6f39728160181e3d4ff3c08f460f6d26de5805b642bf13f2b
+SIZE (guacamole-server-1.6.0.tar.gz) = 1252749
diff --git a/net/guacamole-server/files/patch-src_libguac_tcp.c b/net/guacamole-server/files/patch-src_libguac_tcp.c
new file mode 100644
index 000000000000..a43bd7badd94
--- /dev/null
+++ b/net/guacamole-server/files/patch-src_libguac_tcp.c
@@ -0,0 +1,11 @@
+--- src/libguac/tcp.c.orig	2025-06-27 16:58:53 UTC
++++ src/libguac/tcp.c
+@@ -33,7 +33,7 @@ int guac_tcp_connect(const char* hostname, const char*
+ 
+     int retval;
+ 
+-    int fd = EBADFD;
++    int fd = EBADF;
+     struct addrinfo* addresses;
+     struct addrinfo* current_address;
+ 
diff --git a/net/guacamole-server/pkg-plist b/net/guacamole-server/pkg-plist
index e998fbc11d47..ef66399379c6 100644
--- a/net/guacamole-server/pkg-plist
+++ b/net/guacamole-server/pkg-plist
@@ -4,6 +4,7 @@
 include/guacamole/argv-constants.h
 include/guacamole/argv-fntypes.h
 include/guacamole/argv.h
+include/guacamole/assert.h
 include/guacamole/audio-fntypes.h
 include/guacamole/audio-types.h
 include/guacamole/audio.h
@@ -11,9 +12,17 @@ include/guacamole/client-constants.h
 include/guacamole/client-fntypes.h
 include/guacamole/client-types.h
 include/guacamole/client.h
+include/guacamole/display-constants.h
+include/guacamole/display-types.h
+include/guacamole/display.h
 include/guacamole/error-types.h
 include/guacamole/error.h
+include/guacamole/fifo-constants.h
+include/guacamole/fifo-types.h
+include/guacamole/fifo.h
 include/guacamole/fips.h
+include/guacamole/flag-types.h
+include/guacamole/flag.h
 include/guacamole/hash.h
 include/guacamole/layer-types.h
 include/guacamole/layer.h
@@ -32,6 +41,8 @@ include/guacamole/protocol-constants.h
 include/guacamole/protocol-types.h
 include/guacamole/protocol.h
 include/guacamole/recording.h
+include/guacamole/rect-types.h
+include/guacamole/rect.h
 include/guacamole/rwlock.h
 include/guacamole/socket-constants.h
 include/guacamole/socket-fntypes.h
@@ -41,6 +52,7 @@ include/guacamole/socket.h
 include/guacamole/stream-types.h
 include/guacamole/stream.h
 include/guacamole/string.h
+include/guacamole/tcp.h
 %%TERMINAL%%include/guacamole/terminal/terminal.h
 include/guacamole/timestamp-types.h
 include/guacamole/timestamp.h
@@ -69,17 +81,17 @@ include/guacamole/wol.h
 %%VNC%%lib/libguac-client-vnc.so
 %%VNC%%lib/libguac-client-vnc.so.0
 %%VNC%%lib/libguac-client-vnc.so.0.0.0
-lib/libguac.a
-lib/libguac.so
-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
-%%TERMINAL%%lib/libguac-terminal.so.0.1.0
+%%TERMINAL%%lib/libguac-terminal.so.2
+%%TERMINAL%%lib/libguac-terminal.so.2.0.0
+lib/libguac.a
+lib/libguac.so
+lib/libguac.so.25
+lib/libguac.so.25.0.0
+sbin/guacd
 %%GUACENC%%share/man/man1/guacenc.1.gz
 %%GUACLOG%%share/man/man1/guaclog.1.gz
 share/man/man5/guacd.conf.5.gz
 share/man/man8/guacd.8.gz
-sbin/guacd
 @dir(%%GUACD_USER%%,%%GUACD_GROUP%%,) %%GUACD_HOME%%