CVS commit: pkgsrc/wm

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Nov 10 12:32:51 UTC 2023

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

Log Message:
fvwm: Disable svg by default so this fits into bulk-small.

The included themes only use png and xpm icons.


To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 pkgsrc/wm/fvwm/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/wm/fvwm/options.mk
cvs rdiff -u -r1.24 -r1.25 pkgsrc/wm/fvwm3/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/wm/fvwm3/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.70 pkgsrc/wm/fvwm/Makefile:1.71
--- pkgsrc/wm/fvwm/Makefile:1.70        Wed Nov  8 13:21:14 2023
+++ pkgsrc/wm/fvwm/Makefile     Fri Nov 10 12:32:51 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.70 2023/11/08 13:21:14 wiz Exp $
+# $NetBSD: Makefile,v 1.71 2023/11/10 12:32:51 nia Exp $
 
 DISTNAME=      fvwm-${FVWM_VER}
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    wm x11
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=fvwmorg/}
 GITHUB_RELEASE=        ${FVWM_VER}
@@ -48,7 +48,6 @@ CONFIGURE_ENV+=                       ac_cv_path_PYTHON=${PY
 BUILDLINK_DEPMETHOD.libXt?=    build
 
 .include "../../devel/libstroke/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
@@ -56,4 +55,5 @@ BUILDLINK_DEPMETHOD.libXt?=   build
 .include "../../x11/libXinerama/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/wm/fvwm/options.mk
diff -u pkgsrc/wm/fvwm/options.mk:1.11 pkgsrc/wm/fvwm/options.mk:1.12
--- pkgsrc/wm/fvwm/options.mk:1.11      Wed Jan 18 07:43:16 2023
+++ pkgsrc/wm/fvwm/options.mk   Fri Nov 10 12:32:51 2023
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.11 2023/01/18 07:43:16 vins Exp $
+# $NetBSD: options.mk,v 1.12 2023/11/10 12:32:51 nia Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.fvwm
 PKG_SUPPORTED_OPTIONS=         xrender xcursor xft2 fribidi debug svg
 PKG_SUPPORTED_OPTIONS+=                doc
-PKG_SUGGESTED_OPTIONS+=                svg xft2 xrender xcursor doc
+PKG_SUGGESTED_OPTIONS+=                xft2 xrender xcursor doc
 
 .include "../../mk/bsd.options.mk"
 

Index: pkgsrc/wm/fvwm3/Makefile
diff -u pkgsrc/wm/fvwm3/Makefile:1.24 pkgsrc/wm/fvwm3/Makefile:1.25
--- pkgsrc/wm/fvwm3/Makefile:1.24       Wed Nov  8 13:21:14 2023
+++ pkgsrc/wm/fvwm3/Makefile    Fri Nov 10 12:32:51 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2023/11/08 13:21:14 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2023/11/10 12:32:51 nia Exp $
 
 DISTNAME=      fvwm3-1.0.8
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    wm x11
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=fvwmorg/}
 GITHUB_RELEASE=        ${PKGVERSION_NOREV}

Index: pkgsrc/wm/fvwm3/options.mk
diff -u pkgsrc/wm/fvwm3/options.mk:1.1 pkgsrc/wm/fvwm3/options.mk:1.2
--- pkgsrc/wm/fvwm3/options.mk:1.1      Tue Sep 29 12:22:35 2020
+++ pkgsrc/wm/fvwm3/options.mk  Fri Nov 10 12:32:51 2023
@@ -1,8 +1,7 @@
-# $NetBSD: options.mk,v 1.1 2020/09/29 12:22:35 nia Exp $
+# $NetBSD: options.mk,v 1.2 2023/11/10 12:32:51 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.fvwm3
 PKG_SUPPORTED_OPTIONS= svg
-PKG_SUGGESTED_OPTIONS= svg
 
 .include "../../mk/bsd.options.mk"