CVS commit: pkgsrc/wm/fvwm3

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/wm/fvwm3
From: "Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>
Date: Sat, 8 Mar 2025 21:26:36 +0000

Module Name:    pkgsrc
Committed By:   vins
Date:           Sat Mar  8 21:26:36 UTC 2025

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

Log Message:
wm/fvwm3: better handle readline/editline discoverability


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 pkgsrc/wm/fvwm3/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/wm/fvwm3/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/wm/fvwm3/go-modules.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/wm/fvwm3/patches/patch-meson.build
cvs rdiff -u -r1.1 -r1.2 pkgsrc/wm/fvwm3/patches/patch-meson.options

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.48 pkgsrc/wm/fvwm3/Makefile:1.49
--- pkgsrc/wm/fvwm3/Makefile:1.48       Fri Mar  7 20:54:32 2025
+++ pkgsrc/wm/fvwm3/Makefile    Sat Mar  8 21:26:36 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.48 2025/03/07 20:54:32 bsiegert Exp $
+# $NetBSD: Makefile,v 1.49 2025/03/08 21:26:36 vins Exp $
 
 DISTNAME=      fvwm3-1.1.2
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    wm x11
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=fvwmorg/}
 GITHUB_RELEASE=        ${PKGVERSION_NOREV}
@@ -32,12 +32,13 @@ SUBST_STAGE.paths=  pre-configure
 SUBST_MESSAGE.paths=   Replacing hard-coded paths.
 SUBST_FILES.paths=     bin/fvwm-menu-desktop.in doc/fvwm3_manpage_source.adoc
 SUBST_FILES.paths+=    fvwm/fvwm3.c meson.build
-SUBST_VARS.paths=      PKG_SYSCONFDIR SED BUILDLINK_PREFIX.readline
+SUBST_VARS.paths=      PKG_SYSCONFDIR SED
 SUBST_SED.paths=       -e "s:/etc/system.fvwm2rc:${PKG_SYSCONFDIR}/fvwm/system.fvwm2rc:g"
 SUBST_SED.paths+=      -e "s:/usr/local/share/fvwm:${PREFIX}/share/fvwm:g"
 
 MESON_ARGS+=   --sysconfdir=${PKG_SYSCONFDIR}/fvwm
 MESON_ARGS+=   -Dreadline=enabled                              # required by FvwmConsole
+MESON_ARGS+=   -Dreadline_lib=${BUIDLINK_PREFIX.editlinereadline}/lib
 MESON_ARGS+=   -Dgolang=disabled                               # handled locally by options.mk
 MESON_ARGS+=   -Dlocaledir=${PKGLOCALEDIR}/fvwm3/locale
 MESON_ARGS+=   -Dnls=enabled

Index: pkgsrc/wm/fvwm3/distinfo
diff -u pkgsrc/wm/fvwm3/distinfo:1.18 pkgsrc/wm/fvwm3/distinfo:1.19
--- pkgsrc/wm/fvwm3/distinfo:1.18       Wed Feb 12 15:20:37 2025
+++ pkgsrc/wm/fvwm3/distinfo    Sat Mar  8 21:26:36 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2025/02/12 15:20:37 vins Exp $
+$NetBSD: distinfo,v 1.19 2025/03/08 21:26:36 vins Exp $
 
 BLAKE2s (fvwm3-1.1.2/fvwm3-1.1.2.tar.gz) = aae90a152b485cbc7cd0f6e88d1a4e3a5392a2321ab56c28e3ea467661e4b020
 SHA512 (fvwm3-1.1.2/fvwm3-1.1.2.tar.gz) = 1b9473ebde6e9a6399fd185f83c0fc403e84f6e7d3648d141f6418e4b6489d0955d384bb2249b85b8372b8731ab205a99dcd64b0aeb697129b1164fb33090f56
@@ -191,5 +191,5 @@ SHA512 (fvwm3-1.1.2/gopkg.in_yaml.v3_@v_
 Size (fvwm3-1.1.2/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) = b0832c61583974c4f0bcdda20632266d1c09fff3
-SHA1 (patch-meson.options) = 7326f6904901994df5009c114c8c813feece2c03
+SHA1 (patch-meson.build) = 96cfbc6b8f794c872d29156ffdf8d9e4b36d2e8d
+SHA1 (patch-meson.options) = 1b39baf3ae658cc5df1b9e951a2a1707c70aa2bd

Index: pkgsrc/wm/fvwm3/go-modules.mk
diff -u pkgsrc/wm/fvwm3/go-modules.mk:1.2 pkgsrc/wm/fvwm3/go-modules.mk:1.3
--- pkgsrc/wm/fvwm3/go-modules.mk:1.2   Sun Dec  1 17:41:15 2024
+++ pkgsrc/wm/fvwm3/go-modules.mk       Sat Mar  8 21:26:36 2025
@@ -1,4 +1,4 @@
-# $NetBSD: go-modules.mk,v 1.2 2024/12/01 17:41:15 vins Exp $
+# $NetBSD: go-modules.mk,v 1.3 2025/03/08 21:26:36 vins Exp $
 
 GO_MODULE_FILES+=      github.com/abiosoft/ishell/@v/v2.0.0+incompatible.mod
 GO_MODULE_FILES+=      github.com/abiosoft/ishell/@v/v2.0.0+incompatible.zip

Index: pkgsrc/wm/fvwm3/patches/patch-meson.build
diff -u pkgsrc/wm/fvwm3/patches/patch-meson.build:1.2 pkgsrc/wm/fvwm3/patches/patch-meson.build:1.3
--- pkgsrc/wm/fvwm3/patches/patch-meson.build:1.2       Fri Dec  6 22:24:09 2024
+++ pkgsrc/wm/fvwm3/patches/patch-meson.build   Sat Mar  8 21:26:36 2025
@@ -1,11 +1,11 @@
-$NetBSD: patch-meson.build,v 1.2 2024/12/06 22:24:09 vins Exp $
+$NetBSD: patch-meson.build,v 1.3 2025/03/08 21:26:36 vins Exp $
 
 * Prevent reference to build directory in perl scripts
 * Fix detection of readline and asciidoctor
 
---- meson.build.orig   2024-11-30 20:43:16.000000000 +0000
+--- meson.build.orig   2025-02-08 21:38:17.000000000 +0000
 +++ meson.build
-@@ -221,7 +221,7 @@ else
+@@ -222,7 +222,7 @@ else
  endif
  
  # Perl is a required dependency, we generate shebangs at buildtime
@@ -14,7 +14,7 @@ $NetBSD: patch-meson.build,v 1.2 2024/12
  
  golang = find_program('go', required: get_option('golang'))
  if golang.found()
-@@ -236,19 +236,28 @@ if golang.found()
+@@ -237,19 +237,29 @@ 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
@@ -27,12 +27,13 @@ $NetBSD: patch-meson.build,v 1.2 2024/12
 -            conf.set10('HAVE_GNU_READLINE', true)
 +    readline = cc.find_library(
 +              'edit', 
-+              dirs: '@BUILDLINK_PREFIX.readline@/lib', 
-+              has_headers: 'readline.h')
++              dirs: get_option('readline_lib'), 
++              has_headers: 'readline/readline.h')
 +    if readline.found() == false
 +      readline = cc.find_library(
 +                  'readline', 
-+                  dirs: '@BUILDLINK_PREFIX.readline@/lib', 
++                  dirs: get_option('readline_lib'),
++                  has_headers: 'readline/readline.h', 
 +                  required: get_option('readline'))
 +      if readline.found()
 +          all_found_deps += readline
@@ -51,7 +52,7 @@ $NetBSD: patch-meson.build,v 1.2 2024/12
  
  # Optional dependencies
  # Tip: 'Feature' types always report 'not found' if disabled
-@@ -389,7 +398,7 @@ endforeach
+@@ -390,7 +400,7 @@ endforeach
  build_docs = false
  if get_option('htmldoc') or get_option('mandoc')
      build_docs = true

Index: pkgsrc/wm/fvwm3/patches/patch-meson.options
diff -u pkgsrc/wm/fvwm3/patches/patch-meson.options:1.1 pkgsrc/wm/fvwm3/patches/patch-meson.options:1.2
--- pkgsrc/wm/fvwm3/patches/patch-meson.options:1.1     Fri Dec  6 21:10:16 2024
+++ pkgsrc/wm/fvwm3/patches/patch-meson.options Sat Mar  8 21:26:36 2025
@@ -1,8 +1,9 @@
-$NetBSD: patch-meson.options,v 1.1 2024/12/06 21:10:16 vins Exp $
+$NetBSD: patch-meson.options,v 1.2 2025/03/08 21:26:36 vins Exp $
 
-Add option to set preferred perl intepreter.
+* Add option to set preferred perl intepreter.
+* Allow to pass readline library path. 
 
---- meson.options.orig 2024-11-30 20:43:16.000000000 +0000
+--- meson.options.orig 2025-02-08 21:38:17.000000000 +0000
 +++ meson.options
 @@ -65,6 +65,11 @@ option(
      description: 'Select python implementation',
@@ -16,3 +17,13 @@ Add option to set preferred perl intepre
      'readline',
      type: 'feature',
      value: 'auto',
+@@ -106,3 +111,9 @@ option(
+     value: 'auto',
+     description: 'Enable X PixMap (xpm) support',
+ )
++
++option(
++    'readline_lib',
++    type: 'string',
++    description: 'Readline library path',
++)

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/textproc/py-yaml
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/textproc/py-yaml
Indexes:

Home | Main Index | Thread Index | Old Index