CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Tue, 14 Nov 2023 13:58:38 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Nov 14 13:58:37 UTC 2023

Modified Files:
        pkgsrc/devel/p5-Glib-Object-Introspection: Makefile
        pkgsrc/devel/pango: Makefile
        pkgsrc/devel/py-gobject3: Makefile
        pkgsrc/devel/py-gobject32: Makefile
        pkgsrc/doc: CHANGES-2023
        pkgsrc/editors/tp-note: Makefile
        pkgsrc/fonts/gerb: Makefile
        pkgsrc/geography/osm-gps-map: Makefile
        pkgsrc/graphics: Makefile
        pkgsrc/graphics/clutter: Makefile buildlink3.mk
        pkgsrc/graphics/gst-plugins1-cairo: Makefile
        pkgsrc/graphics/librsvg: Makefile buildlink3.mk
        pkgsrc/graphics/librsvg-c: Makefile
        pkgsrc/graphics/oculante: Makefile
        pkgsrc/graphics/p5-cairo-gobject: Makefile buildlink3.mk
        pkgsrc/graphics/ruby-cairo-gobject: Makefile
        pkgsrc/graphics/simp: Makefile
        pkgsrc/ham/gnuradio-core: Makefile.common
        pkgsrc/lang/gjs: Makefile buildlink3.mk
        pkgsrc/math/four-bar-rs: Makefile
        pkgsrc/net/castor: Makefile
        pkgsrc/print/atril: options.mk
        pkgsrc/print/poppler-glib: Makefile
        pkgsrc/security/mate-polkit: options.mk
        pkgsrc/sysutils/caja: options.mk
        pkgsrc/sysutils/ripdrag: Makefile
        pkgsrc/sysutils/szyszka: Makefile
        pkgsrc/wm/awesome: Makefile
        pkgsrc/wm/pekwm: Makefile
        pkgsrc/www/webkit-gtk: Makefile
        pkgsrc/x11/gtk3: Makefile buildlink3.mk
        pkgsrc/x11/gtk4: Makefile buildlink3.mk
        pkgsrc/x11/wired-notify: Makefile
Removed Files:
        pkgsrc/graphics/cairo-gobject: DESCR Makefile PLIST buildlink3.mk

Log Message:
cairo-gobject: remove

Point users at cairo>=1.18.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/devel/p5-Glib-Object-Introspection/Makefile
cvs rdiff -u -r1.257 -r1.258 pkgsrc/devel/pango/Makefile
cvs rdiff -u -r1.48 -r1.49 pkgsrc/devel/py-gobject3/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/py-gobject32/Makefile
cvs rdiff -u -r1.6966 -r1.6967 pkgsrc/doc/CHANGES-2023
cvs rdiff -u -r1.64 -r1.65 pkgsrc/editors/tp-note/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/fonts/gerb/Makefile
cvs rdiff -u -r1.44 -r1.45 pkgsrc/geography/osm-gps-map/Makefile
cvs rdiff -u -r1.1028 -r1.1029 pkgsrc/graphics/Makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/graphics/cairo-gobject/DESCR
cvs rdiff -u -r1.43 -r0 pkgsrc/graphics/cairo-gobject/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/graphics/cairo-gobject/PLIST
cvs rdiff -u -r1.24 -r0 pkgsrc/graphics/cairo-gobject/buildlink3.mk
cvs rdiff -u -r1.73 -r1.74 pkgsrc/graphics/clutter/Makefile
cvs rdiff -u -r1.52 -r1.53 pkgsrc/graphics/clutter/buildlink3.mk
cvs rdiff -u -r1.17 -r1.18 pkgsrc/graphics/gst-plugins1-cairo/Makefile
cvs rdiff -u -r1.156 -r1.157 pkgsrc/graphics/librsvg/Makefile
cvs rdiff -u -r1.76 -r1.77 pkgsrc/graphics/librsvg/buildlink3.mk
cvs rdiff -u -r1.18 -r1.19 pkgsrc/graphics/librsvg-c/Makefile
cvs rdiff -u -r1.59 -r1.60 pkgsrc/graphics/oculante/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/graphics/p5-cairo-gobject/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/graphics/p5-cairo-gobject/buildlink3.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/graphics/ruby-cairo-gobject/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/graphics/simp/Makefile
cvs rdiff -u -r1.50 -r1.51 pkgsrc/ham/gnuradio-core/Makefile.common
cvs rdiff -u -r1.22 -r1.23 pkgsrc/lang/gjs/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/lang/gjs/buildlink3.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/math/four-bar-rs/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/castor/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/print/atril/options.mk
cvs rdiff -u -r1.108 -r1.109 pkgsrc/print/poppler-glib/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/mate-polkit/options.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/caja/options.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/sysutils/ripdrag/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/szyszka/Makefile
cvs rdiff -u -r1.86 -r1.87 pkgsrc/wm/awesome/Makefile
cvs rdiff -u -r1.65 -r1.66 pkgsrc/wm/pekwm/Makefile
cvs rdiff -u -r1.253 -r1.254 pkgsrc/www/webkit-gtk/Makefile
cvs rdiff -u -r1.193 -r1.194 pkgsrc/x11/gtk3/Makefile
cvs rdiff -u -r1.51 -r1.52 pkgsrc/x11/gtk3/buildlink3.mk
cvs rdiff -u -r1.36 -r1.37 pkgsrc/x11/gtk4/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/x11/gtk4/buildlink3.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/wired-notify/Makefile

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

Modified files:

Index: pkgsrc/devel/p5-Glib-Object-Introspection/Makefile
diff -u pkgsrc/devel/p5-Glib-Object-Introspection/Makefile:1.35 pkgsrc/devel/p5-Glib-Object-Introspection/Makefile:1.36
--- pkgsrc/devel/p5-Glib-Object-Introspection/Makefile:1.35     Sun Nov 12 13:21:08 2023
+++ pkgsrc/devel/p5-Glib-Object-Introspection/Makefile  Tue Nov 14 13:58:33 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2023/11/12 13:21:08 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2023/11/14 13:58:33 wiz Exp $
 
 DISTNAME=      Glib-Object-Introspection-0.048
 PKGNAME=       p5-${DISTNAME}
@@ -21,8 +21,9 @@ PERL5_PACKLIST=               auto/Glib/Object/Intros
 
 .include "../../mk/bsd.prefs.mk"
 .if !empty(PKGSRC_RUN_TEST:M[Yy][Ee][Ss])
-BUILDLINK_DEPMETHOD.cairo-gobject=     build
-.include "../../graphics/cairo-gobject/buildlink3.mk"
+BUILDLINK_DEPMETHOD.cairo=     build
+BUILDLINK_ABI_DEPENDS.cairo+=  cairo>=1.18
+.include "../../graphics/cairo/buildlink3.mk"
 .endif
 
 

Index: pkgsrc/devel/pango/Makefile
diff -u pkgsrc/devel/pango/Makefile:1.257 pkgsrc/devel/pango/Makefile:1.258
--- pkgsrc/devel/pango/Makefile:1.257   Sun Nov 12 13:21:09 2023
+++ pkgsrc/devel/pango/Makefile Tue Nov 14 13:58:33 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.257 2023/11/12 13:21:09 wiz Exp $
+# $NetBSD: Makefile,v 1.258 2023/11/14 13:58:33 wiz Exp $
 
 DISTNAME=      pango-1.50.14
 PKGREVISION=   2
@@ -67,9 +67,8 @@ BUILDLINK_API_DEPENDS.harfbuzz+= harfbuz
 .if ${LIBRSVG_TYPE} == "rust"
 .include "../../graphics/graphite2/buildlink3.mk"
 .endif
-BUILDLINK_API_DEPENDS.cairo+=  cairo>=1.12.10
+BUILDLINK_API_DEPENDS.cairo+=   cairo>=1.18
 .include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/cairo-gobject/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../devel/meson/build.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-gobject3/Makefile
diff -u pkgsrc/devel/py-gobject3/Makefile:1.48 pkgsrc/devel/py-gobject3/Makefile:1.49
--- pkgsrc/devel/py-gobject3/Makefile:1.48      Sun Nov 12 13:21:10 2023
+++ pkgsrc/devel/py-gobject3/Makefile   Tue Nov 14 13:58:34 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2023/11/12 13:21:10 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2023/11/14 13:58:34 wiz Exp $
 
 PKGREVISION= 1
 .include "Makefile.common"
@@ -30,6 +30,7 @@ BUILDLINK_API_DEPENDS.gobject-introspect
 # https://bugzilla.gnome.org/show_bug.cgi?id=685094
 # https://bugzilla.gnome.org/show_bug.cgi?id=707196
 .include "../../graphics/py-cairo/buildlink3.mk"
-.include "../../graphics/cairo-gobject/buildlink3.mk"
+BUILDLINK_API_DEPENDS.cairo+=   cairo>=1.18
+.include "../../graphics/cairo/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-gobject32/Makefile
diff -u pkgsrc/devel/py-gobject32/Makefile:1.3 pkgsrc/devel/py-gobject32/Makefile:1.4
--- pkgsrc/devel/py-gobject32/Makefile:1.3      Sun Nov 12 13:21:10 2023
+++ pkgsrc/devel/py-gobject32/Makefile  Tue Nov 14 13:58:34 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2023/11/12 13:21:10 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2023/11/14 13:58:34 wiz Exp $
 
 DISTNAME=      pygobject-3.36.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/^py//:S/-/3-/}
@@ -43,6 +43,7 @@ BUILDLINK_API_DEPENDS.gobject-introspect
 # https://bugzilla.gnome.org/show_bug.cgi?id=685094
 # https://bugzilla.gnome.org/show_bug.cgi?id=707196
 .include "../../graphics/py-cairo/buildlink3.mk"
-.include "../../graphics/cairo-gobject/buildlink3.mk"
+BUILDLINK_API_DEPENDS.cairo+=   cairo>=1.18
+.include "../../graphics/cairo/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/doc/CHANGES-2023
diff -u pkgsrc/doc/CHANGES-2023:1.6966 pkgsrc/doc/CHANGES-2023:1.6967
--- pkgsrc/doc/CHANGES-2023:1.6966      Tue Nov 14 13:48:31 2023
+++ pkgsrc/doc/CHANGES-2023     Tue Nov 14 13:58:34 2023
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2023,v 1.6966 2023/11/14 13:48:31 wiz Exp $
+$NetBSD: CHANGES-2023,v 1.6967 2023/11/14 13:58:34 wiz Exp $
 
 Changes to the packages collection and infrastructure in 2023:
 
@@ -10020,3 +10020,4 @@ Changes to the packages collection and i
        Updated devel/plasma-wayland-protocols to 1.11.0 [wiz 2023-11-14]
        Updated security/duo-unix to 2.0.2 [jperkin 2023-11-14]
        Updated graphics/cairo to 1.18.0 [wiz 2023-11-14]
+       Removed graphics/cairo-gobject successor graphics/cairo [wiz 2023-11-14]

Index: pkgsrc/editors/tp-note/Makefile
diff -u pkgsrc/editors/tp-note/Makefile:1.64 pkgsrc/editors/tp-note/Makefile:1.65
--- pkgsrc/editors/tp-note/Makefile:1.64        Sun Nov 12 13:21:18 2023
+++ pkgsrc/editors/tp-note/Makefile     Tue Nov 14 13:58:34 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2023/11/12 13:21:18 wiz Exp $
+# $NetBSD: Makefile,v 1.65 2023/11/14 13:58:34 wiz Exp $
 
 DISTNAME=      tp-note-1.22.13
 PKGREVISION=   1
@@ -39,8 +39,8 @@ do-install:
 .include "../../lang/python/tool.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.cairo+=  cairo>=1.18
 .include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/cairo-gobject/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../devel/atk/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"

Index: pkgsrc/fonts/gerb/Makefile
diff -u pkgsrc/fonts/gerb/Makefile:1.8 pkgsrc/fonts/gerb/Makefile:1.9
--- pkgsrc/fonts/gerb/Makefile:1.8      Sun Nov 12 13:21:26 2023
+++ pkgsrc/fonts/gerb/Makefile  Tue Nov 14 13:58:34 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2023/11/12 13:21:26 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2023/11/14 13:58:34 wiz Exp $
 
 DISTNAME=      gerb-0.0.1alpha20230427
 PKGREVISION=   4
@@ -30,8 +30,8 @@ do-install:
 .include "../../lang/python/tool.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.cairo+=  cairo>=1.18
 .include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/cairo-gobject/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../devel/atk/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"

Index: pkgsrc/geography/osm-gps-map/Makefile
diff -u pkgsrc/geography/osm-gps-map/Makefile:1.44 pkgsrc/geography/osm-gps-map/Makefile:1.45
--- pkgsrc/geography/osm-gps-map/Makefile:1.44  Sun Nov 12 13:21:48 2023
+++ pkgsrc/geography/osm-gps-map/Makefile       Tue Nov 14 13:58:34 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2023/11/12 13:21:48 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2023/11/14 13:58:34 wiz Exp $
 
 DISTNAME=      osm-gps-map-1.2.0
 PKGREVISION=   11
@@ -19,10 +19,10 @@ PKGCONFIG_OVERRIDE+=        osmgpsmap-1.0.pc.in
 
 .include "../../devel/pango/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"
-.include "../../graphics/cairo-gobject/buildlink3.mk"
 .include "../../devel/atk/buildlink3.mk"
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../net/libsoup/buildlink3.mk"
+BUILDLINK_API_DEPENDS.cairo+=  cairo>=1.18
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"

Index: pkgsrc/graphics/Makefile
diff -u pkgsrc/graphics/Makefile:1.1028 pkgsrc/graphics/Makefile:1.1029
--- pkgsrc/graphics/Makefile:1.1028     Tue Nov 14 01:10:07 2023
+++ pkgsrc/graphics/Makefile    Tue Nov 14 13:58:34 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1028 2023/11/14 01:10:07 wiz Exp $
+# $NetBSD: Makefile,v 1.1029 2023/11/14 13:58:34 wiz Exp $
 #
 
 COMMENT=       Graphics tools and libraries
@@ -69,7 +69,6 @@ SUBDIR+=      blinkentools
 SUBDIR+=       box2d
 SUBDIR+=       breeze-icons
 SUBDIR+=       cairo
-SUBDIR+=       cairo-gobject
 SUBDIR+=       cairomm
 SUBDIR+=       cairomm1.16
 SUBDIR+=       cal3d

Index: pkgsrc/graphics/clutter/Makefile
diff -u pkgsrc/graphics/clutter/Makefile:1.73 pkgsrc/graphics/clutter/Makefile:1.74
--- pkgsrc/graphics/clutter/Makefile:1.73       Sun Nov 12 13:21:52 2023
+++ pkgsrc/graphics/clutter/Makefile    Tue Nov 14 13:58:35 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2023/11/12 13:21:52 wiz Exp $
+# $NetBSD: Makefile,v 1.74 2023/11/14 13:58:35 wiz Exp $
 
 DISTNAME=      clutter-1.26.2
 PKGREVISION=   13
@@ -47,8 +47,8 @@ BUILDLINK_DEPMETHOD.gobject-introspectio
 .include "../../devel/gobject-introspection/buildlink3.mk"
 BUILDLINK_API_DEPENDS.pango+=  pango>=1.30.0
 .include "../../devel/pango/buildlink3.mk"
-BUILDLINK_API_DEPENDS.cairo-gobject+=  cairo-gobject>=1.14.0
-.include "../../graphics/cairo-gobject/buildlink3.mk"
+BUILDLINK_API_DEPENDS.cairo+=  cairo>=1.18
+.include "../../graphics/cairo/buildlink3.mk"
 BUILDLINK_API_DEPENDS.cogl+=   cogl>=1.20.0
 .include "../../graphics/cogl/buildlink3.mk"
 BUILDLINK_API_DEPENDS.json-glib+=      json-glib>=0.12.0

Index: pkgsrc/graphics/clutter/buildlink3.mk
diff -u pkgsrc/graphics/clutter/buildlink3.mk:1.52 pkgsrc/graphics/clutter/buildlink3.mk:1.53
--- pkgsrc/graphics/clutter/buildlink3.mk:1.52  Sun Nov 12 13:21:52 2023
+++ pkgsrc/graphics/clutter/buildlink3.mk       Tue Nov 14 13:58:35 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.52 2023/11/12 13:21:52 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.53 2023/11/14 13:58:35 wiz Exp $
 #
 
 BUILDLINK_TREE+=       clutter
@@ -21,7 +21,7 @@ BUILDLINK_API_DEPENDS.MesaLib+=       MesaLib>
 .include "../../x11/libXcomposite/buildlink3.mk"
 .include "../../x11/libXi/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"
-.include "../../graphics/cairo-gobject/buildlink3.mk"
+.include "../../graphics/cairo/buildlink3.mk"
 .endif
 
 .include "../../devel/atk/buildlink3.mk"

Index: pkgsrc/graphics/gst-plugins1-cairo/Makefile
diff -u pkgsrc/graphics/gst-plugins1-cairo/Makefile:1.17 pkgsrc/graphics/gst-plugins1-cairo/Makefile:1.18
--- pkgsrc/graphics/gst-plugins1-cairo/Makefile:1.17    Sun Nov 12 13:22:01 2023
+++ pkgsrc/graphics/gst-plugins1-cairo/Makefile Tue Nov 14 13:58:35 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2023/11/12 13:22:01 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2023/11/14 13:58:35 wiz Exp $
 
 PKGNAME=       ${DISTNAME:S/plugins/plugins1/:S/-good/-cairo/}
 PKGREVISION=   1
@@ -9,5 +9,6 @@ COMMENT=        Open source multimedia framewor
 GST_PLUGINS+=  cairo
 
 .include "../../multimedia/gst-plugins1-good/Makefile.common"
-.include "../../graphics/cairo-gobject/buildlink3.mk"
+BUILDLINK_API_DEPENDS.cairo+=  cairo>=1.18
+.include "../../graphics/cairo/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/librsvg/Makefile
diff -u pkgsrc/graphics/librsvg/Makefile:1.156 pkgsrc/graphics/librsvg/Makefile:1.157
--- pkgsrc/graphics/librsvg/Makefile:1.156      Sun Nov 12 13:22:07 2023
+++ pkgsrc/graphics/librsvg/Makefile    Tue Nov 14 13:58:35 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.156 2023/11/12 13:22:07 wiz Exp $
+# $NetBSD: Makefile,v 1.157 2023/11/14 13:58:35 wiz Exp $
 
 DISTNAME=      librsvg-2.56.3
 PKGREVISION=   3
@@ -25,7 +25,7 @@ TOOL_DEPENDS+=                ${PYPKGPREFIX}-docutils-
 # Requires gi-docgen to generate HTML format API documentation
 TOOL_DEPENDS+=         ${PYPKGPREFIX}-gi-docgen>=2022.1nb1:../../devel/py-gi-docgen
 
-RUSTFLAGS+=    -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.cairo-gobject}/lib
+RUSTFLAGS+=    -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.cairo}/lib
 
 BUILDLINK_TRANSFORM.SunOS+=    rm:-Wl,--gc-sections
 
@@ -61,9 +61,8 @@ BUILDLINK_API_DEPENDS.glib2+= glib2>=2.5
 BUILDLINK_API_DEPENDS.pango+=  pango>=1.48.11
 .include "../../devel/pango/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
-BUILDLINK_API_DEPENDS.cairo+=  cairo>=1.2.0
+BUILDLINK_API_DEPENDS.cairo+=  cairo>=1.18
 .include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/cairo-gobject/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf2/loaders.mk"
 BUILDLINK_API_DEPENDS.libxml2+=        libxml2>=2.9

Index: pkgsrc/graphics/librsvg/buildlink3.mk
diff -u pkgsrc/graphics/librsvg/buildlink3.mk:1.76 pkgsrc/graphics/librsvg/buildlink3.mk:1.77
--- pkgsrc/graphics/librsvg/buildlink3.mk:1.76  Sun Nov 12 13:22:07 2023
+++ pkgsrc/graphics/librsvg/buildlink3.mk       Tue Nov 14 13:58:35 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.76 2023/11/12 13:22:07 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.77 2023/11/14 13:58:35 wiz Exp $
 
 BUILDLINK_TREE+=       librsvg
 
@@ -26,7 +26,6 @@ PKG_FAIL_REASON+=     "[graphics/librsvg/bui
 
 .include "../../devel/pango/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/cairo-gobject/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"
 .endif # LIBRSVG_BUILDLINK3_MK
 

Index: pkgsrc/graphics/librsvg-c/Makefile
diff -u pkgsrc/graphics/librsvg-c/Makefile:1.18 pkgsrc/graphics/librsvg-c/Makefile:1.19
--- pkgsrc/graphics/librsvg-c/Makefile:1.18     Sun Nov 12 13:22:07 2023
+++ pkgsrc/graphics/librsvg-c/Makefile  Tue Nov 14 13:58:35 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2023/11/12 13:22:07 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2023/11/14 13:58:35 wiz Exp $
 
 DISTNAME=      librsvg-2.40.21
 PKGREVISION=   15
@@ -47,10 +47,8 @@ BUILDLINK_API_DEPENDS.glib2+=        glib2>=2.2
 BUILDLINK_API_DEPENDS.pango+=  pango>=1.38
 .include "../../devel/pango/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
-BUILDLINK_API_DEPENDS.cairo+=  cairo>=1.2.0
+BUILDLINK_API_DEPENDS.cairo+=  cairo>=1.18
 .include "../../graphics/cairo/buildlink3.mk"
-BUILDLINK_DEPMETHOD.cairo-gobject+=    build
-.include "../../graphics/cairo-gobject/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf2/loaders.mk"
 BUILDLINK_API_DEPENDS.libcroco+=       libcroco>=0.6.1

Index: pkgsrc/graphics/oculante/Makefile
diff -u pkgsrc/graphics/oculante/Makefile:1.59 pkgsrc/graphics/oculante/Makefile:1.60
--- pkgsrc/graphics/oculante/Makefile:1.59      Sun Nov 12 13:22:10 2023
+++ pkgsrc/graphics/oculante/Makefile   Tue Nov 14 13:58:35 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2023/11/12 13:22:10 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2023/11/14 13:58:35 wiz Exp $
 
 DISTNAME=      oculante-0.7.7
 PKGREVISION=   2
@@ -43,8 +43,8 @@ DEPENDS+=     nasm-[0-9]*:../../devel/nasm
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.cairo+=  cairo>=1.18
 .include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/cairo-gobject/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../devel/atk/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"

Index: pkgsrc/graphics/p5-cairo-gobject/Makefile
diff -u pkgsrc/graphics/p5-cairo-gobject/Makefile:1.24 pkgsrc/graphics/p5-cairo-gobject/Makefile:1.25
--- pkgsrc/graphics/p5-cairo-gobject/Makefile:1.24      Sun Nov 12 13:22:11 2023
+++ pkgsrc/graphics/p5-cairo-gobject/Makefile   Tue Nov 14 13:58:35 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2023/11/12 13:22:11 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2023/11/14 13:58:35 wiz Exp $
 
 DISTNAME=      Cairo-GObject-1.005
 PKGNAME=       p5-${DISTNAME:tl}
@@ -22,6 +22,7 @@ BUILDLINK_API_DEPENDS.p5-glib2+=      p5-glib
 .include "../../devel/p5-glib2/buildlink3.mk"
 BUILDLINK_API_DEPENDS.p5-cairo+=       p5-cairo>=1.080
 .include "../../graphics/p5-cairo/buildlink3.mk"
-.include "../../graphics/cairo-gobject/buildlink3.mk"
+BUILDLINK_API_DEPENDS.cairo+=  cairo>=1.18
+.include "../../graphics/cairo/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/p5-cairo-gobject/buildlink3.mk
diff -u pkgsrc/graphics/p5-cairo-gobject/buildlink3.mk:1.5 pkgsrc/graphics/p5-cairo-gobject/buildlink3.mk:1.6
--- pkgsrc/graphics/p5-cairo-gobject/buildlink3.mk:1.5  Sun Nov 12 13:22:11 2023
+++ pkgsrc/graphics/p5-cairo-gobject/buildlink3.mk      Tue Nov 14 13:58:35 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2023/11/12 13:22:11 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2023/11/14 13:58:35 wiz Exp $
 
 BUILDLINK_TREE+=       p5-cairo-gobject
 
@@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.p5-cairo-gobject+=
 BUILDLINK_ABI_DEPENDS.p5-cairo-gobject?=       p5-cairo-gobject>=1.005nb6
 BUILDLINK_PKGSRCDIR.p5-cairo-gobject?= ../../graphics/p5-cairo-gobject
 
-.include "../../graphics/cairo-gobject/buildlink3.mk"
+.include "../../graphics/cairo/buildlink3.mk"
 .endif # P5_CAIRO_GOBJECT_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -p5-cairo-gobject

Index: pkgsrc/graphics/ruby-cairo-gobject/Makefile
diff -u pkgsrc/graphics/ruby-cairo-gobject/Makefile:1.10 pkgsrc/graphics/ruby-cairo-gobject/Makefile:1.11
--- pkgsrc/graphics/ruby-cairo-gobject/Makefile:1.10    Sun Nov 12 13:22:16 2023
+++ pkgsrc/graphics/ruby-cairo-gobject/Makefile Tue Nov 14 13:58:35 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2023/11/12 13:22:16 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2023/11/14 13:58:35 wiz Exp $
 #
 
 DISTNAME=              cairo-gobject-${VERSION}
@@ -16,7 +16,8 @@ DEPENDS+=             ${RUBY_PKGPREFIX}-cairo>=1.16
 
 .include "../../devel/ruby-glib2/buildlink3.mk"
 .include "../../graphics/ruby-cairo/buildlink3.mk"
-.include "../../graphics/cairo-gobject/buildlink3.mk"
+BUILDLINK_API_DEPENDS.cairo+=  cairo>=1.18
+.include "../../graphics/cairo/buildlink3.mk"
 .include "../../meta-pkgs/ruby-gnome/Makefile.common"
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/simp/Makefile
diff -u pkgsrc/graphics/simp/Makefile:1.13 pkgsrc/graphics/simp/Makefile:1.14
--- pkgsrc/graphics/simp/Makefile:1.13  Sun Nov 12 13:22:18 2023
+++ pkgsrc/graphics/simp/Makefile       Tue Nov 14 13:58:35 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2023/11/12 13:22:18 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2023/11/14 13:58:35 wiz Exp $
 
 DISTNAME=      simp-3.4.1
 PKGREVISION=    3
@@ -24,8 +24,8 @@ RUSTFLAGS+=   -C link-arg=-L${BUILDLINK_PR
 .include "../../lang/rust/cargo.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.cairo+=  cairo>=1.18
 .include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/cairo-gobject/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../devel/atk/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"

Index: pkgsrc/ham/gnuradio-core/Makefile.common
diff -u pkgsrc/ham/gnuradio-core/Makefile.common:1.50 pkgsrc/ham/gnuradio-core/Makefile.common:1.51
--- pkgsrc/ham/gnuradio-core/Makefile.common:1.50       Thu Aug 24 03:17:42 2023
+++ pkgsrc/ham/gnuradio-core/Makefile.common    Tue Nov 14 13:58:35 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.50 2023/08/24 03:17:42 mef Exp $
+# $NetBSD: Makefile.common,v 1.51 2023/11/14 13:58:35 wiz Exp $
 # This Makefile fragment is included in the package Makefiles for
 # GNU Radio distributed packages (they all share common configure and build
 # settings).
@@ -155,8 +155,8 @@ do-install:
 .include "../../devel/spdlog/buildlink3.mk"
 BUILDLINK_API_DEPENDS.py-pybind11+=    ${PYPKGPREFIX}-pybind11>=2.6.0
 .include "../../devel/py-pybind11/buildlink3.mk"
+BUILDLINK_API_DEPENDS.cairo+=  cairo>=1.18
 .include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/cairo-gobject/buildlink3.mk"
 # FIXME should be optional
 .include "../../lang/libunwind/buildlink3.mk"
 .include "../../lang/python/application.mk"

Index: pkgsrc/lang/gjs/Makefile
diff -u pkgsrc/lang/gjs/Makefile:1.22 pkgsrc/lang/gjs/Makefile:1.23
--- pkgsrc/lang/gjs/Makefile:1.22       Sun Nov 12 13:22:31 2023
+++ pkgsrc/lang/gjs/Makefile    Tue Nov 14 13:58:36 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2023/11/12 13:22:31 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2023/11/14 13:58:36 wiz Exp $
 
 DISTNAME=      gjs-1.68.4
 PKGREVISION=   10
@@ -29,7 +29,8 @@ CHECK_PORTABILITY_SKIP+=      tools/run_iwyu.
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../devel/libffi/buildlink3.mk"
-.include "../../graphics/cairo-gobject/buildlink3.mk"
+BUILDLINK_API_DEPENDS.cairo+=  cairo>=1.18
+.include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"
 .include "../../lang/mozjs78/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"

Index: pkgsrc/lang/gjs/buildlink3.mk
diff -u pkgsrc/lang/gjs/buildlink3.mk:1.14 pkgsrc/lang/gjs/buildlink3.mk:1.15
--- pkgsrc/lang/gjs/buildlink3.mk:1.14  Sun Nov 12 13:22:31 2023
+++ pkgsrc/lang/gjs/buildlink3.mk       Tue Nov 14 13:58:36 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2023/11/12 13:22:31 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2023/11/14 13:58:36 wiz Exp $
 
 BUILDLINK_TREE+=       gjs
 
@@ -11,7 +11,7 @@ BUILDLINK_PKGSRCDIR.gjs?=     ../../lang/gjs
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/gobject-introspection/buildlink3.mk"
-.include "../../graphics/cairo-gobject/buildlink3.mk"
+.include "../../graphics/cairo/buildlink3.mk"
 .include "../../lang/mozjs78/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .endif # GJS_BUILDLINK3_MK

Index: pkgsrc/math/four-bar-rs/Makefile
diff -u pkgsrc/math/four-bar-rs/Makefile:1.6 pkgsrc/math/four-bar-rs/Makefile:1.7
--- pkgsrc/math/four-bar-rs/Makefile:1.6        Sun Nov 12 13:22:38 2023
+++ pkgsrc/math/four-bar-rs/Makefile    Tue Nov 14 13:58:36 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2023/11/12 13:22:38 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2023/11/14 13:58:36 wiz Exp $
 
 DISTNAME=      four-bar-rs-5.1.0
 PKGREVISION=   2
@@ -29,8 +29,8 @@ do-install:
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.cairo+=  cairo>=1.18
 .include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/cairo-gobject/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../devel/atk/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"

Index: pkgsrc/net/castor/Makefile
diff -u pkgsrc/net/castor/Makefile:1.10 pkgsrc/net/castor/Makefile:1.11
--- pkgsrc/net/castor/Makefile:1.10     Sun Nov 12 13:23:05 2023
+++ pkgsrc/net/castor/Makefile  Tue Nov 14 13:58:36 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2023/11/12 13:23:05 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2023/11/14 13:58:36 wiz Exp $
 
 DISTNAME=      0.9.0
 PKGNAME=       castor-0.9.0
@@ -38,8 +38,8 @@ do-install:
 .include "../../security/openssl/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.cairo+=  cairo>=1.18
 .include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/cairo-gobject/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../devel/atk/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"

Index: pkgsrc/print/atril/options.mk
diff -u pkgsrc/print/atril/options.mk:1.4 pkgsrc/print/atril/options.mk:1.5
--- pkgsrc/print/atril/options.mk:1.4   Mon Oct 28 21:49:22 2019
+++ pkgsrc/print/atril/options.mk       Tue Nov 14 13:58:36 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2019/10/28 21:49:22 maya Exp $
+# $NetBSD: options.mk,v 1.5 2023/11/14 13:58:36 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.atril
 PKG_SUPPORTED_OPTIONS= dbus pdf ps xps dvi djvu tiff gdk-pixbuf keyring introspection
@@ -85,7 +85,8 @@ CONFIGURE_ARGS+=      --without-keyring
 .if !empty(PKG_OPTIONS:Mintrospection)
 BUILDLINK_DEPMETHOD.gobject-introspection+=    build
 .include "../../devel/gobject-introspection/buildlink3.mk"
-.include "../../graphics/cairo-gobject/buildlink3.mk"
+BUILDLINK_API_DEPENDS.cairo+=  cairo>=1.18
+.include "../../graphics/cairo/buildlink3.mk"
 CONFIGURE_ARGS+=       --enable-introspection
 PLIST.introspection=   yes
 .else

Index: pkgsrc/print/poppler-glib/Makefile
diff -u pkgsrc/print/poppler-glib/Makefile:1.108 pkgsrc/print/poppler-glib/Makefile:1.109
--- pkgsrc/print/poppler-glib/Makefile:1.108    Sun Nov 12 13:23:20 2023
+++ pkgsrc/print/poppler-glib/Makefile  Tue Nov 14 13:58:36 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.108 2023/11/12 13:23:20 wiz Exp $
+# $NetBSD: Makefile,v 1.109 2023/11/14 13:58:36 wiz Exp $
 
 PKGREVISION= 3
 .include "../../print/poppler/Makefile.common"
@@ -55,7 +55,8 @@ BUILDLINK_API_DEPENDS.glib2+= glib2>=2.4
 .include "../../devel/glib2/buildlink3.mk"
 BUILDLINK_DEPMETHOD.gobject-introspection=     build
 .include "../../devel/gobject-introspection/buildlink3.mk"
-.include "../../graphics/cairo-gobject/buildlink3.mk"
+BUILDLINK_API_DEPENDS.cairo+=  cairo>=1.18
+.include "../../graphics/cairo/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../lang/python/tool.mk"

Index: pkgsrc/security/mate-polkit/options.mk
diff -u pkgsrc/security/mate-polkit/options.mk:1.3 pkgsrc/security/mate-polkit/options.mk:1.4
--- pkgsrc/security/mate-polkit/options.mk:1.3  Sun May 31 15:47:40 2020
+++ pkgsrc/security/mate-polkit/options.mk      Tue Nov 14 13:58:36 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2020/05/31 15:47:40 rillig Exp $
+# $NetBSD: options.mk,v 1.4 2023/11/14 13:58:36 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.mate-polkit
 PKG_SUPPORTED_OPTIONS= introspection
@@ -9,5 +9,6 @@ PKG_SUGGESTED_OPTIONS=  # none
 .if !empty(PKG_OPTIONS:Mintrospection)
 BUILDLINK_DEPMETHOD.gobject-introspection+=    build
 .include "../../devel/gobject-introspection/buildlink3.mk"
-.include "../../graphics/cairo-gobject/buildlink3.mk"
+BUILDLINK_API_DEPENDS.cairo+=  cairo>=1.18
+.include "../../graphics/cairo/buildlink3.mk"
 .endif

Index: pkgsrc/sysutils/caja/options.mk
diff -u pkgsrc/sysutils/caja/options.mk:1.3 pkgsrc/sysutils/caja/options.mk:1.4
--- pkgsrc/sysutils/caja/options.mk:1.3 Wed Nov  1 01:05:54 2023
+++ pkgsrc/sysutils/caja/options.mk     Tue Nov 14 13:58:36 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2023/11/01 01:05:54 gutteridge Exp $
+# $NetBSD: options.mk,v 1.4 2023/11/14 13:58:36 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.caja
 PKG_SUPPORTED_OPTIONS= introspection
@@ -11,7 +11,8 @@ PLIST_SRC+=   PLIST
 .if !empty(PKG_OPTIONS:Mintrospection)
 BUILDLINK_DEPMETHOD.gobject-introspection+=    build
 .include "../../devel/gobject-introspection/buildlink3.mk"
-.include "../../graphics/cairo-gobject/buildlink3.mk"
+BUILDLINK_API_DEPENDS.cairo+=  cairo>=1.18
+.include "../../graphics/cairo/buildlink3.mk"
 CONFIGURE_ARGS+=       --enable-introspection
 PLIST_SRC+=    PLIST.introspection
 .else

Index: pkgsrc/sysutils/ripdrag/Makefile
diff -u pkgsrc/sysutils/ripdrag/Makefile:1.12 pkgsrc/sysutils/ripdrag/Makefile:1.13
--- pkgsrc/sysutils/ripdrag/Makefile:1.12       Sun Nov 12 13:23:36 2023
+++ pkgsrc/sysutils/ripdrag/Makefile    Tue Nov 14 13:58:36 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2023/11/12 13:23:36 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2023/11/14 13:58:36 wiz Exp $
 
 DISTNAME=      ripdrag-0.4.4
 PKGREVISION=   2
@@ -21,8 +21,8 @@ RUSTFLAGS+=   -C link-arg=${COMPILER_RPATH
 .include "../../lang/rust/cargo.mk"
 .include "../../x11/gtk4/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.cairo+=  cairo>=1.18
 .include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/cairo-gobject/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../devel/atk/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"

Index: pkgsrc/sysutils/szyszka/Makefile
diff -u pkgsrc/sysutils/szyszka/Makefile:1.6 pkgsrc/sysutils/szyszka/Makefile:1.7
--- pkgsrc/sysutils/szyszka/Makefile:1.6        Sun Nov 12 13:23:37 2023
+++ pkgsrc/sysutils/szyszka/Makefile    Tue Nov 14 13:58:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2023/11/12 13:23:37 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2023/11/14 13:58:37 wiz Exp $
 
 DISTNAME=      szyszka-3.0.0
 PKGREVISION=   4
@@ -46,8 +46,8 @@ do-install:
 .include "../../lang/rust/cargo.mk"
 .include "../../x11/gtk4/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.cairo+=  cairo>=1.18
 .include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/cairo-gobject/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../devel/atk/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"

Index: pkgsrc/wm/awesome/Makefile
diff -u pkgsrc/wm/awesome/Makefile:1.86 pkgsrc/wm/awesome/Makefile:1.87
--- pkgsrc/wm/awesome/Makefile:1.86     Sun Nov 12 13:23:46 2023
+++ pkgsrc/wm/awesome/Makefile  Tue Nov 14 13:58:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.86 2023/11/12 13:23:46 wiz Exp $
+# $NetBSD: Makefile,v 1.87 2023/11/14 13:58:37 wiz Exp $
 
 DISTNAME=      awesome-4.3
 PKGREVISION=   13
@@ -58,8 +58,8 @@ pre-configure:
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
+BUILDLINK_API_DEPENDS.cairo+=  cairo>=1.18
 .include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/cairo-gobject/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"
 .include "../../lang/lua/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"

Index: pkgsrc/wm/pekwm/Makefile
diff -u pkgsrc/wm/pekwm/Makefile:1.65 pkgsrc/wm/pekwm/Makefile:1.66
--- pkgsrc/wm/pekwm/Makefile:1.65       Sun Nov 12 13:23:50 2023
+++ pkgsrc/wm/pekwm/Makefile    Tue Nov 14 13:58:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2023/11/12 13:23:50 wiz Exp $
+# $NetBSD: Makefile,v 1.66 2023/11/14 13:58:37 wiz Exp $
 
 DISTNAME=      pekwm-0.3.0
 PKGREVISION=   1
@@ -29,8 +29,8 @@ CMAKE_ARG_PATH=       ${WRKSRC}
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.cairo+=  cairo>=1.18
 .include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/cairo-gobject/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../devel/cmake/build.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/webkit-gtk/Makefile
diff -u pkgsrc/www/webkit-gtk/Makefile:1.253 pkgsrc/www/webkit-gtk/Makefile:1.254
--- pkgsrc/www/webkit-gtk/Makefile:1.253        Sun Nov 12 13:23:58 2023
+++ pkgsrc/www/webkit-gtk/Makefile      Tue Nov 14 13:58:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.253 2023/11/12 13:23:58 wiz Exp $
+# $NetBSD: Makefile,v 1.254 2023/11/14 13:58:37 wiz Exp $
 
 DISTNAME=      webkitgtk-2.36.8
 PKGNAME=       ${DISTNAME:S/webkitgtk/webkit-gtk/}
@@ -149,7 +149,8 @@ BUILDLINK_DEPMETHOD.gobject-introspectio
 .include "../../devel/pango/buildlink3.mk"
 .include "../../fonts/harfbuzz-icu/buildlink3.mk"
 .include "../../fonts/woff2/buildlink3.mk"
-.include "../../graphics/cairo-gobject/buildlink3.mk"
+BUILDLINK_API_DEPENDS.cairo+=  cairo>=1.18
+.include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/libwebp/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"

Index: pkgsrc/x11/gtk3/Makefile
diff -u pkgsrc/x11/gtk3/Makefile:1.193 pkgsrc/x11/gtk3/Makefile:1.194
--- pkgsrc/x11/gtk3/Makefile:1.193      Sun Nov 12 13:24:06 2023
+++ pkgsrc/x11/gtk3/Makefile    Tue Nov 14 13:58:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.193 2023/11/12 13:24:06 wiz Exp $
+# $NetBSD: Makefile,v 1.194 2023/11/14 13:58:37 wiz Exp $
 
 DISTNAME=      gtk+-3.24.38
 PKGNAME=       ${DISTNAME:S/gtk/gtk3/}
@@ -72,7 +72,6 @@ BUILDLINK_API_DEPENDS.glib2+= glib2>=2.5
 .include "../../devel/glib2/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gdk-pixbuf2+=    gdk-pixbuf2>=2.30.0
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"
-BUILDLINK_DEPMETHOD.gobject-introspection:=    build
 BUILDLINK_API_DEPENDS.gobject-introspection+=  gobject-introspection>=1.39.0
 .include "../../devel/gobject-introspection/buildlink3.mk"
 
@@ -84,9 +83,8 @@ BUILDLINK_API_DEPENDS.pango+= pango>=1.4
 .include "../../devel/pango/buildlink3.mk"
 BUILDLINK_API_DEPENDS.fontconfig+=     fontconfig>=2.11.91
 .include "../../fonts/fontconfig/buildlink3.mk"
-BUILDLINK_API_DEPENDS.cairo+=  cairo>=1.14.0
+BUILDLINK_API_DEPENDS.cairo+=  cairo>=1.18
 .include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/cairo-gobject/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libepoxy+=       libepoxy>=1.4
 .include "../../graphics/libepoxy/buildlink3.mk"

Index: pkgsrc/x11/gtk3/buildlink3.mk
diff -u pkgsrc/x11/gtk3/buildlink3.mk:1.51 pkgsrc/x11/gtk3/buildlink3.mk:1.52
--- pkgsrc/x11/gtk3/buildlink3.mk:1.51  Sun Nov 12 13:24:06 2023
+++ pkgsrc/x11/gtk3/buildlink3.mk       Tue Nov 14 13:58:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.51 2023/11/12 13:24:06 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.52 2023/11/14 13:58:37 wiz Exp $
 
 BUILDLINK_TREE+=       gtk3
 
@@ -20,7 +20,6 @@ pkgbase := gtk3
 .include "../../devel/pango/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/cairo-gobject/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libepoxy+=       libepoxy>=1.4

Index: pkgsrc/x11/gtk4/Makefile
diff -u pkgsrc/x11/gtk4/Makefile:1.36 pkgsrc/x11/gtk4/Makefile:1.37
--- pkgsrc/x11/gtk4/Makefile:1.36       Sun Nov 12 13:24:06 2023
+++ pkgsrc/x11/gtk4/Makefile    Tue Nov 14 13:58:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2023/11/12 13:24:06 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2023/11/14 13:58:37 wiz Exp $
 
 DISTNAME=      gtk-4.12.3
 PKGNAME=       ${DISTNAME:S/gtk/gtk4/}
@@ -56,8 +56,8 @@ PRINT_PLIST_AWK+=     { gsub(/\.${SOEXT}/, "
 .include "../../devel/libexecinfo/buildlink3.mk"
 BUILDLINK_API_DEPENDS.pango+=  pango>=1.47.0
 .include "../../devel/pango/buildlink3.mk"
+BUILDLINK_API_DEPENDS.cairo+=  cairo>=1.18
 .include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/cairo-gobject/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"
 .include "../../graphics/graphene/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"

Index: pkgsrc/x11/gtk4/buildlink3.mk
diff -u pkgsrc/x11/gtk4/buildlink3.mk:1.10 pkgsrc/x11/gtk4/buildlink3.mk:1.11
--- pkgsrc/x11/gtk4/buildlink3.mk:1.10  Sun Nov 12 13:24:06 2023
+++ pkgsrc/x11/gtk4/buildlink3.mk       Tue Nov 14 13:58:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2023/11/12 13:24:06 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2023/11/14 13:58:37 wiz Exp $
 
 BUILDLINK_TREE+=       gtk4
 
@@ -12,7 +12,6 @@ BUILDLINK_PKGSRCDIR.gtk4?=    ../../x11/gtk
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/cairo-gobject/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"
 .include "../../graphics/graphene/buildlink3.mk"
 .include "../../graphics/libepoxy/buildlink3.mk"

Index: pkgsrc/x11/wired-notify/Makefile
diff -u pkgsrc/x11/wired-notify/Makefile:1.8 pkgsrc/x11/wired-notify/Makefile:1.9
--- pkgsrc/x11/wired-notify/Makefile:1.8        Sun Nov 12 13:24:32 2023
+++ pkgsrc/x11/wired-notify/Makefile    Tue Nov 14 13:58:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2023/11/12 13:24:32 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2023/11/14 13:58:37 wiz Exp $
 
 DISTNAME=      wired-notify-0.10.2
 PKGREVISION=   3
@@ -29,8 +29,8 @@ post-install:
 .include "../../lang/rust/cargo.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
+BUILDLINK_API_DEPENDS.cairo+=  cairo>=1.18
 .include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/cairo-gobject/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../x11/libXScrnSaver/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"

Prev by Date: CVS commit: pkgsrc/net/mosh
Next by Date: CVS commit: pkgsrc
Previous by Thread: CVS commit: pkgsrc/net/mosh
Next by Thread: CVS commit: pkgsrc
Indexes:

Home | Main Index | Thread Index | Old Index