pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/wm/fvwm wm/fvwm: Add doc keyword for optionally not ge...
details: https://anonhg.NetBSD.org/pkgsrc/rev/0b288cfdef7a
branches: trunk
changeset: 428186:0b288cfdef7a
user: nikita <nikita%pkgsrc.org@localhost>
date: Sat Apr 25 19:40:55 2020 +0000
description:
wm/fvwm: Add doc keyword for optionally not generating the fvwm.1 page
diffstat:
wm/fvwm/Makefile | 7 +------
wm/fvwm/PLIST | 6 +++---
wm/fvwm/options.mk | 17 ++++++++++++++---
3 files changed, 18 insertions(+), 12 deletions(-)
diffs (76 lines):
diff -r 66d3e4af5822 -r 0b288cfdef7a wm/fvwm/Makefile
--- a/wm/fvwm/Makefile Sat Apr 25 19:37:01 2020 +0000
+++ b/wm/fvwm/Makefile Sat Apr 25 19:40:55 2020 +0000
@@ -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 @@
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
diff -r 66d3e4af5822 -r 0b288cfdef7a wm/fvwm/PLIST
--- a/wm/fvwm/PLIST Sat Apr 25 19:37:01 2020 +0000
+++ b/wm/fvwm/PLIST Sat Apr 25 19:40:55 2020 +0000
@@ -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-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
diff -r 66d3e4af5822 -r 0b288cfdef7a wm/fvwm/options.mk
--- a/wm/fvwm/options.mk Sat Apr 25 19:37:01 2020 +0000
+++ b/wm/fvwm/options.mk Sat Apr 25 19:40:55 2020 +0000
@@ -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 @@
.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
Home |
Main Index |
Thread Index |
Old Index