[pkgsrc/trunk]: pkgsrc/net/guacamole-server guacamole-server: fix build on Ne...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6d566000e416
branches:  trunk
changeset: 390646:6d566000e416
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Dec 25 18:39:51 2022 +0000

description:
guacamole-server: fix build on NetBSD

Avoid using non-existing functions.
No idea if it works, but now someone else can find that out.

Move some libraries that are not built to PLIST.SunOS based on the
assumption that it was packaged there.

diffstat:

 net/guacamole-server/Makefile                                     |   6 +++-
 net/guacamole-server/PLIST                                        |   7 +---
 net/guacamole-server/PLIST.SunOS                                  |   6 +++
 net/guacamole-server/distinfo                                     |   6 +++-
 net/guacamole-server/patches/patch-src_libguac_client.c           |  16 ++++++++++
 net/guacamole-server/patches/patch-src_libguac_pool.c             |  16 ++++++++++
 net/guacamole-server/patches/patch-src_libguac_socket-broadcast.c |  16 ++++++++++
 net/guacamole-server/patches/patch-src_libguac_socket-fd.c        |  16 ++++++++++
 8 files changed, 81 insertions(+), 8 deletions(-)

diffs (145 lines):

diff -r 84a7aa795c5b -r 6d566000e416 net/guacamole-server/Makefile
--- a/net/guacamole-server/Makefile     Sun Dec 25 18:29:50 2022 +0000
+++ b/net/guacamole-server/Makefile     Sun Dec 25 18:39:51 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2022/10/26 10:31:48 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2022/12/25 18:39:51 wiz Exp $
 
 DISTNAME=      guacamole-server-1.0.0
 PKGREVISION=   21
@@ -32,6 +32,10 @@
 CONFIGURE_ARGS+=       --with-webp
 
 CFLAGS.SunOS+= -D__EXTENSIONS__        # getopt()
+CFLAGS.NetBSD+=        -D_NETBSD_SOURCE        # u_char for CMSG_DATA
+
+# not portable enough for that
+BUILDLINK_TRANSFORM+=  rm:-Werror
 
 SUBST_CLASSES+=                manpath
 SUBST_STAGE.manpath=   pre-configure
diff -r 84a7aa795c5b -r 6d566000e416 net/guacamole-server/PLIST
--- a/net/guacamole-server/PLIST        Sun Dec 25 18:29:50 2022 +0000
+++ b/net/guacamole-server/PLIST        Sun Dec 25 18:39:51 2022 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2019/03/20 16:08:48 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.3 2022/12/25 18:39:51 wiz Exp $
 bin/guaclog
 include/guacamole/audio-fntypes.h
 include/guacamole/audio-types.h
@@ -37,11 +37,6 @@
 include/guacamole/user-fntypes.h
 include/guacamole/user-types.h
 include/guacamole/user.h
-lib/freerdp/guacai.la
-lib/freerdp/guacdr.la
-lib/freerdp/guacsnd.la
-lib/freerdp/guacsvc.la
-lib/libguac-client-rdp.la
 lib/libguac-client-ssh.la
 lib/libguac-client-telnet.la
 lib/libguac-client-vnc.la
diff -r 84a7aa795c5b -r 6d566000e416 net/guacamole-server/PLIST.SunOS
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/guacamole-server/PLIST.SunOS  Sun Dec 25 18:39:51 2022 +0000
@@ -0,0 +1,6 @@
+@comment $NetBSD: PLIST.SunOS,v 1.1 2022/12/25 18:39:51 wiz Exp $
+lib/freerdp/guacai.la
+lib/freerdp/guacdr.la
+lib/freerdp/guacsnd.la
+lib/freerdp/guacsvc.la
+lib/libguac-client-rdp.la
diff -r 84a7aa795c5b -r 6d566000e416 net/guacamole-server/distinfo
--- a/net/guacamole-server/distinfo     Sun Dec 25 18:29:50 2022 +0000
+++ b/net/guacamole-server/distinfo     Sun Dec 25 18:39:51 2022 +0000
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 11:05:42 nia Exp $
+$NetBSD: distinfo,v 1.5 2022/12/25 18:39:51 wiz Exp $
 
 BLAKE2s (guacamole-server-1.0.0.tar.gz) = 93a940e1d8cd0e82275696364a20040f287e7c8fcf67d94184c45ebccf24af07
 SHA512 (guacamole-server-1.0.0.tar.gz) = 70d469e57f77066c1f2e2e3dd4a2ff4a5ca841a937c6774fd62445a3f1833354e0cff09e24892eca7ac8fa5385063972bde8e448a0734b01dc09e9089ca8dc75
 Size (guacamole-server-1.0.0.tar.gz) = 915912 bytes
+SHA1 (patch-src_libguac_client.c) = 4b22baa0183c08d8e8800c49f924c503abeff1df
+SHA1 (patch-src_libguac_pool.c) = c5f3d3566ab5c9d4637207d988cdab6966a30970
+SHA1 (patch-src_libguac_socket-broadcast.c) = 4c06bfc819152e5b6fc2416e307d1cc00bb47047
+SHA1 (patch-src_libguac_socket-fd.c) = 3d852370640c0bc683d9c73756416cc02ff9c84e
diff -r 84a7aa795c5b -r 6d566000e416 net/guacamole-server/patches/patch-src_libguac_client.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/guacamole-server/patches/patch-src_libguac_client.c   Sun Dec 25 18:39:51 2022 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_libguac_client.c,v 1.1 2022/12/25 18:39:51 wiz Exp $
+
+Avoid using undefined function on NetBSD.
+
+--- src/libguac/client.c.orig  2018-12-16 04:23:01.000000000 +0000
++++ src/libguac/client.c
+@@ -171,7 +171,9 @@ guac_client* guac_client_alloc() {
+ 
+     /* Init locks */
+     pthread_rwlockattr_init(&lock_attributes);
++#ifndef __NetBSD__
+     pthread_rwlockattr_setpshared(&lock_attributes, PTHREAD_PROCESS_SHARED);
++#endif
+ 
+     pthread_rwlock_init(&(client->__users_lock), &lock_attributes);
+ 
diff -r 84a7aa795c5b -r 6d566000e416 net/guacamole-server/patches/patch-src_libguac_pool.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/guacamole-server/patches/patch-src_libguac_pool.c     Sun Dec 25 18:39:51 2022 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_libguac_pool.c,v 1.1 2022/12/25 18:39:51 wiz Exp $
+
+Avoid using undefined function on NetBSD.
+
+--- src/libguac/pool.c.orig    2018-11-21 09:00:59.000000000 +0000
++++ src/libguac/pool.c
+@@ -41,7 +41,9 @@ guac_pool* guac_pool_alloc(int size) {
+ 
+     /* Init lock */
+     pthread_mutexattr_init(&lock_attributes);
++#ifndef __NetBSD__
+     pthread_mutexattr_setpshared(&lock_attributes, PTHREAD_PROCESS_SHARED);
++#endif
+     pthread_mutex_init(&(pool->__lock), &lock_attributes);
+ 
+     return pool;
diff -r 84a7aa795c5b -r 6d566000e416 net/guacamole-server/patches/patch-src_libguac_socket-broadcast.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/guacamole-server/patches/patch-src_libguac_socket-broadcast.c Sun Dec 25 18:39:51 2022 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_libguac_socket-broadcast.c,v 1.1 2022/12/25 18:39:51 wiz Exp $
+
+Avoid using undefined function on NetBSD.
+
+--- src/libguac/socket-broadcast.c.orig        2018-11-21 09:00:59.000000000 +0000
++++ src/libguac/socket-broadcast.c
+@@ -357,7 +357,9 @@ guac_socket* guac_socket_broadcast(guac_
+     socket->data = data;
+ 
+     pthread_mutexattr_init(&lock_attributes);
++#ifndef __NetBSD__
+     pthread_mutexattr_setpshared(&lock_attributes, PTHREAD_PROCESS_SHARED);
++#endif
+ 
+     /* Init lock */
+     pthread_mutex_init(&(data->socket_lock), &lock_attributes);
diff -r 84a7aa795c5b -r 6d566000e416 net/guacamole-server/patches/patch-src_libguac_socket-fd.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/guacamole-server/patches/patch-src_libguac_socket-fd.c        Sun Dec 25 18:39:51 2022 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_libguac_socket-fd.c,v 1.3 2022/12/25 18:39:51 wiz Exp $
+
+Avoid using undefined function on NetBSD.
+
+--- src/libguac/socket-fd.c.orig       2018-12-17 06:47:34.000000000 +0000
++++ src/libguac/socket-fd.c
+@@ -431,7 +431,9 @@ guac_socket* guac_socket_open(int fd) {
+     socket->data = data;
+ 
+     pthread_mutexattr_init(&lock_attributes);
++#ifndef __NetBSD__
+     pthread_mutexattr_setpshared(&lock_attributes, PTHREAD_PROCESS_SHARED);
++#endif
+ 
+     /* Init locks */
+     pthread_mutex_init(&(data->socket_lock), &lock_attributes);