CVS commit: pkgsrc/x11/mate-desktop

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Thu May 30 04:10:35 UTC 2019

Modified Files:
        pkgsrc/x11/mate-desktop: Makefile

Log Message:
mate-desktop: change how the librsvg tool dependency is defined

Now that librsvg is a "split" package, where it can actually end up
being either librsvg or librsvg-c, we can't use TOOL_DEPENDS to safely
express it's a tool dependency. We need to include the buildlink file
in librsvg.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/x11/mate-desktop/Makefile

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

Modified files:

Index: pkgsrc/x11/mate-desktop/Makefile
diff -u pkgsrc/x11/mate-desktop/Makefile:1.18 pkgsrc/x11/mate-desktop/Makefile:1.19
--- pkgsrc/x11/mate-desktop/Makefile:1.18       Mon May 13 02:07:42 2019
+++ pkgsrc/x11/mate-desktop/Makefile    Thu May 30 04:10:35 2019
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.18 2019/05/13 02:07:42 gutteridge Exp $
+# $NetBSD: Makefile,v 1.19 2019/05/30 04:10:35 gutteridge Exp $
 
 .include "../../meta-pkgs/mate/Makefile.common"
 
-PKGREVISION=   1
+PKGREVISION=   2
 DISTNAME=      mate-desktop-${VERSION:R}.1
 CATEGORIES=    x11
 
 COMMENT=       MATE desktop library
 
 TOOL_DEPENDS+=         itstool-[0-9]*:../../textproc/itstool
-TOOL_DEPENDS+=         librsvg-[0-9]*:../../graphics/librsvg # for rsvg-convert
 TOOL_DEPENDS+=         libxml2-[0-9]*:../../textproc/libxml2 # for xmllint
 
 PKGCONFIG_OVERRIDE+=   libmate-desktop/mate-desktop-2.0.pc.in
@@ -23,6 +22,12 @@ SUBST_STAGE.prefix=  pre-install
 SUBST_SED.prefix=      -e 's,$${prefix},${PREFIX},'
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+# librsvg is required as a tool dependency, to provide rsvg-convert.
+# Since it's now a "split" package, where a choice depends on the
+# environment, or on a user-defined option, the dependency must be
+# expressed this way.
+BUILDLINK_DEPMETHOD.librsvg?=  build
+.include "../../graphics/librsvg/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/iso-codes/buildlink3.mk"
 .include "../../devel/dconf/buildlink3.mk"