CVS commit: pkgsrc/wm/fvwm

["Nikita" <nikita%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nikita
Date:           Sat Apr 25 19:40:55 UTC 2020

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

Log Message:
wm/fvwm: Add doc keyword for optionally not generating the fvwm.1 page


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 pkgsrc/wm/fvwm/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/wm/fvwm/PLIST
cvs rdiff -u -r1.6 -r1.7 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.47 pkgsrc/wm/fvwm/Makefile:1.48
--- pkgsrc/wm/fvwm/Makefile:1.47        Sat Apr 25 19:22:15 2020
+++ pkgsrc/wm/fvwm/Makefile     Sat Apr 25 19:40:55 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2020/04/25 19:22:15 nikita Exp $
+# $NetBSD: Makefile,v 1.48 2020/04/25 19:40:55 nikita Exp $
 
 DISTNAME=      fvwm-${FVWM_VER}
 PKGREVISION=   3
@@ -43,11 +43,6 @@ DEPENDS+=                    ${PYPKGPREFIX}-xdg-[0-9]*:..
 CONFIGURE_ENV+=                        PYTHON=${PYTHONBIN}
 CONFIGURE_ENV+=                        ac_cv_path_PYTHON=${PYTHONBIN:Q}
 
-# 2 manpages want xsltproc.
-CONFIGURE_ARGS+=       --enable-mandoc
-BUILD_DEPENDS+=                docbook-xsl-[0-9]*:../../textproc/docbook-xsl
-BUILD_DEPENDS+=                libxslt-[0-9]*:../../textproc/libxslt
-
 .include "options.mk"
 
 BUILDLINK_DEPMETHOD.libXt?=    build

Index: pkgsrc/wm/fvwm/PLIST
diff -u pkgsrc/wm/fvwm/PLIST:1.5 pkgsrc/wm/fvwm/PLIST:1.6
--- pkgsrc/wm/fvwm/PLIST:1.5    Sat Sep 21 13:56:15 2019
+++ pkgsrc/wm/fvwm/PLIST        Sat Apr 25 19:40:55 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2019/09/21 13:56:15 ng0 Exp $
+@comment $NetBSD: PLIST,v 1.6 2020/04/25 19:40:55 nikita Exp $
 @pkgdir share/doc/fvwm2/commands
 @pkgdir share/doc/fvwm2/fvwm
 @pkgdir share/doc/fvwm2/images/svg_rendering
@@ -72,8 +72,8 @@ man/man1/fvwm-menu-headlines.1
 man/man1/fvwm-menu-xlock.1
 man/man1/fvwm-perllib.1
 man/man1/fvwm-root.1
-man/man1/fvwm.1
-man/man1/fvwm2.1
+${PLIST.doc}man/man1/fvwm.1
+${PLIST.doc}man/man1/fvwm2.1
 man/man1/xpmroot.1
 share/fvwm2/ConfigFvwmBacker
 share/fvwm2/ConfigFvwmButtons

Index: pkgsrc/wm/fvwm/options.mk
diff -u pkgsrc/wm/fvwm/options.mk:1.6 pkgsrc/wm/fvwm/options.mk:1.7
--- pkgsrc/wm/fvwm/options.mk:1.6       Sat Apr 25 19:22:15 2020
+++ pkgsrc/wm/fvwm/options.mk   Sat Apr 25 19:40:55 2020
@@ -1,13 +1,14 @@
-# $NetBSD: options.mk,v 1.6 2020/04/25 19:22:15 nikita Exp $
+# $NetBSD: options.mk,v 1.7 2020/04/25 19:40:55 nikita Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.fvwm
 PKG_SUPPORTED_OPTIONS=         gtk xrender xcursor xft2 fribidi debug svg
-PKG_SUGGESTED_OPTIONS+=                svg xft2 xrender xcursor
+PKG_SUPPORTED_OPTIONS+=                doc
+PKG_SUGGESTED_OPTIONS+=                svg xft2 xrender xcursor doc
 PKG_OPTIONS_LEGACY_VARS+=      FVWM2_USE_GTK:gtk
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=           gtk fribidi
+PLIST_VARS+=           gtk fribidi doc
 
 .if !empty(PKG_OPTIONS:Mgtk)
 .  include "../../x11/gtk/buildlink3.mk"
@@ -56,3 +57,13 @@ CONFIGURE_ARGS+=     --disable-debug-msgs
 .else
 CONFIGURE_ARGS+=       --disable-rsvg
 .endif
+
+.if !empty(PKG_OPTIONS:Mdoc)
+# 2 manpages want xsltproc.
+CONFIGURE_ARGS+=       --enable-mandoc
+BUILD_DEPENDS+=                docbook-xsl-[0-9]*:../../textproc/docbook-xsl
+BUILD_DEPENDS+=                libxslt-[0-9]*:../../textproc/libxslt
+PLIST.doc=             yes
+.else
+CONFIGURE_ARGS+=       --disable-mandoc
+.endif