head 1.6; access; symbols pkgsrc-2026Q1:1.6.0.6 pkgsrc-2026Q1-base:1.6 pkgsrc-2025Q4:1.6.0.4 pkgsrc-2025Q4-base:1.6 pkgsrc-2025Q3:1.6.0.2 pkgsrc-2025Q3-base:1.6 pkgsrc-2025Q2:1.5.0.2 pkgsrc-2025Q2-base:1.5 pkgsrc-2025Q1:1.4.0.2 pkgsrc-2025Q1-base:1.4 pkgsrc-2024Q4:1.2.0.2 pkgsrc-2024Q4-base:1.2; locks; strict; comment @# @; 1.6 date 2025.09.08.07.05.27; author vins; state Exp; branches; next 1.5; commitid y1APWskGlXZAzS9G; 1.5 date 2025.06.09.19.12.35; author vins; state Exp; branches; next 1.4; commitid IHUhmSATD0H6xfYF; 1.4 date 2025.03.09.18.28.29; author vins; state Exp; branches; next 1.3; commitid 5MYk1prKw9m9fqMF; 1.3 date 2025.03.08.21.26.36; author vins; state Exp; branches; next 1.2; commitid geLClPLQBOxjgjMF; 1.2 date 2024.12.06.22.24.09; author vins; state Exp; branches; next 1.1; commitid 7WvFbo0YUqDwxuAF; 1.1 date 2024.12.06.21.10.16; author vins; state Exp; branches; next ; commitid XmMySzo40dfE7uAF; desc @@ 1.6 log @wm/fvwm3: fix build on SunOS when using pkgsrc iconv. Use a hacks.mk fragment to detect the iconv implementation in use and apply a fix for the iconv() prototype only if needed. Bump revision @ text @$NetBSD: patch-meson.build,v 1.5 2025/06/09 19:12:35 vins Exp $ * Prevent reference to build directory in perl scripts. * Fix detection of readline and asciidoctor. --- meson.build.orig 2025-06-01 13:59:03.000000000 +0000 +++ meson.build @@@@ -212,7 +212,7 @@@@ else endif # Perl is a required dependency, we generate shebangs at buildtime -perl = find_program('perl', required: true) +perl = find_program(get_option('perl'), required: true) golang = find_program('go', required: get_option('golang')) if golang.found() @@@@ -226,19 +226,30 @@@@ if golang.found() endif else # the readline dependency is only required for FvwmConsole so let's only check for it if we're not building FvwmPrompt - readline = dependency('readline', required: get_option('readline')) - if readline.found() - all_found_deps += readline - conf.set10('HAVE_READLINE', true) - # Check for append_history to determine if we have GNU readline - if cc.has_function('append_history', dependencies: readline) - conf.set10('HAVE_GNU_READLINE', true) + readline = cc.find_library( + 'edit', + dirs: get_option('readline_lib'), + has_headers: 'readline/readline.h', + required: false) + if readline.found() == false + readline = cc.find_library( + 'readline', + dirs: get_option('readline_lib'), + has_headers: 'readline/readline.h', + required: get_option('readline')) + if readline.found() + all_found_deps += readline + conf.set10('HAVE_READLINE', true) + # Check for append_history to determine if we have GNU readline + if cc.has_function('append_history', dependencies: readline) + conf.set10('HAVE_GNU_READLINE', true) + endif endif endif endif # Sed is used for substitution in several configure_file calls -sed = find_program('sed', required: true) +sed = find_program('@@SED@@', required: true) # Optional dependencies # Tip: 'Feature' types always report 'not found' if disabled @@@@ -403,7 +414,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 @ 1.5 log @wm/fvwm3: do not forcibly require editline A bug introduced in the local meson.build patch would make meson error out either when editline is not installed or READLINE_DEFAULT is set to 'readline'. @ text @d1 1 a1 1 $NetBSD: patch-meson.build,v 1.4 2025/03/09 18:28:29 vins Exp $ a4 1 * Fix iconv prototype mismatch on SunOS. d8 1 a8 14 @@@@ -89,7 +89,11 @@@@ conf.set_quoted('LOCALEDIR', prefix / ge conf.set_quoted('FVWM_CONFDIR', prefix / get_option('sysconfdir')) conf.set('RETSIGTYPE', 'void') conf.set('SIGNAL_RETURN', 'return') -conf.set('ICONV_ARG_CONST', '') +if host_machine.system() == 'sunos' + conf.set('ICONV_ARG_CONST', 'const') +else + conf.set('ICONV_ARG_CONST', '') +endif conf.set('fd_set_size_t', 'int') conf.set('EXECUTABLE_EXTENSION', 'NULL') @@@@ -212,7 +216,7 @@@@ else d17 1 a17 1 @@@@ -226,19 +230,30 @@@@ if golang.found() d56 1 a56 1 @@@@ -403,7 +418,7 @@@@ endforeach @ 1.4 log @wm/fvwm3: fix build on SunOS. Also, move nls files to default pkgsrc LOCALEDIiR. Bump revision. @ text @d1 1 a1 1 $NetBSD: patch-meson.build,v 1.3 2025/03/08 21:26:36 vins Exp $ d7 1 a7 1 --- meson.build.orig 2025-02-08 21:38:17.000000000 +0000 d22 1 a22 1 @@@@ -222,7 +226,7 @@@@ else d31 1 a31 1 @@@@ -237,19 +241,29 @@@@ if golang.found() d45 2 a46 1 + has_headers: 'readline/readline.h') d70 1 a70 1 @@@@ -390,7 +404,7 @@@@ endforeach @ 1.3 log @wm/fvwm3: better handle readline/editline discoverability @ text @d1 1 a1 1 $NetBSD: patch-meson.build,v 1.2 2024/12/06 22:24:09 vins Exp $ d3 3 a5 2 * Prevent reference to build directory in perl scripts * Fix detection of readline and asciidoctor d9 14 a22 1 @@@@ -222,7 +222,7 @@@@ else d31 1 a31 1 @@@@ -237,19 +237,29 @@@@ if golang.found() d69 1 a69 1 @@@@ -390,7 +400,7 @@@@ endforeach @ 1.2 log @wm/fvwm: correctly detect asciidoctor depending on RUBY_VER Noted by Marc Baudoin . Bump revision. @ text @d1 1 a1 1 $NetBSD: patch-meson.build,v 1.1 2024/12/06 21:10:16 vins Exp $ d6 1 a6 1 --- meson.build.orig 2024-11-30 20:43:16.000000000 +0000 d8 1 a8 1 @@@@ -221,7 +221,7 @@@@ else d17 1 a17 1 @@@@ -236,19 +236,28 @@@@ if golang.found() d30 2 a31 2 + dirs: '@@BUILDLINK_PREFIX.readline@@/lib', + has_headers: 'readline.h') d35 2 a36 1 + dirs: '@@BUILDLINK_PREFIX.readline@@/lib', d55 1 a55 1 @@@@ -389,7 +398,7 @@@@ endforeach @ 1.1 log @wm/fvwm3: switch build system to meson. fvwm3 migration to meson [0] marks te deprecation of the historical infrastucture based on autotools. Apparently, switching to a different and more flexible framework was easier than patching for autoconf 2.70. As of 2024-09-30, there is a six-month timer on autools support in fvwm3 [1]. In addition, we turn the go option on by default, since it's required by FvwmPrompt, and will probably be required by any new Fvwm module. Revision bumped. [0] https://github.com/fvwmorg/fvwm3/discussions/1068 [1] https://mastodon.social/@@thomasadam@@bsd.network/113573995984463278 @ text @d1 1 a1 1 $NetBSD$ d4 1 a4 1 * Fix detection of readline library d54 9 @