Pullup ticket #6683 - requested by wiz

graphics/cairo-gobject: macOS build fix

Revisions pulled up:
- graphics/cairo-gobject/Makefile                               1.41
- graphics/cairo/buildlink3.mk                                  1.62
- graphics/cairo/options.mk                                     1.23

---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Tue Oct  4 07:13:52 UTC 2022

   Modified Files:
   	pkgsrc/graphics/cairo: options.mk

   Log Message:
   cairo: turn off xcb on macOS too by default

   since it implies x11

---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Tue Oct  4 07:14:11 UTC 2022

   Modified Files:
   	pkgsrc/graphics/cairo: buildlink3.mk

   Log Message:
   cairo: make buildlink3 logic for xcb match options.mk

---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Tue Oct  4 07:34:07 UTC 2022

   Modified Files:
   	pkgsrc/graphics/cairo-gobject: Makefile

   Log Message:
   cairo-gobject: fix some pkglint

3 files changed, 9 insertions, 10 deletions

diff --git a/graphics/cairo-gobject/Makefile b/graphics/cairo-gobject/Makefile
index b147e32a9c5..b6413bc0726 100644
--- a/graphics/cairo-gobject/Makefile
+++ b/graphics/cairo-gobject/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2021/12/08 16:02:07 adam Exp $
+# $NetBSD: Makefile,v 1.40.8.1 2022/10/07 18:47:59 bsiegert Exp $
 
 .include "../../graphics/cairo/Makefile.common"
 
@@ -22,10 +22,10 @@ post-install:
 ###
 ### This matches the logic in ../../graphics/cairo/options.mk
 ###
-.if !empty(PKG_BUILD_OPTIONS.cairo:Mx11) || !empty(PKG_BUILD_OPTIONS.cairo:Mxcb)
+.if ${PKG_BUILD_OPTIONS.cairo:Mx11} || ${PKG_BUILD_OPTIONS.cairo:Mxcb}
 CONFIGURE_ARGS+=	--enable-xlib
 CONFIGURE_ARGS+=	--enable-xlib-xrender
-.  if !empty(PKG_BUILD_OPTIONS.cairo:Mxcb)
+.  if ${PKG_BUILD_OPTIONS.cairo:Mxcb}
 CONFIGURE_ARGS+=	--enable-xcb
 .  else
 CONFIGURE_ARGS+=	--disable-xcb
@@ -36,7 +36,7 @@ CONFIGURE_ARGS+=	--disable-xlib-xrender
 CONFIGURE_ARGS+=	--disable-xcb
 .endif
 
-BUILDLINK_ABI_DEPENDS.glib2+=	glib2>=2.14.0
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.14.0
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/cairo/buildlink3.mk b/graphics/cairo/buildlink3.mk
index ba919ffa6f7..cec8221422c 100644
--- a/graphics/cairo/buildlink3.mk
+++ b/graphics/cairo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.61 2020/08/17 20:17:27 leot Exp $
+# $NetBSD: buildlink3.mk,v 1.61.18.1 2022/10/07 18:47:59 bsiegert Exp $
 
 BUILDLINK_TREE+=	cairo
 
@@ -16,11 +16,11 @@ BUILDLINK_API_DEPENDS.Xrender+=	Xrender>=0.8
 pkgbase := cairo
 .include "../../mk/pkg-build-options.mk"
 
-.if !empty(PKG_BUILD_OPTIONS.cairo:Mxcb)
+.if ${PKG_BUILD_OPTIONS.cairo:Mxcb}
 .include "../../x11/libxcb/buildlink3.mk"
 .endif
 
-.if !empty(PKG_BUILD_OPTIONS.cairo:Mx11)
+.if ${PKG_BUILD_OPTIONS.cairo:Mx11} || ${PKG_BUILD_OPTIONS.cairo:Mxcb}
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXrender/buildlink3.mk"
 .endif
diff --git a/graphics/cairo/options.mk b/graphics/cairo/options.mk
index 397735d9533..5f6cc793800 100644
--- a/graphics/cairo/options.mk
+++ b/graphics/cairo/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.22 2022/09/24 07:15:14 wiz Exp $
+# $NetBSD: options.mk,v 1.22.2.1 2022/10/07 18:47:59 bsiegert Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.cairo
 PKG_SUPPORTED_OPTIONS=	x11 xcb
@@ -6,9 +6,8 @@ PKG_SUPPORTED_OPTIONS=	x11 xcb
 PKG_SUPPORTED_OPTIONS+=	quartz
 PKG_SUGGESTED_OPTIONS+=	quartz
 .else
-PKG_SUGGESTED_OPTIONS=	x11
+PKG_SUGGESTED_OPTIONS=	x11 xcb
 .endif
-PKG_SUGGESTED_OPTIONS+=	xcb
 
 .include "../../mk/bsd.options.mk"