Mon Jan 6 05:08:43 2020 UTC ()
gtk3: Do not overwrite suggested options to enable wayland support


(ryoon)
diff -r1.16 -r1.17 pkgsrc/x11/gtk3/options.mk
cvs diff -r1.16 -r1.17 pkgsrc/x11/gtk3/options.mk (expand / switch to unified diff)

--- pkgsrc/x11/gtk3/options.mk 2020/01/05 17:55:22 1.16
+++ pkgsrc/x11/gtk3/options.mk 2020/01/06 05:08:42 1.17
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1# $NetBSD: options.mk,v 1.16 2020/01/05 17:55:22 nia Exp $ 1# $NetBSD: options.mk,v 1.17 2020/01/06 05:08:42 ryoon Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.gtk3 3PKG_OPTIONS_VAR= PKG_OPTIONS.gtk3
4PKG_SUPPORTED_OPTIONS+= gtk3-atk-bridge cups debug 4PKG_SUPPORTED_OPTIONS+= gtk3-atk-bridge cups debug
5PKG_SUPPORTED_OPTIONS+= wayland x11 5PKG_SUPPORTED_OPTIONS+= wayland x11
6.if exists(/System/Library/Frameworks/Quartz.framework) 6.if exists(/System/Library/Frameworks/Quartz.framework)
7PKG_SUPPORTED_OPTIONS+= quartz 7PKG_SUPPORTED_OPTIONS+= quartz
8.endif 8.endif
9.include "../../devel/wayland/platform.mk" 9.include "../../devel/wayland/platform.mk"
10.if ${PLATFORM_SUPPORTS_WAYLAND} == "yes" 10.if ${PLATFORM_SUPPORTS_WAYLAND} == "yes"
11PKG_SUGGESTED_OPTIONS+= wayland 11PKG_SUGGESTED_OPTIONS+= wayland
12.endif 12.endif
13PKG_SUGGESTED_OPTIONS= gtk3-atk-bridge x11 13PKG_SUGGESTED_OPTIONS+= gtk3-atk-bridge x11
14 14
15.include "../../mk/bsd.options.mk" 15.include "../../mk/bsd.options.mk"
16 16
17PLIST_VARS+= cups 17PLIST_VARS+= cups
18.if !empty(PKG_OPTIONS:Mcups) 18.if !empty(PKG_OPTIONS:Mcups)
19BUILDLINK_API_DEPENDS.cups-base+= cups-base>=1.7 19BUILDLINK_API_DEPENDS.cups-base+= cups-base>=1.7
20.include "../../print/cups-base/buildlink3.mk" 20.include "../../print/cups-base/buildlink3.mk"
21PLIST.cups= yes 21PLIST.cups= yes
22.else 22.else
23CONFIGURE_ENV+= ac_cv_path_CUPS_CONFIG=no 23CONFIGURE_ENV+= ac_cv_path_CUPS_CONFIG=no
24.endif 24.endif
25 25
26.if !empty(PKG_OPTIONS:Mdebug) 26.if !empty(PKG_OPTIONS:Mdebug)