CVS commit: pkgsrc/x11/mate-desktop

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Sat Jun  8 19:57:28 UTC 2019

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

Log Message:
mate-desktop: Use graphics/librsvg/tool.mk (instead of including bl3)


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 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.20 pkgsrc/x11/mate-desktop/Makefile:1.21
--- pkgsrc/x11/mate-desktop/Makefile:1.20       Wed Jun  5 01:13:27 2019
+++ pkgsrc/x11/mate-desktop/Makefile    Sat Jun  8 19:57:28 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2019/06/05 01:13:27 gutteridge Exp $
+# $NetBSD: Makefile,v 1.21 2019/06/08 19:57:28 leot Exp $
 
 .include "../../meta-pkgs/mate/Makefile.common"
 
@@ -22,12 +22,7 @@ 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, pending further structural changes.
-BUILDLINK_DEPMETHOD.librsvg?=  build
-.include "../../graphics/librsvg/buildlink3.mk"
+.include "../../graphics/librsvg/tool.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/iso-codes/buildlink3.mk"
 .include "../../devel/dconf/buildlink3.mk"