[pkgsrc/trunk]: pkgsrc/wm/fvwm fvwm: make librsvg (rust dependency) optional, ...

[maya <maya%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/00f18ba56315
branches:  trunk
changeset: 409723:00f18ba56315
user:      maya <maya%pkgsrc.org@localhost>
date:      Sun Jan 19 22:16:18 2020 +0000

description:
fvwm: make librsvg (rust dependency) optional, but enabled.

Requested by Henrik Johansson in PR pkg/54862.

diffstat:

 wm/fvwm/Makefile   |   4 +---
 wm/fvwm/options.mk |  12 ++++++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diffs (43 lines):

diff -r c1582a907ea4 -r 00f18ba56315 wm/fvwm/Makefile
--- a/wm/fvwm/Makefile  Sun Jan 19 21:42:14 2020 +0000
+++ b/wm/fvwm/Makefile  Sun Jan 19 22:16:18 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2019/09/21 13:56:15 ng0 Exp $
+# $NetBSD: Makefile,v 1.42 2020/01/19 22:16:18 maya Exp $
 
 DISTNAME=      fvwm-${FVWM_VER}
 CATEGORIES=    x11 wm
@@ -51,8 +51,6 @@
 .include "../../devel/libstroke/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../graphics/librsvg/available.mk"
-.include "../../graphics/librsvg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
diff -r c1582a907ea4 -r 00f18ba56315 wm/fvwm/options.mk
--- a/wm/fvwm/options.mk        Sun Jan 19 21:42:14 2020 +0000
+++ b/wm/fvwm/options.mk        Sun Jan 19 22:16:18 2020 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.3 2019/09/21 13:56:15 ng0 Exp $
+# $NetBSD: options.mk,v 1.4 2020/01/19 22:16:18 maya Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.fvwm
-PKG_SUPPORTED_OPTIONS=         gtk rplay xrender xcursor xft2 fribidi debug
+PKG_SUPPORTED_OPTIONS=         gtk rplay xrender xcursor xft2 fribidi debug svg
+PKG_SUGGESTED_OPTIONS+=                svg
 PKG_OPTIONS_LEGACY_VARS+=      FVWM2_USE_GTK:gtk
 PKG_OPTIONS_LEGACY_VARS+=      FVWM2_USE_RPLAY:rplay
 
@@ -55,3 +56,10 @@
 .else
 CONFIGURE_ARGS+=       --disable-debug-msgs
 .endif
+
+.if !empty(PKG_OPTIONS:Msvg)
+.include "../../graphics/librsvg/available.mk"
+.include "../../graphics/librsvg/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-rsvg
+.endif