CVS commit: pkgsrc/net/libvncserver

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Dec 25 18:29:50 UTC 2022

Modified Files:
        pkgsrc/net/libvncserver: Makefile distinfo
        pkgsrc/net/libvncserver/patches: patch-rfb_rfbproto.h

Log Message:
libvncserver: do not re-define _XOPEN_SOURCE in installed header

While here: make gnutls really an option

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 pkgsrc/net/libvncserver/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/net/libvncserver/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/libvncserver/patches/patch-rfb_rfbproto.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/libvncserver/Makefile
diff -u pkgsrc/net/libvncserver/Makefile:1.38 pkgsrc/net/libvncserver/Makefile:1.39
--- pkgsrc/net/libvncserver/Makefile:1.38       Wed Oct 26 10:31:06 2022
+++ pkgsrc/net/libvncserver/Makefile    Sun Dec 25 18:29:50 2022
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2022/10/26 10:31:06 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.39 2022/12/25 18:29:50 wiz Exp $
 
 DISTNAME=              libvncserver-LibVNCServer-0.9.13
 PKGNAME=               libVNCServer-0.9.13
-PKGREVISION=           4
+PKGREVISION=           5
 CATEGORIES=            net
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=LibVNC/}
 GITHUB_PROJECT=                libvncserver
@@ -43,7 +42,6 @@ LDFLAGS.SunOS+=               -lsocket
 .include "../../archivers/lzo/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../security/gnutls/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/libvncserver/distinfo
diff -u pkgsrc/net/libvncserver/distinfo:1.21 pkgsrc/net/libvncserver/distinfo:1.22
--- pkgsrc/net/libvncserver/distinfo:1.21       Tue Oct 26 11:05:57 2021
+++ pkgsrc/net/libvncserver/distinfo    Sun Dec 25 18:29:50 2022
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.21 2021/10/26 11:05:57 nia Exp $
+$NetBSD: distinfo,v 1.22 2022/12/25 18:29:50 wiz Exp $
 
 BLAKE2s (libvncserver-LibVNCServer-0.9.13.tar.gz) = cf0fe16cb1f7f3b453bb7fc45b063e6004dbe36cf0c51293fafb36c759a8edf8
 SHA512 (libvncserver-LibVNCServer-0.9.13.tar.gz) = 18b0a1698d32bbdbfe6f65f76130b2a95860e3cc76e8adb904269663698c7c0ae982f451fda1f25e5461f096045d40a89d9014258f439366d5b4feaa4999d643
 Size (libvncserver-LibVNCServer-0.9.13.tar.gz) = 567491 bytes
-SHA1 (patch-libvncclient_tls__openssl.c) = 6986fdc3b65cac0b8e1f152c314ad2575ff55351
 SHA1 (patch-libvncserver_websockets.c) = eb4e50f8fcb8442dae54d1360e6950e2ebd4778b
-SHA1 (patch-rfb_rfbproto.h) = 6dcc68a90d444f88ab696616b1aee3eb66708877
+SHA1 (patch-rfb_rfbproto.h) = 114310232ec7a8abe8dadf3e7d2ba4a1afbcd9ef

Index: pkgsrc/net/libvncserver/patches/patch-rfb_rfbproto.h
diff -u pkgsrc/net/libvncserver/patches/patch-rfb_rfbproto.h:1.1 pkgsrc/net/libvncserver/patches/patch-rfb_rfbproto.h:1.2
--- pkgsrc/net/libvncserver/patches/patch-rfb_rfbproto.h:1.1    Wed Jul 18 17:55:54 2018
+++ pkgsrc/net/libvncserver/patches/patch-rfb_rfbproto.h        Sun Dec 25 18:29:50 2022
@@ -1,13 +1,16 @@
-$NetBSD: patch-rfb_rfbproto.h,v 1.1 2018/07/18 17:55:54 bouyer Exp $
+$NetBSD: patch-rfb_rfbproto.h,v 1.2 2022/12/25 18:29:50 wiz Exp $
+
 Fix endianess detection on NetBSD
 
---- rfb/rfbproto.h.orig        2018-07-18 19:35:56.445752955 +0200
-+++ rfb/rfbproto.h     2018-07-18 19:36:17.076925368 +0200
-@@ -82,8 +82,11 @@
+--- rfb/rfbproto.h.orig        2020-06-13 18:49:53.000000000 +0000
++++ rfb/rfbproto.h
+@@ -78,8 +78,13 @@ typedef int8_t rfbBool;
  #endif
  
  #if LIBVNCSERVER_HAVE_ENDIAN_H
++#ifndef _XOPEN_SOURCE
 +#define _XOPEN_SOURCE
++#endif
  # include <endian.h>
 -# if __BYTE_ORDER == __BIG_ENDIAN
 +# if defined(__BYTE_ORDER) && __BYTE_ORDER == __BIG_ENDIAN