pkgsrc-Users archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

fvwm3 package patch



Hello!

May I suggest an attached patch for fvwm3?

This window manager depends on ruby to generate man pages. Ruby itself
optionally depends on rust.

This patch makes man pages optional for fvwm3

The patch:

diff -ur fvwm3_old/Makefile fvwm3/Makefile
--- fvwm3_old/Makefile 2024-03-21 01:43:43.230812095 +0500
+++ fvwm3/Makefile 2024-03-21 01:35:12.294839931 +0500
@@ -19,7 +19,6 @@
 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,7 +37,6 @@
 # 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
@@ -53,7 +51,6 @@
 .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"
diff -ur fvwm3_old/PLIST fvwm3/PLIST
--- fvwm3_old/PLIST 2024-03-21 01:43:43.231035764 +0500
+++ fvwm3/PLIST 2024-03-21 01:35:12.295070753 +0500
@@ -24,33 +24,33 @@
 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
diff -ur fvwm3_old/options.mk fvwm3/options.mk
--- fvwm3_old/options.mk 2024-03-21 01:43:43.231108901 +0500
+++ fvwm3/options.mk 2024-03-21 01:35:12.295147136 +0500
@@ -1,10 +1,22 @@
 # $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_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"
+.else
+CONFIGURE_ARGS+= --disable-mandoc
+.endif


Home | Main Index | Thread Index | Old Index