CVS commit: pkgsrc/wm/fvwm3

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

Module Name:    pkgsrc
Committed By:   vins
Date:           Sun Mar  9 18:28:29 UTC 2025

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

Log Message:
wm/fvwm3: fix build on SunOS.

Also, move nls files to default pkgsrc LOCALEDIiR.
Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 pkgsrc/wm/fvwm3/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/wm/fvwm3/PLIST
cvs rdiff -u -r1.19 -r1.20 pkgsrc/wm/fvwm3/distinfo
cvs rdiff -u -r1.3 -r1.4 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.49 pkgsrc/wm/fvwm3/Makefile:1.50
--- pkgsrc/wm/fvwm3/Makefile:1.49       Sat Mar  8 21:26:36 2025
+++ pkgsrc/wm/fvwm3/Makefile    Sun Mar  9 18:28:28 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.49 2025/03/08 21:26:36 vins Exp $
+# $NetBSD: Makefile,v 1.50 2025/03/09 18:28:28 vins Exp $
 
 DISTNAME=      fvwm3-1.1.2
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    wm x11
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=fvwmorg/}
 GITHUB_RELEASE=        ${PKGVERSION_NOREV}
@@ -14,6 +14,8 @@ LICENSE=      gnu-gpl-v2 AND mit
 
 CONFLICTS=     fvwm-[0-9]* fvwm1-[0-9]* fvwm2-[0-9]* metisse-[0-9]*
 
+USE_CC_FEATURES=       c99
+
 USE_TOOLS+=            grep pkg-config perl sed
 USE_TOOLS+=            msgfmt msgmerge xgettext
 USE_PKGLOCALEDIR=      yes
@@ -36,11 +38,13 @@ 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
+CPPFLAGS.SunOS+=       -D__EXTENSIONS__                        #strncasecmp()
+LDFLAGS.SunOS+=                -lsocket
+
+MESON_ARGS+=   --sysconfdir=${PKG_SYSCONFBASEDIR}/fvwm
+MESON_ARGS+=   --localedir=${PKGLOCALEDIR}/locale
 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
 # otherwise we get installed scripts that point to the tools directory
 MESON_ARGS+=   -Dpython=${PYTHONBIN:Q}
@@ -65,4 +69,9 @@ BUILDLINK_API_DEPENDS.libevent+=      libeven
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/readline.buildlink3.mk"
+.if ${READLINE_TYPE} == "editline"
+MESON_ARGS+=    -Dreadline_lib=${BUILDLINK_PREFIX.editline}/lib
+.else
+MESON_ARGS+=    -Dreadline_lib=${BUILDLINK_PREFIX.readline}/lib
+.endif
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/wm/fvwm3/PLIST
diff -u pkgsrc/wm/fvwm3/PLIST:1.9 pkgsrc/wm/fvwm3/PLIST:1.10
--- pkgsrc/wm/fvwm3/PLIST:1.9   Sun Dec  1 17:41:15 2024
+++ pkgsrc/wm/fvwm3/PLIST       Sun Mar  9 18:28:28 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2024/12/01 17:41:15 vins Exp $
+@comment $NetBSD: PLIST,v 1.10 2025/03/09 18:28:28 vins Exp $
 bin/FvwmCommand
 ${PLIST.go}bin/FvwmPrompt
 bin/fvwm-convert-2.6
@@ -126,15 +126,15 @@ share/fvwm3/default-config/images/icons/
 share/fvwm3/default-config/stalonetrayrc
 share/fvwm3/fvwm-menu-desktop-config.fpl
 share/fvwm3/fvwm-script-ComExample.pl
-share/fvwm3/locale/ar/LC_MESSAGES/fvwm3.mo
-share/fvwm3/locale/da/LC_MESSAGES/fvwm3.mo
-share/fvwm3/locale/de/LC_MESSAGES/fvwm3.mo
-share/fvwm3/locale/es/LC_MESSAGES/fvwm3.mo
-share/fvwm3/locale/fr/LC_MESSAGES/fvwm3.mo
-share/fvwm3/locale/ru/LC_MESSAGES/fvwm3.mo
-share/fvwm3/locale/sv_SE/LC_MESSAGES/fvwm3.mo
-share/fvwm3/locale/zh_CN/LC_MESSAGES/fvwm3.mo
-share/fvwm3/locale/zh_TW/LC_MESSAGES/fvwm3.mo
+${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/fvwm3.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/fvwm3.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/fvwm3.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/fvwm3.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/fvwm3.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/fvwm3.mo
+${PKGLOCALEDIR}/locale/sv_SE/LC_MESSAGES/fvwm3.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/fvwm3.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/fvwm3.mo
 share/fvwm3/perllib/FVWM/Commands.pm
 share/fvwm3/perllib/FVWM/Constants.pm
 share/fvwm3/perllib/FVWM/Event.pm

Index: pkgsrc/wm/fvwm3/distinfo
diff -u pkgsrc/wm/fvwm3/distinfo:1.19 pkgsrc/wm/fvwm3/distinfo:1.20
--- pkgsrc/wm/fvwm3/distinfo:1.19       Sat Mar  8 21:26:36 2025
+++ pkgsrc/wm/fvwm3/distinfo    Sun Mar  9 18:28:28 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2025/03/08 21:26:36 vins Exp $
+$NetBSD: distinfo,v 1.20 2025/03/09 18:28:28 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) = 96cfbc6b8f794c872d29156ffdf8d9e4b36d2e8d
+SHA1 (patch-meson.build) = 65ac85987fa7f16f4f9647782540c9fad80d4176
 SHA1 (patch-meson.options) = 1b39baf3ae658cc5df1b9e951a2a1707c70aa2bd

Index: pkgsrc/wm/fvwm3/patches/patch-meson.build
diff -u pkgsrc/wm/fvwm3/patches/patch-meson.build:1.3 pkgsrc/wm/fvwm3/patches/patch-meson.build:1.4
--- pkgsrc/wm/fvwm3/patches/patch-meson.build:1.3       Sat Mar  8 21:26:36 2025
+++ pkgsrc/wm/fvwm3/patches/patch-meson.build   Sun Mar  9 18:28:29 2025
@@ -1,11 +1,25 @@
-$NetBSD: patch-meson.build,v 1.3 2025/03/08 21:26:36 vins Exp $
+$NetBSD: patch-meson.build,v 1.4 2025/03/09 18:28:29 vins Exp $
 
-* Prevent reference to build directory in perl scripts
-* Fix detection of readline and asciidoctor
+* Prevent reference to build directory in perl scripts.
+* Fix detection of readline and asciidoctor.
+* Fix iconv prototype mismatch on SunOS.
 
 --- meson.build.orig   2025-02-08 21:38:17.000000000 +0000
 +++ meson.build
-@@ -222,7 +222,7 @@ else
+@@ -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')
+ 
+@@ -222,7 +226,7 @@ else
  endif
  
  # Perl is a required dependency, we generate shebangs at buildtime
@@ -14,7 +28,7 @@ $NetBSD: patch-meson.build,v 1.3 2025/03
  
  golang = find_program('go', required: get_option('golang'))
  if golang.found()
-@@ -237,19 +237,29 @@ if golang.found()
+@@ -237,19 +241,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
@@ -52,7 +66,7 @@ $NetBSD: patch-meson.build,v 1.3 2025/03
  
  # Optional dependencies
  # Tip: 'Feature' types always report 'not found' if disabled
-@@ -390,7 +400,7 @@ endforeach
+@@ -390,7 +404,7 @@ endforeach
  build_docs = false
  if get_option('htmldoc') or get_option('mandoc')
      build_docs = true