CVS commit: pkgsrc/x11/gtk3

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Tue May 19 19:53:14 UTC 2020

Modified Files:
        pkgsrc/x11/gtk3: Makefile options.mk

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


To generate a diff of this commit:
cvs rdiff -u -r1.146 -r1.147 pkgsrc/x11/gtk3/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/x11/gtk3/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/x11/gtk3/Makefile
diff -u pkgsrc/x11/gtk3/Makefile:1.146 pkgsrc/x11/gtk3/Makefile:1.147
--- pkgsrc/x11/gtk3/Makefile:1.146      Sun Apr 12 20:41:57 2020
+++ pkgsrc/x11/gtk3/Makefile    Tue May 19 19:53:14 2020
@@ -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

Index: pkgsrc/x11/gtk3/options.mk
diff -u pkgsrc/x11/gtk3/options.mk:1.19 pkgsrc/x11/gtk3/options.mk:1.20
--- pkgsrc/x11/gtk3/options.mk:1.19     Thu Mar  5 09:37:30 2020
+++ pkgsrc/x11/gtk3/options.mk  Tue May 19 19:53:14 2020
@@ -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