CVS commit: pkgsrc/wm/fvwm3

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Mar 22 13:54:54 UTC 2024

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

Log Message:
fvwm3: make documentation optional

Option still defaults to on, so no change.

>From Vitaly Shevtsov, to avoid a ruby dependency.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/wm/fvwm3/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/wm/fvwm3/PLIST
cvs rdiff -u -r1.2 -r1.3 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/fvwm3/Makefile
diff -u pkgsrc/wm/fvwm3/Makefile:1.28 pkgsrc/wm/fvwm3/Makefile:1.29
--- pkgsrc/wm/fvwm3/Makefile:1.28       Sun Jan 14 12:54:52 2024
+++ pkgsrc/wm/fvwm3/Makefile    Fri Mar 22 13:54:54 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2024/01/14 12:54:52 vins Exp $
+# $NetBSD: Makefile,v 1.29 2024/03/22 13:54:54 wiz Exp $
 
 DISTNAME=      fvwm3-1.0.9
 CATEGORIES=    wm x11
@@ -19,7 +19,6 @@ USE_TOOLS+=   msgfmt msgmerge xgettext
 USE_TOOLS+=    gmake # needed for manpages installation
 
 DEPENDS+=      ${PYPKGPREFIX}-xdg-[0-9]*:../../devel/py-xdg                            # fvwm-menu-desktop
-TOOL_DEPENDS+= ${RUBY_PKGPREFIX}-asciidoctor-[0-9]*:../../textproc/ruby-asciidoctor    # asciidoctor
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27      # wants python3
 
@@ -38,9 +37,7 @@ SUBST_SED.paths+=     -e "s:/usr/local/share
 # otherwise we get installed scripts that point to the tools directory.
 CONFIGURE_ENV+=        ac_cv_path_PYTHON=${PYTHONBIN}
 CONFIGURE_ENV+=        ac_cv_path_PERL=${PERL5}
-CONFIGURE_ENV+=        ac_cv_prog_ASCIIDOC=${PREFIX}/bin/asciidoctor${RUBY_VER}
 
-CONFIGURE_ARGS+=       --enable-mandoc
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}/fvwm
 CONFIGURE_ARGS+=       --with-iconv-library=${BUILDLINK_PREFIX.iconv}/lib
 CONFIGURE_ARGS+=       --with-iconv-includes=${BUILDLINK_PREFIX.iconv}/${BUILDLINK_INCDIRS.iconv:Q}
@@ -53,7 +50,6 @@ BUILDLINK_API_DEPENDS.libevent+=      libeven
 .include "../../devel/libevent/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../lang/python/pyversion.mk"
-.include "../../lang/ruby/rubyversion.mk"
 .include "../../x11/libXcursor/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/libXi/buildlink3.mk"

Index: pkgsrc/wm/fvwm3/PLIST
diff -u pkgsrc/wm/fvwm3/PLIST:1.6 pkgsrc/wm/fvwm3/PLIST:1.7
--- pkgsrc/wm/fvwm3/PLIST:1.6   Sun Sep 10 10:27:10 2023
+++ pkgsrc/wm/fvwm3/PLIST       Fri Mar 22 13:54:54 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2023/09/10 10:27:10 vins Exp $
+@comment $NetBSD: PLIST,v 1.7 2024/03/22 13:54:54 wiz Exp $
 bin/FvwmCommand
 bin/fvwm-convert-2.6
 bin/fvwm-menu-desktop
@@ -24,33 +24,33 @@ libexec/fvwm3/${PKGVERSION}/FvwmPerl
 libexec/fvwm3/${PKGVERSION}/FvwmRearrange
 libexec/fvwm3/${PKGVERSION}/FvwmScript
 libexec/fvwm3/${PKGVERSION}/FvwmTalk
-man/man1/FvwmAnimate.1
-man/man1/FvwmAuto.1
-man/man1/FvwmBacker.1
-man/man1/FvwmButtons.1
-man/man1/FvwmCommand.1
-man/man1/FvwmConsole.1
-man/man1/FvwmEvent.1
-man/man1/FvwmForm.1
-man/man1/FvwmIconMan.1
-man/man1/FvwmIdent.1
-man/man1/FvwmMFL.1
-man/man1/FvwmPager.1
-man/man1/FvwmPerl.1
-man/man1/FvwmPrompt.1
-man/man1/FvwmRearrange.1
-man/man1/FvwmScript.1
-man/man1/fvwm-convert-2.6.1
-man/man1/fvwm-menu-desktop.1
-man/man1/fvwm-menu-directory.1
-man/man1/fvwm-menu-xlock.1
-man/man1/fvwm-perllib.1
-man/man1/fvwm-root.1
-man/man1/fvwm3.1
-man/man1/fvwm3all.1
-man/man1/fvwm3commands.1
-man/man1/fvwm3menus.1
-man/man1/fvwm3styles.1
+${PLIST.doc}man/man1/FvwmAnimate.1
+${PLIST.doc}man/man1/FvwmAuto.1
+${PLIST.doc}man/man1/FvwmBacker.1
+${PLIST.doc}man/man1/FvwmButtons.1
+${PLIST.doc}man/man1/FvwmCommand.1
+${PLIST.doc}man/man1/FvwmConsole.1
+${PLIST.doc}man/man1/FvwmEvent.1
+${PLIST.doc}man/man1/FvwmForm.1
+${PLIST.doc}man/man1/FvwmIconMan.1
+${PLIST.doc}man/man1/FvwmIdent.1
+${PLIST.doc}man/man1/FvwmMFL.1
+${PLIST.doc}man/man1/FvwmPager.1
+${PLIST.doc}man/man1/FvwmPerl.1
+${PLIST.doc}man/man1/FvwmPrompt.1
+${PLIST.doc}man/man1/FvwmRearrange.1
+${PLIST.doc}man/man1/FvwmScript.1
+${PLIST.doc}man/man1/fvwm-convert-2.6.1
+${PLIST.doc}man/man1/fvwm-menu-desktop.1
+${PLIST.doc}man/man1/fvwm-menu-directory.1
+${PLIST.doc}man/man1/fvwm-menu-xlock.1
+${PLIST.doc}man/man1/fvwm-perllib.1
+${PLIST.doc}man/man1/fvwm-root.1
+${PLIST.doc}man/man1/fvwm3.1
+${PLIST.doc}man/man1/fvwm3all.1
+${PLIST.doc}man/man1/fvwm3commands.1
+${PLIST.doc}man/man1/fvwm3menus.1
+${PLIST.doc}man/man1/fvwm3styles.1
 share/fvwm3/ConfigFvwmBacker
 share/fvwm3/ConfigFvwmButtons
 share/fvwm3/ConfigFvwmDefaults

Index: pkgsrc/wm/fvwm3/options.mk
diff -u pkgsrc/wm/fvwm3/options.mk:1.2 pkgsrc/wm/fvwm3/options.mk:1.3
--- pkgsrc/wm/fvwm3/options.mk:1.2      Fri Nov 10 12:32:51 2023
+++ pkgsrc/wm/fvwm3/options.mk  Fri Mar 22 13:54:54 2024
@@ -1,10 +1,23 @@
-# $NetBSD: options.mk,v 1.2 2023/11/10 12:32:51 nia Exp $
+# $NetBSD: options.mk,v 1.3 2024/03/22 13:54:54 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.fvwm3
-PKG_SUPPORTED_OPTIONS= svg
+PKG_SUPPORTED_OPTIONS= svg doc
+PKG_SUGGESTED_OPTIONS= doc
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=           doc
+
 .if !empty(PKG_OPTIONS:Msvg)
 .  include "../../graphics/librsvg/buildlink3.mk"
 .endif
+
+.if !empty(PKG_OPTIONS:Mdoc)
+CONFIGURE_ARGS+=       --enable-mandoc
+TOOL_DEPENDS+= ${RUBY_PKGPREFIX}-asciidoctor-[0-9]*:../../textproc/ruby-asciidoctor    # asciidoctor
+CONFIGURE_ENV+=        ac_cv_prog_ASCIIDOC=${PREFIX}/bin/asciidoctor${RUBY_VER}
+.  include "../../lang/ruby/rubyversion.mk"
+PLIST.doc=             yes
+.else
+CONFIGURE_ARGS+=       --disable-mandoc
+.endif