diff options
| author | maya <maya@pkgsrc.org> | 2020-01-19 22:16:18 +0000 |
|---|---|---|
| committer | maya <maya@pkgsrc.org> | 2020-01-19 22:16:18 +0000 |
| commit | 020f70369bc2208c3d8cbcb503b13487915aa4d3 (patch) | |
| tree | 58d848a07a1ed1707055500350d804e8817b0e9a /wm | |
| parent | 745ef101fd299c23f933593dffc432e800640972 (diff) | |
| download | pkgsrc-020f70369bc2208c3d8cbcb503b13487915aa4d3.tar.gz | |
fvwm: make librsvg (rust dependency) optional, but enabled.
Requested by Henrik Johansson in PR pkg/54862.
Diffstat (limited to 'wm')
| -rw-r--r-- | wm/fvwm/Makefile | 4 | ||||
| -rw-r--r-- | wm/fvwm/options.mk | 12 |
2 files changed, 11 insertions, 5 deletions
diff --git a/wm/fvwm/Makefile b/wm/fvwm/Makefile index 2728743c161..038bb85bfe1 100644 --- a/wm/fvwm/Makefile +++ b/wm/fvwm/Makefile @@ -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" diff --git a/wm/fvwm/options.mk b/wm/fvwm/options.mk index 1feeb570403..d792b3082c4 100644 --- a/wm/fvwm/options.mk +++ b/wm/fvwm/options.mk @@ -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 |