CVS commit: pkgsrc/wm/fvwm3

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Fri Dec  6 22:24:09 UTC 2024

Modified Files:
        pkgsrc/wm/fvwm3: Makefile distinfo options.mk
        pkgsrc/wm/fvwm3/patches: patch-meson.build

Log Message:
wm/fvwm: correctly detect asciidoctor depending on RUBY_VER

Noted by Marc Baudoin <babafou%babafou.eu.org@localhost>.
Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 pkgsrc/wm/fvwm3/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/wm/fvwm3/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/wm/fvwm3/options.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/wm/fvwm3/patches/patch-meson.build

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.44 pkgsrc/wm/fvwm3/Makefile:1.45
--- pkgsrc/wm/fvwm3/Makefile:1.44       Fri Dec  6 21:10:16 2024
+++ pkgsrc/wm/fvwm3/Makefile    Fri Dec  6 22:24:09 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2024/12/06 21:10:16 vins Exp $
+# $NetBSD: Makefile,v 1.45 2024/12/06 22:24:09 vins Exp $
 
 DISTNAME=      fvwm3-1.1.1
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    wm x11
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=fvwmorg/}
 GITHUB_RELEASE=        ${PKGVERSION_NOREV}
@@ -41,6 +41,7 @@ MESON_ARGS+=  -Dreadline=enabled                              # req
 MESON_ARGS+=   -Dgolang=disabled                               # handled locally by options.mk
 MESON_ARGS+=   -Dlocaledir=${PKGLOCALEDIR}/fvwm3/locale
 MESON_ARGS+=   -Dnls=enabled
+# otherwise we get installed scripts that point to the tools directory
 MESON_ARGS+=   -Dpython=${PYTHONBIN:Q}
 MESON_ARGS+=   -Dperl=${PERL5:Q}
 

Index: pkgsrc/wm/fvwm3/distinfo
diff -u pkgsrc/wm/fvwm3/distinfo:1.16 pkgsrc/wm/fvwm3/distinfo:1.17
--- pkgsrc/wm/fvwm3/distinfo:1.16       Fri Dec  6 21:10:16 2024
+++ pkgsrc/wm/fvwm3/distinfo    Fri Dec  6 22:24:09 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2024/12/06 21:10:16 vins Exp $
+$NetBSD: distinfo,v 1.17 2024/12/06 22:24:09 vins Exp $
 
 BLAKE2s (fvwm3-1.1.1/fvwm3-1.1.1.tar.gz) = 4b85d786bb7a2c8492f9ba67cb3cd067a9115a04073ccbff1d1d8a7030cb0031
 SHA512 (fvwm3-1.1.1/fvwm3-1.1.1.tar.gz) = 66b044a2c463d56573c68f4cdd222a39a667a4acf3425d448c7e1c105e67a9d00abafff1e94c066f0781b4546d1b2b84bc9c20798a0b9ef4b0f673e743a2d4d0
@@ -191,5 +191,5 @@ SHA512 (fvwm3-1.1.1/gopkg.in_yaml.v3_@v_
 Size (fvwm3-1.1.1/gopkg.in_yaml.v3_@v_v3.0.0.zip) = 104597 bytes
 SHA1 (patch-bin_fvwm-menu-desktop.in) = 233e16992dbf81efdb4d41421a2904bc24463c16
 SHA1 (patch-doc_meson.build) = 4fa0d191c79356b4b1c40305f1051d93f6fee247
-SHA1 (patch-meson.build) = 4687894a5ff9f337ff8bedb3c11833220aab645f
+SHA1 (patch-meson.build) = b0832c61583974c4f0bcdda20632266d1c09fff3
 SHA1 (patch-meson.options) = 7326f6904901994df5009c114c8c813feece2c03

Index: pkgsrc/wm/fvwm3/options.mk
diff -u pkgsrc/wm/fvwm3/options.mk:1.6 pkgsrc/wm/fvwm3/options.mk:1.7
--- pkgsrc/wm/fvwm3/options.mk:1.6      Fri Dec  6 21:10:16 2024
+++ pkgsrc/wm/fvwm3/options.mk  Fri Dec  6 22:24:09 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2024/12/06 21:10:16 vins Exp $
+# $NetBSD: options.mk,v 1.7 2024/12/06 22:24:09 vins Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.fvwm3
 PKG_SUPPORTED_OPTIONS= doc go svg
@@ -25,10 +25,11 @@ MESON_ARGS+=    -Dsvg=disabled
 MESON_ARGS+=   -Dmandoc=true
 TOOL_DEPENDS+=         ${RUBY_PKGPREFIX}-asciidoctor-[0-9]*:../../textproc/ruby-asciidoctor
 ASCIIDOC=               ${PREFIX}/bin/asciidoctor${RUBY_VER}
+SUBST_VARS.paths+=     ASCIIDOC
 .  include "../../lang/ruby/rubyversion.mk"
 PLIST.doc=             yes
 .else
-MESON_ARGS+=    -Dmandoc=false
+MESON_ARGS+=   -Dmandoc=false
 .endif
 
 #

Index: pkgsrc/wm/fvwm3/patches/patch-meson.build
diff -u pkgsrc/wm/fvwm3/patches/patch-meson.build:1.1 pkgsrc/wm/fvwm3/patches/patch-meson.build:1.2
--- pkgsrc/wm/fvwm3/patches/patch-meson.build:1.1       Fri Dec  6 21:10:16 2024
+++ pkgsrc/wm/fvwm3/patches/patch-meson.build   Fri Dec  6 22:24:09 2024
@@ -1,7 +1,7 @@
-$NetBSD: patch-meson.build,v 1.1 2024/12/06 21:10:16 vins Exp $
+$NetBSD: patch-meson.build,v 1.2 2024/12/06 22:24:09 vins Exp $
 
 * Prevent reference to build directory in perl scripts
-* Fix detection of readline library
+* Fix detection of readline and asciidoctor
 
 --- meson.build.orig   2024-11-30 20:43:16.000000000 +0000
 +++ meson.build
@@ -51,3 +51,12 @@ $NetBSD: patch-meson.build,v 1.1 2024/12
  
  # Optional dependencies
  # Tip: 'Feature' types always report 'not found' if disabled
+@@ -389,7 +398,7 @@ endforeach
+ build_docs = false
+ if get_option('htmldoc') or get_option('mandoc')
+     build_docs = true
+-    asciidoc = find_program('asciidoctor', required: build_docs)
++    asciidoc = find_program('@ASCIIDOC@', required: build_docs)
+     grep = find_program('grep')
+     subdir('doc')
+ endif