CVS commit: pkgsrc/graphics/cairo

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Apr  7 07:31:19 UTC 2024

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

Log Message:
cairo: make lzo optional, keep it default-on

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.160 -r1.161 pkgsrc/graphics/cairo/Makefile
cvs rdiff -u -r1.68 -r1.69 pkgsrc/graphics/cairo/buildlink3.mk
cvs rdiff -u -r1.26 -r1.27 pkgsrc/graphics/cairo/options.mk

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/Makefile
diff -u pkgsrc/graphics/cairo/Makefile:1.160 pkgsrc/graphics/cairo/Makefile:1.161
--- pkgsrc/graphics/cairo/Makefile:1.160        Sun Nov 26 18:45:03 2023
+++ pkgsrc/graphics/cairo/Makefile      Sun Apr  7 07:31:19 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.160 2023/11/26 18:45:03 schmonz Exp $
+# $NetBSD: Makefile,v 1.161 2024/04/07 07:31:19 wiz Exp $
 
 DISTNAME=      cairo-1.18.0
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    graphics
 MASTER_SITES=  https://cairographics.org/releases/
 EXTRACT_SUFX=  .tar.xz
@@ -40,7 +40,6 @@ PLIST.trace=  yes
 
 .include "../../devel/meson/build.mk"
 .include "../../lang/python/tool.mk"
-.include "../../archivers/lzo/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=   glib2>=2.14.0
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"

Index: pkgsrc/graphics/cairo/buildlink3.mk
diff -u pkgsrc/graphics/cairo/buildlink3.mk:1.68 pkgsrc/graphics/cairo/buildlink3.mk:1.69
--- pkgsrc/graphics/cairo/buildlink3.mk:1.68    Sun Nov 26 18:45:03 2023
+++ pkgsrc/graphics/cairo/buildlink3.mk Sun Apr  7 07:31:19 2024
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.68 2023/11/26 18:45:03 schmonz Exp $
+# $NetBSD: buildlink3.mk,v 1.69 2024/04/07 07:31:19 wiz Exp $
 
 BUILDLINK_TREE+=       cairo
 
@@ -14,6 +14,10 @@ BUILDLINK_PKGSRCDIR.cairo=   ../../graphic
 pkgbase := cairo
 .include "../../mk/pkg-build-options.mk"
 
+.if ${PKG_BUILD_OPTIONS.cairo:Mlzo}
+.include "../../archivers/lzo/buildlink3.mk"
+.endif
+
 .if ${PKG_BUILD_OPTIONS.cairo:Mxcb}
 .include "../../x11/libxcb/buildlink3.mk"
 .endif
@@ -23,7 +27,6 @@ pkgbase := cairo
 .include "../../x11/libXrender/buildlink3.mk"
 .endif
 
-.include "../../archivers/lzo/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"

Index: pkgsrc/graphics/cairo/options.mk
diff -u pkgsrc/graphics/cairo/options.mk:1.26 pkgsrc/graphics/cairo/options.mk:1.27
--- pkgsrc/graphics/cairo/options.mk:1.26       Sun Nov 26 18:45:03 2023
+++ pkgsrc/graphics/cairo/options.mk    Sun Apr  7 07:31:19 2024
@@ -1,18 +1,23 @@
-# $NetBSD: options.mk,v 1.26 2023/11/26 18:45:03 schmonz Exp $
+# $NetBSD: options.mk,v 1.27 2024/04/07 07:31:19 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.cairo
-PKG_SUPPORTED_OPTIONS= x11 xcb
+PKG_SUPPORTED_OPTIONS= lzo x11 xcb
 .if exists(/System/Library/Frameworks/Quartz.framework)
 PKG_SUPPORTED_OPTIONS+=        quartz
 PKG_SUGGESTED_OPTIONS+=        quartz
 .else
 PKG_SUGGESTED_OPTIONS= x11 xcb
 .endif
+PKG_SUGGESTED_OPTIONS+=        lzo
 
 .include "../../mk/bsd.options.mk"
 
 PLIST_VARS+=   x11 xcb quartz
 
+.if !empty(PKG_OPTIONS:Mlzo)
+.include "../../archivers/lzo/buildlink3.mk"
+.endif
+
 ###
 ### X11 and XCB support (XCB implies X11)
 ###