CVS commit: pkgsrc/wm/fvwm

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

Module Name:    pkgsrc
Committed By:   maya
Date:           Sun Jan 19 22:16:18 UTC 2020

Modified Files:
        pkgsrc/wm/fvwm: Makefile options.mk

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

Requested by Henrik Johansson in PR pkg/54862.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/wm/fvwm/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/wm/fvwm/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/wm/fvwm/Makefile
diff -u pkgsrc/wm/fvwm/Makefile:1.41 pkgsrc/wm/fvwm/Makefile:1.42
--- pkgsrc/wm/fvwm/Makefile:1.41        Sat Sep 21 13:56:15 2019
+++ pkgsrc/wm/fvwm/Makefile     Sun Jan 19 22:16:18 2020
@@ -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 @@ BUILDLINK_DEPMETHOD.libXt?=   build
 .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"

Index: pkgsrc/wm/fvwm/options.mk
diff -u pkgsrc/wm/fvwm/options.mk:1.3 pkgsrc/wm/fvwm/options.mk:1.4
--- pkgsrc/wm/fvwm/options.mk:1.3       Sat Sep 21 13:56:15 2019
+++ pkgsrc/wm/fvwm/options.mk   Sun Jan 19 22:16:18 2020
@@ -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 @@ CONFIGURE_ARGS+=     --enable-debug-msgs
 .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