From 9819981dc72cd849e6754eac8a3034f0caa04006 Mon Sep 17 00:00:00 2001
From: maya <maya@pkgsrc.org>
Date: Tue, 19 May 2020 19:53:14 +0000
Subject: gtk3: depend on just libcups for the cups option, enable cups option

libcups doesn't share any of the objections for cups-base, and builds
fine on darwin.

bump pkgrevision
---
 x11/gtk3/Makefile   | 3 ++-
 x11/gtk3/options.mk | 7 +++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'x11/gtk3')

diff --git a/x11/gtk3/Makefile b/x11/gtk3/Makefile
index a68df2d3077..de0ee89845d 100644
--- a/x11/gtk3/Makefile
+++ b/x11/gtk3/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.146 2020/04/12 20:41:57 wiz Exp $
+# $NetBSD: Makefile,v 1.147 2020/05/19 19:53:14 maya Exp $
 
 DISTNAME=	gtk+-3.24.18
 PKGNAME=	${DISTNAME:S/gtk/gtk3/}
+PKGREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtk+/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/x11/gtk3/options.mk b/x11/gtk3/options.mk
index cb820aa81b9..ff99a5ceb85 100644
--- a/x11/gtk3/options.mk
+++ b/x11/gtk3/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.19 2020/03/05 09:37:30 wiz Exp $
+# $NetBSD: options.mk,v 1.20 2020/05/19 19:53:14 maya Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gtk3
 PKG_SUPPORTED_OPTIONS+=	gtk3-atk-bridge cups debug
@@ -10,14 +10,13 @@ PKG_SUPPORTED_OPTIONS+=	quartz
 .if ${PLATFORM_SUPPORTS_WAYLAND} == "yes"
 PKG_SUGGESTED_OPTIONS+=	wayland
 .endif
-PKG_SUGGESTED_OPTIONS+=	gtk3-atk-bridge x11
+PKG_SUGGESTED_OPTIONS+=	gtk3-atk-bridge x11 cups
 
 .include "../../mk/bsd.options.mk"
 
 PLIST_VARS+=		cups
 .if !empty(PKG_OPTIONS:Mcups)
-BUILDLINK_API_DEPENDS.cups-base+=	cups-base>=1.7
-.include "../../print/cups-base/buildlink3.mk"
+.include "../../print/libcups/buildlink3.mk"
 PLIST.cups=		yes
 .else
 CONFIGURE_ENV+=		ac_cv_path_CUPS_CONFIG=no
-- 
cgit v1.2.3