CVS commit: pkgsrc/net/gtk-vnc

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Apr 21 14:47:51 UTC 2024

Modified Files:
        pkgsrc/net/gtk-vnc: Makefile PLIST buildlink3.mk distinfo options.mk
Removed Files:
        pkgsrc/net/gtk-vnc/patches: patch-ab patch-ae patch-src_Makefile.in

Log Message:
gtk-vnc: update to 1.3.1.

1.2.0 (latest "stable" version according to Gnome standards)
doesn't build, so use latest version.

Jul 14, 2022: Release 1.3.1
===========================

 o Fix invalid use of subprojects with meson
 o Support ZRLE encoding for zero size alpha cursors
 o Add 'check' arg to meson run_command()

Nov 16, 2021: Release 1.3.0
===========================

 o Add API to request screen rotation
 o Automatically pick gthread coroutine if ucontext is not available
 o Fix meson logic bug when disabling vala
 o Honour choice of python when generating keymaps
 o Fix error reporting and memory leaks encrypting auth data
 o Fix missing includes for GDK quartz and broadway backends
 o Switch to GNUTLS for VNC auth challenge to fix empty password handling
 o Fix handling of auth subtypes in gvnccapture program

Apr 14, 2021: Release 1.2.0
===========================

 o Add API to request fixed zoom level
 o Add API to request fixed aspect ratio when scaling
 o Add APIs for client initiated desktop resize
 o Implement "Extended Desktop Resize" VNC extension
 o Implement "Desktop Rename" VNC extension
 o Implement "Last Rect" VNC extension
 o Implement "XVP" (power control) VNC extension
 o Implement VeNCrypt "plain" auth mode
 o Implement alpha cursor VNC extension
 o Use GTK preferred width/height helpers for resizing
 o Fix misc docs/introspection annotation bugs
 o Honour meson warninglevel setting for compiler flags
 o Fix JPEG decoding in low colour depth modes
 o Fix minor memory leaks
 o Add header file macros for checking API version
 o Change some meson options from "bool" to "feature"
 o Validate GLib/GTK min/max symbol versions at build time
 o Avoid recreating framebuffer if size/format is unchanged
 o Emit resize signal after WMVi update
 o Various fixes & enhancements to python demo program
 o Ensure Gir files build against local libs
 o Enable stack protector on more platforms
 o Don't force disable introspection on windows
 o Relax min x11 deps for older platforms
 o Avoid mutex deadlock on FreeBSD in test suite
 o Stop using deprecated GLib thread APIs
 o Stop using deprecated GLib main loop APIs
 o Stop using deprecated GObject class private data APIs
 o Add fixes for building on macOS
 o Fix deps for building example program
 o Update translations

Aug 7, 2019: Release 1.0.0
==========================

 o Autotools build system replaced with meson
 o Support for GTK-2 is dropped. GTK-3 is mandatory
 o Support for libview is dropped in example program
 o Improvements to example demos
 o Use MAP_ANON if MAP_ANONYMOUS doesn't exist to help
   certai macOS versions
 o Fix crash when connection attempt fails early
 o Initialize gcrypt early in auth process
 o Emit vnc-auth-failure signal when SASL auth fals
 o Emit vnc-error signal when authentication fails
 o Fix double free when failing to read certificates
 o Run unit tests in RPM build
 o Modernize RPM spec
 o Fix race condition in unit tests
 o Fix install of missing header for cairo framebuffer
 o Fix typo in gir package name
 o Add missing VncPixelFormat file to git data

Aug 17, 2018: Release 0.9.0
===========================

Note that the next release (1.0.0) will drop support for GTK-2

 o Requires gnutls >= 3.1.18
 o Requires libgcrypt >= 1.5.0
 o Requires glib2 >= 2.42.0
 o Use libgcrypt for DES routines
 o Add missing cipher close calls in ARD auth
 o Check for errors after reading mslogon params
 o Support newer UltraVNC mslogon auth type code
 o Avoid divide by zero in mslogin auth from bogus params
 o Re-allow python2 accidentally blocked when removing
   python binding

Aug  1, 2018: Release 0.8.0
===========================

 o Deleted the python2 binding in favour of GObject introspection
 o Pull in latest keycodemapdb content
 o Disable/fix -Wcast-function-type warnings

Mar 23, 2018: Release 0.7.2
===========================

 o Deprecated the manual python2 binding in favour of GObject
   introspection. It will be deleted in the next release.
 o Emit led state notification on connect
 o Fix incorrect copyright notices
 o Simplify shifted-tab key handling
 o Don't short circuit TLS credential request
 o Improve check for keymap under XWayland
 o Update doap description of project
 o Modernize RPM specfile

May 19, 2017: Release 0.7.1
===========================

 o Explicitly link to GIO instead of relying
   on implicit linkage
 o Switch to use new keycodemap database module
 o Fix size of reserved data in class struct
 o Fix inverted framebuffer args in test case
 o Avoid sign extension in integer arithmetic
 o Avoid crash when opening a GSocketAddress
 o Fix crash if server connection times out
 o Fix incompatibility with libvncserver

Feb  9, 2017: Release 0.7.0
===========================

 o CVE-2017-5884 - fix bounds checking for RRE, hextile and
   copyrect encodings
 o CVE-2017-5885 - fix color map index bounds checking
 o Add API to allow smooth scaling to be disabled
 o Workaround to help SPICE servers quickly drop VNC clients
   which mistakenly connect, by sending "RFB " signature bytes
   early
 o Don't accept color map entries for true-color pixel formats
 o Add missing vala .deps files for gvnc & gvncpulse
 o Avoid crash if host/port is NULL
 o Add precondition checks to some public APIs
 o Fix link to home page in README file
 o Fix misc memory leaks
 o Clamp cursor hot-pixel to within cursor region

Aug 18, 2016: Release 0.6.0
===========================

Important changes:

 o Default to build with GTK-3, use --with-gtk=2.0 to override

New features:

 o Add --with-tls-priority configure flag to set default TLS
   priority string
 o Add a 'vnc-error' signal to report reason for disconnect
 o Add support for fallback to GNUTLS system trust DB

Bug fixes:

 o Fix crash on Windows with GTK3 checking realized state
 o Fix XKB detection of keyboard mapping with Xwayland
 o Switch back to XKB detection for Xwayland
 o Remove duplicate cert expiry check
 o Avoid misc compile warnings
 o Add missing API docs + GObject introspection annotations
 o Add missing GIO dep on gvnc library GObject introspection build
 o Remove unused code
 o Fix redraw on Win10
 o Drop support for gnutls < 2.2.0
 o Fix path to h2def script
 o Update compiler warning detection to fix clang build
 o Ignore cast align warnings to fix clang build
 o Fix endianess inversion when setting pixel format

Feb 10, 2015: Release 0.5.4
===========================

Bug fixes:

 o Fix auth when using PLAIN SASL method
 o Fix introspection build support on FreeBSD
 o Remove use of deprecated GTK_STOCK_* constants
 o Fix parallel build for introspection files
 o Add mising dep on Gtk introspection file
 o Release held keys when getting grab notify
 o Updated translations
 o Don't call into GDK if no GdkWindow is realized
 o Chain up parent realize_event vfunc
 o Fix colourmap mode by always sending pixel format message
 o Update GCC compiler warning flags used
 o Enable double buffering on Gtk3 to fix child widget clipping
 o Disable -Wbad-function-cast to avoid glib header warnings
 o Don't set thread callbacks on gcrypt >= 1.6 or gnutls >= 2.12
 o Do explicit check for gcrypt since gnutls might use nettle
 o Add support for Wayland & Xwayland keymaps
 o Add support for Gtk Broadway backend keymaps
 o Fix AltGr handling on Windows displays
 o Fix virtual keycode conversion on Win32
 o Fix USB/HID scsancodes for volume keys

Sep 18, 2013: Release 0.5.3
===========================

New features:

 o Support QEMU LED state extension

Bug fixes:

 o Time out connection attempt after 10 seconds
 o Abort if out of memory when mmap'ing coroutine stack
 o Stop leaking coroutine stack memory
 o Improve perfornmance of ZRLE encoding by avoiding memmove
 o Only trigger keyboard grab sequence upon key release to
   allow modifiers to go to the remote server
 o Avoid busy loop upon I/O error which follows blocking I/O,
   commonly seen when a server drops the connection
 o Fix handling of --no-undefined flag
 o Don't break implicit pointer grab from mouse clicks
 o Don't drop mouse events that are out of bounds, clamp their
   coordinates instead
 o Show how to block all accelerators in gvncviewer demo program


To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 pkgsrc/net/gtk-vnc/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/gtk-vnc/PLIST
cvs rdiff -u -r1.61 -r1.62 pkgsrc/net/gtk-vnc/buildlink3.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/net/gtk-vnc/distinfo
cvs rdiff -u -r1.15 -r1.16 pkgsrc/net/gtk-vnc/options.mk
cvs rdiff -u -r1.2 -r0 pkgsrc/net/gtk-vnc/patches/patch-ab
cvs rdiff -u -r1.3 -r0 pkgsrc/net/gtk-vnc/patches/patch-ae
cvs rdiff -u -r1.1 -r0 pkgsrc/net/gtk-vnc/patches/patch-src_Makefile.in

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

Modified files:

Index: pkgsrc/net/gtk-vnc/Makefile
diff -u pkgsrc/net/gtk-vnc/Makefile:1.107 pkgsrc/net/gtk-vnc/Makefile:1.108
--- pkgsrc/net/gtk-vnc/Makefile:1.107   Wed Apr 17 12:02:15 2024
+++ pkgsrc/net/gtk-vnc/Makefile Sun Apr 21 14:47:50 2024
@@ -1,65 +1,32 @@
-# $NetBSD: Makefile,v 1.107 2024/04/17 12:02:15 wiz Exp $
+# $NetBSD: Makefile,v 1.108 2024/04/21 14:47:50 wiz Exp $
 
-DISTNAME=      gtk-vnc-0.5.2
-PKGREVISION=   66
+DISTNAME=      gtk-vnc-1.3.1
 CATEGORIES=    net
-MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gtk-vnc/0.5/}
+MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gtk-vnc/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-#HOMEPAGE=     http://live.gnome.org/gtk-vnc
+HOMEPAGE=      https://wiki.gnome.org/Projects/gtk-vnc
 COMMENT=       VNC viewer widget for GTK
 LICENSE=       gnu-lgpl-v2.1
 
-GNU_CONFIGURE= yes
-USE_LIBTOOL=   yes
-USE_TOOLS+=    gmake intltool msgfmt pkg-config
-
-PKGCONFIG_OVERRIDE+=   gtk-vnc-1.0.pc.in
-PKGCONFIG_OVERRIDE+=   gtk-vnc-2.0.pc.in
-PKGCONFIG_OVERRIDE+=   gvnc-1.0.pc.in
-PKGCONFIG_OVERRIDE+=   gvncpulse-1.0.pc.in
-PY_PATCHPLIST=         yes
+USE_TOOLS+=    intltool msgfmt pkg-config
 
-CONFIGURE_ARGS+=       --with-coroutine=gthread
+PKGCONFIG_OVERRIDE+=   output/meson-private/*.pc
 
-.include "options.mk"
+PKGCONFIG_OVERRIDE_STAGE=      post-configure
 
-# idea from arch linux PKGBUILD
-CONFIGURE_SCRIPT=      ../configure
-CONFIGURE_DIRS=                gtk2-build gtk3-build
-BUILD_DIRS=            gtk2-build gtk3-build
-INSTALL_DIRS=          gtk2-build gtk3-build
-
-pre-configure:
-       ${RM} -rf ${WRKSRC}/gtk2-build ${WRKSRC}/gtk3-build
-       ${MKDIR} ${WRKSRC}/gtk2-build ${WRKSRC}/gtk3-build
-
-do-configure:
-       cd ${WRKSRC}/gtk2-build \
-       && ${PKGSRC_SETENV} ${CONFIGURE_ENV} ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} \
-       --with-gtk=2.0
-       cd ${WRKSRC}/gtk3-build \
-       && ${PKGSRC_SETENV} ${CONFIGURE_ENV} ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} \
-       --with-gtk=3.0
-
-# The GTK3 build excludes some functions which are still listed in the mapfile.
-SUBST_CLASSES.SunOS+=  mapfile
-SUBST_STAGE.mapfile=   pre-build
-SUBST_FILES.mapfile=   gtk3-build/src/Makefile
-SUBST_SED.mapfile=     -e '/VERSION_SCRIPT_FLAGS.*GTK_VNC_VERSION_FILE/d'
+MESON_ARGS+=           -D with-coroutine=gthread
 
-#VIEW_REQUIRED=        0.6.0
-#libview
+.include "options.mk"
 
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/gobject-introspection/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../devel/meson/build.mk"
 .include "../../devel/zlib/buildlink3.mk"
-# libview is only used for an example which is not installed
-#.include "../../devel/libview/buildlink3.mk"
+.include "../../lang/python/tool.mk"
 .include "../../security/gnutls/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gtk2+=   gtk2+>=2.18.0
-.include "../../x11/gtk2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gtk3+=   gtk3+>=3.0.0
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/gtk-vnc/PLIST
diff -u pkgsrc/net/gtk-vnc/PLIST:1.6 pkgsrc/net/gtk-vnc/PLIST:1.7
--- pkgsrc/net/gtk-vnc/PLIST:1.6        Wed Apr 17 12:02:15 2024
+++ pkgsrc/net/gtk-vnc/PLIST    Sun Apr 21 14:47:50 2024
@@ -1,15 +1,10 @@
-@comment $NetBSD: PLIST,v 1.6 2024/04/17 12:02:15 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2024/04/21 14:47:50 wiz Exp $
 bin/gvnccapture
-include/gtk-vnc-1.0/gtk-vnc.h
-include/gtk-vnc-1.0/vncdisplay.h
-include/gtk-vnc-1.0/vncdisplayenums.h
-include/gtk-vnc-1.0/vncgrabsequence.h
-include/gtk-vnc-1.0/vncimageframebuffer.h
 include/gtk-vnc-2.0/gtk-vnc.h
+include/gtk-vnc-2.0/vnccairoframebuffer.h
 include/gtk-vnc-2.0/vncdisplay.h
 include/gtk-vnc-2.0/vncdisplayenums.h
 include/gtk-vnc-2.0/vncgrabsequence.h
-include/gtk-vnc-2.0/vncimageframebuffer.h
 include/gvnc-1.0/gvnc.h
 include/gvnc-1.0/vncaudio.h
 include/gvnc-1.0/vncaudioformat.h
@@ -23,17 +18,29 @@ include/gvnc-1.0/vnccursor.h
 include/gvnc-1.0/vncframebuffer.h
 include/gvnc-1.0/vncpixelformat.h
 include/gvnc-1.0/vncutil.h
+include/gvnc-1.0/vncversion.h
 ${PLIST.pulseaudio}include/gvncpulse-1.0/gvncpulse.h
 ${PLIST.pulseaudio}include/gvncpulse-1.0/vncaudiopulse.h
-lib/libgtk-vnc-1.0.la
-lib/libgtk-vnc-2.0.la
-lib/libgvnc-1.0.la
-${PLIST.pulseaudio}lib/libgvncpulse-1.0.la
-lib/pkgconfig/gtk-vnc-1.0.pc
+lib/girepository-1.0/GVnc-1.0.typelib
+${PLIST.pulseaudio}lib/girepository-1.0/GVncPulse-1.0.typelib
+lib/girepository-1.0/GtkVnc-2.0.typelib
+lib/libgtk-vnc-2.0.so
+lib/libgtk-vnc-2.0.so.0
+lib/libgtk-vnc-2.0.so.0.0.2
+lib/libgvnc-1.0.so
+lib/libgvnc-1.0.so.0
+lib/libgvnc-1.0.so.0.0.1
+${PLIST.pulseaudio}lib/libgvncpulse-1.0.so
+${PLIST.pulseaudio}lib/libgvncpulse-1.0.so.0
+${PLIST.pulseaudio}lib/libgvncpulse-1.0.so.0.0.1
 lib/pkgconfig/gtk-vnc-2.0.pc
 lib/pkgconfig/gvnc-1.0.pc
 ${PLIST.pulseaudio}lib/pkgconfig/gvncpulse-1.0.pc
 man/man1/gvnccapture.1
+share/gir-1.0/GVnc-1.0.gir
+${PLIST.pulseaudio}share/gir-1.0/GVncPulse-1.0.gir
+share/gir-1.0/GtkVnc-2.0.gir
+share/locale/bs/LC_MESSAGES/gtk-vnc.mo
 share/locale/ca/LC_MESSAGES/gtk-vnc.mo
 share/locale/ca@valencia/LC_MESSAGES/gtk-vnc.mo
 share/locale/cs/LC_MESSAGES/gtk-vnc.mo
@@ -44,18 +51,26 @@ share/locale/en_GB/LC_MESSAGES/gtk-vnc.m
 share/locale/eo/LC_MESSAGES/gtk-vnc.mo
 share/locale/es/LC_MESSAGES/gtk-vnc.mo
 share/locale/eu/LC_MESSAGES/gtk-vnc.mo
+share/locale/fa/LC_MESSAGES/gtk-vnc.mo
 share/locale/fr/LC_MESSAGES/gtk-vnc.mo
+share/locale/fur/LC_MESSAGES/gtk-vnc.mo
+share/locale/gd/LC_MESSAGES/gtk-vnc.mo
 share/locale/gl/LC_MESSAGES/gtk-vnc.mo
+share/locale/guc/LC_MESSAGES/gtk-vnc.mo
 share/locale/he/LC_MESSAGES/gtk-vnc.mo
+share/locale/hr/LC_MESSAGES/gtk-vnc.mo
 share/locale/hu/LC_MESSAGES/gtk-vnc.mo
 share/locale/id/LC_MESSAGES/gtk-vnc.mo
 share/locale/it/LC_MESSAGES/gtk-vnc.mo
 share/locale/ja/LC_MESSAGES/gtk-vnc.mo
+share/locale/ka/LC_MESSAGES/gtk-vnc.mo
 share/locale/ko/LC_MESSAGES/gtk-vnc.mo
 share/locale/lt/LC_MESSAGES/gtk-vnc.mo
 share/locale/lv/LC_MESSAGES/gtk-vnc.mo
 share/locale/nb/LC_MESSAGES/gtk-vnc.mo
 share/locale/nds/LC_MESSAGES/gtk-vnc.mo
+share/locale/nl/LC_MESSAGES/gtk-vnc.mo
+share/locale/oc/LC_MESSAGES/gtk-vnc.mo
 share/locale/pa/LC_MESSAGES/gtk-vnc.mo
 share/locale/pl/LC_MESSAGES/gtk-vnc.mo
 share/locale/pt/LC_MESSAGES/gtk-vnc.mo
@@ -67,6 +82,8 @@ share/locale/sl/LC_MESSAGES/gtk-vnc.mo
 share/locale/sr/LC_MESSAGES/gtk-vnc.mo
 share/locale/sr@latin/LC_MESSAGES/gtk-vnc.mo
 share/locale/sv/LC_MESSAGES/gtk-vnc.mo
+share/locale/te/LC_MESSAGES/gtk-vnc.mo
+share/locale/tg/LC_MESSAGES/gtk-vnc.mo
 share/locale/th/LC_MESSAGES/gtk-vnc.mo
 share/locale/tr/LC_MESSAGES/gtk-vnc.mo
 share/locale/uk/LC_MESSAGES/gtk-vnc.mo

Index: pkgsrc/net/gtk-vnc/buildlink3.mk
diff -u pkgsrc/net/gtk-vnc/buildlink3.mk:1.61 pkgsrc/net/gtk-vnc/buildlink3.mk:1.62
--- pkgsrc/net/gtk-vnc/buildlink3.mk:1.61       Wed Apr 17 12:02:15 2024
+++ pkgsrc/net/gtk-vnc/buildlink3.mk    Sun Apr 21 14:47:50 2024
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.61 2024/04/17 12:02:15 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.62 2024/04/21 14:47:50 wiz Exp $
 
 BUILDLINK_TREE+=       gtk-vnc
 
@@ -6,12 +6,12 @@ BUILDLINK_TREE+=      gtk-vnc
 GTK_VNC_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gtk-vnc+=        gtk-vnc>=0.5.1
-BUILDLINK_ABI_DEPENDS.gtk-vnc+=        gtk-vnc>=0.5.2nb65
+BUILDLINK_ABI_DEPENDS.gtk-vnc+=        gtk-vnc>=1.3.1
 BUILDLINK_PKGSRCDIR.gtk-vnc?=  ../../net/gtk-vnc
 
 pkgbase := gtk-vnc
 .include "../../mk/pkg-build-options.mk"
-.if ${PKG_BUILD_OPTIONS.gtk-vnc:Mvnc-sasl}
+.if ${PKG_BUILD_OPTIONS.gtk-vnc:Msasl}
 .include "../../security/cyrus-sasl/buildlink3.mk"
 .endif
 

Index: pkgsrc/net/gtk-vnc/distinfo
diff -u pkgsrc/net/gtk-vnc/distinfo:1.9 pkgsrc/net/gtk-vnc/distinfo:1.10
--- pkgsrc/net/gtk-vnc/distinfo:1.9     Tue Oct 26 11:05:42 2021
+++ pkgsrc/net/gtk-vnc/distinfo Sun Apr 21 14:47:50 2024
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.9 2021/10/26 11:05:42 nia Exp $
+$NetBSD: distinfo,v 1.10 2024/04/21 14:47:50 wiz Exp $
 
-BLAKE2s (gtk-vnc-0.5.2.tar.xz) = ac97e0655c40965714a9359d1d0d306dacfc55b9d19417d77abe4e1b30af8daf
-SHA512 (gtk-vnc-0.5.2.tar.xz) = e58a0bbb4c5d1802d51936d5869ccad55cd405f6939f49445e224863866a33173e47e055d88f50e60b3f864a7e393faf0c78a219a08ee8a8c1fc8fe108f9824a
-Size (gtk-vnc-0.5.2.tar.xz) = 388112 bytes
-SHA1 (patch-ab) = f59d1260533ed8c8e2932f6af416d8e5a6088650
-SHA1 (patch-ae) = 75b082408787267888d0f9ba5a6fcf7f953de13f
-SHA1 (patch-src_Makefile.in) = 15214b84ee70e20d12a9515281bb0f2660e5b57d
+BLAKE2s (gtk-vnc-1.3.1.tar.xz) = df663f6fc73d11bf4d0826fad39328d780502679581491b5e8a7bd5919c6ee25
+SHA512 (gtk-vnc-1.3.1.tar.xz) = 01c9af407f913b214814252d7b204822372293ffc5f658aa646936f9f8cdcd77589c127e4d0e893e914c61470d4616e32f7b1fa9bd3739b2a22caef6710953b9
+Size (gtk-vnc-1.3.1.tar.xz) = 222204 bytes

Index: pkgsrc/net/gtk-vnc/options.mk
diff -u pkgsrc/net/gtk-vnc/options.mk:1.15 pkgsrc/net/gtk-vnc/options.mk:1.16
--- pkgsrc/net/gtk-vnc/options.mk:1.15  Wed Apr 17 12:02:15 2024
+++ pkgsrc/net/gtk-vnc/options.mk       Sun Apr 21 14:47:51 2024
@@ -1,22 +1,20 @@
-# $NetBSD: options.mk,v 1.15 2024/04/17 12:02:15 wiz Exp $
+# $NetBSD: options.mk,v 1.16 2024/04/21 14:47:51 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gtk-vnc
-PKG_SUPPORTED_OPTIONS= vnc-sasl pulseaudio
-PKG_SUGGESTED_OPTIONS= vnc-sasl pulseaudio
+PKG_SUPPORTED_OPTIONS= pulseaudio sasl
+PKG_SUGGESTED_OPTIONS= pulseaudio sasl
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mvnc-sasl)
+.if !empty(PKG_OPTIONS:Msasl)
 .include "../../security/cyrus-sasl/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=       --without-sasl
 .endif
 
 PLIST_VARS+=   pulseaudio
 .if !empty(PKG_OPTIONS:Mpulseaudio)
 .include "../../audio/pulseaudio/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-pulseaudio
+MESON_ARGS+=           -D pulseaudio=enabled
 PLIST.pulseaudio=      yes
 .else
-CONFIGURE_ARGS+=       --without-pulseaudio
+MESON_ARGS+=           -D pulseaudio=disabled
 .endif