Re: pkg/58339: cad/kicad fails without wayland being installed

["John D. Baker via gnats" <gnats-admin%NetBSD.org@localhost>]

The following reply was made to PR pkg/58339; it has been noted by GNATS.

From: "John D. Baker" <jdbaker%consolidated.net@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: pkg/58339: cad/kicad fails without wayland being installed
Date: Sat, 21 Sep 2024 04:36:34 -0500 (CDT)

 Since the recent rototill of cmake-using packages, the previously-posted
 patch applies w/fuzz but cad/kicad fails configuration as originally
 reported in this PR.
 
 The updated patch below takes the changes to cmake-using packages into
 account and "cad/kicad" builds again (extra "+" at beginning of line to
 prevent leading whitespace from being eaten):
 
 +Index: cad/kicad/options.mk
 +===================================================================
 +RCS file: /cvsroot/pkgsrc/cad/kicad/options.mk,v
 +retrieving revision 1.2
 +diff -u -p -r1.2 options.mk
 +--- cad/kicad/options.mk	25 Aug 2024 06:18:26 -0000	1.2
 ++++ cad/kicad/options.mk	21 Sep 2024 09:06:38 -0000
 +@@ -1,7 +1,7 @@
 + # $NetBSD: options.mk,v 1.2 2024/08/25 06:18:26 wiz Exp $
 + 
 + PKG_OPTIONS_VAR=	PKG_OPTIONS.kicad
 +-PKG_SUPPORTED_OPTIONS=	ng-spice 
 ++PKG_SUPPORTED_OPTIONS=	ng-spice wayland
 + PKG_SUGGESTED_OPTIONS=	ng-spice 
 + 
 + .include "../../mk/bsd.options.mk"
 +@@ -12,3 +12,16 @@ CMAKE_CONFIGURE_ARGS+=		-DKICAD_SPICE=ON
 + .else
 + CMAKE_CONFIGURE_ARGS+=		-DKICAD_SPICE=OFF
 + .endif
 ++
 ++.if !empty(PKG_OPTIONS:Mwayland)
 ++.  include "../../devel/wayland/buildlink3.mk"
 ++CMAKE_CONFIGURE_ARGS+=   -DKICAD_WAYLAND=ON
 ++   # This conditional matches the conditional in Makefile 
 ++   # so that it's effectively a test for whether
 ++   # KICAD_USE_EGL is enabled
 ++.  if empty(MESALIB_SUPPORTS_EGL:Myes)
 ++PKG_FAIL_REASON+= "Kicad requires the KICAD_USE_EGL CMake option when using the KICAD_WAYLAND CMake option. See the cmake_dependent_option() for KICAD_WAYLAND in CMakeLists.txt"
 ++.  endif
 ++.else
 ++CMAKE_CONFIGURE_ARGS+=   -DKICAD_WAYLAND=OFF
 ++.endif
 
 -- 
 |/"\ John D. Baker, KN5UKS               NetBSD     Darwin/MacOS X
 |\ / jdbaker[snail]consolidated[flyspeck]net  OpenBSD            FreeBSD
 | X  No HTML/proprietary data in email.   BSD just sits there and works!
 |/ \ GPGkeyID:  D703 4A7E 479F 63F8 D3F4  BD99 9572 8F23 E4AD 1645