CVS commit: [pkgsrc-2022Q3] pkgsrc/graphics

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Fri Oct  7 18:47:59 UTC 2022

Modified Files:
        pkgsrc/graphics/cairo [pkgsrc-2022Q3]: buildlink3.mk options.mk
        pkgsrc/graphics/cairo-gobject [pkgsrc-2022Q3]: Makefile

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.61.18.1 pkgsrc/graphics/cairo/buildlink3.mk
cvs rdiff -u -r1.22 -r1.22.2.1 pkgsrc/graphics/cairo/options.mk
cvs rdiff -u -r1.40 -r1.40.8.1 pkgsrc/graphics/cairo-gobject/Makefile

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

Modified files:

Index: pkgsrc/graphics/cairo/buildlink3.mk
diff -u pkgsrc/graphics/cairo/buildlink3.mk:1.61 pkgsrc/graphics/cairo/buildlink3.mk:1.61.18.1
--- pkgsrc/graphics/cairo/buildlink3.mk:1.61    Mon Aug 17 20:17:27 2020
+++ pkgsrc/graphics/cairo/buildlink3.mk Fri Oct  7 18:47:59 2022
@@ -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>
 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

Index: pkgsrc/graphics/cairo/options.mk
diff -u pkgsrc/graphics/cairo/options.mk:1.22 pkgsrc/graphics/cairo/options.mk:1.22.2.1
--- pkgsrc/graphics/cairo/options.mk:1.22       Sat Sep 24 07:15:14 2022
+++ pkgsrc/graphics/cairo/options.mk    Fri Oct  7 18:47:59 2022
@@ -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"
 

Index: pkgsrc/graphics/cairo-gobject/Makefile
diff -u pkgsrc/graphics/cairo-gobject/Makefile:1.40 pkgsrc/graphics/cairo-gobject/Makefile:1.40.8.1
--- pkgsrc/graphics/cairo-gobject/Makefile:1.40 Wed Dec  8 16:02:07 2021
+++ pkgsrc/graphics/cairo-gobject/Makefile      Fri Oct  7 18:47:59 2022
@@ -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"