CVS commit: pkgsrc/wm/fvwm3

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

Module Name:    pkgsrc
Committed By:   vins
Date:           Sun Sep 10 10:27:10 UTC 2023

Modified Files:
        pkgsrc/wm/fvwm3: Makefile PLIST distinfo

Log Message:
wm/fvwm3: update release 1.0.8

# CHANGES
## 1.0.8 (2023-09-04)

### Enhancements
* Add .desktop entry for XSession by @Zirias
### Other Changes
* FvwmScript: fix rendering of checkboxes by @ThomasAdam
* Ls/manpage by @lgsobalvarro in https://github.com/fvwmorg/fvwm3/pull/874
* SnapAttraction: honor all tokens mentioned in the manpage by @ch-f
* docs: FvwmPerl: fixup examples by @ThomasAdam
* default-config: use primary mon for RightPanel by @ThomasAdam
* XGetWindowProp: accommodate NUL byte by @ThomasAdam
* FvwmPager: fix division by zero by @ThomasAdam
* *: code cleanup: remove if (x) free checks by @ThomasAdam
* FvwmPrompt: preserve quotes, etc by @ThomasAdam
* conditional: Screen+Desk is not mutually-exclusive by @ThomasAdam
* sizehints: tighten check by @ThomasAdam
* CursorStyle: fix panframe cursors by @ThomasAdam
* FvwmPager: add fpmonitor impls for widths/heights by @ThomasAdam
* MaskUsedModifiers: remove bits used for XKB group index by @farblos


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/wm/fvwm3/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/wm/fvwm3/PLIST
cvs rdiff -u -r1.9 -r1.10 pkgsrc/wm/fvwm3/distinfo

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.20 pkgsrc/wm/fvwm3/Makefile:1.21
--- pkgsrc/wm/fvwm3/Makefile:1.20       Mon Aug 14 05:25:27 2023
+++ pkgsrc/wm/fvwm3/Makefile    Sun Sep 10 10:27:10 2023
@@ -1,26 +1,39 @@
-# $NetBSD: Makefile,v 1.20 2023/08/14 05:25:27 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2023/09/10 10:27:10 vins Exp $
 
-DISTNAME=      fvwm3-1.0.7
-PKGREVISION=   1
+DISTNAME=      fvwm3-1.0.8
 CATEGORIES=    wm x11
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=fvwmorg/}
 GITHUB_RELEASE=        ${PKGVERSION_NOREV}
 
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+MAINTAINER=    vins%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/fvwmorg/fvwm3
 COMMENT=       Multiple large virtual desktop window manager
-LICENSE=       gnu-gpl-v2
+LICENSE=       gnu-gpl-v2 AND mit
 
 CONFLICTS=     fvwm-[0-9]* fvwm1-[0-9]* fvwm2-[0-9]* metisse-[0-9]*
 
-GNU_CONFIGURE= yes
+GNU_CONFIGURE=         yes
 
 USE_TOOLS+=    pkg-config perl:run
 USE_TOOLS+=    msgfmt msgmerge xgettext
 USE_TOOLS+=    gmake # needed for manpages installation
 
-# asciidoctor
-TOOL_DEPENDS+= ${RUBY_PKGPREFIX}-asciidoctor-[0-9]*:../../textproc/ruby-asciidoctor
+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
+
+REPLACE_SH=    utils/*.sh
+REPLACE_PERL=  perllib/FVWM/create-commands
+
+SUBST_CLASSES+=                paths
+SUBST_STAGE.paths=     pre-configure
+SUBST_MESSAGE.paths=   Replacing hard-coded paths.
+SUBST_FILES.paths=     fvwm/fvwm3.c doc/fvwm3_manpage_source.adoc      \
+                       bin/fvwm-menu-desktop.in doc/fvwm-menu-desktop.adoc
+SUBST_SED.paths+=      -e "s:/etc/xdg/menus:${PKG_SYSCONFDIR}/xdg/menus:g"
+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"
 
 # otherwise we get installed scripts that point to the tools directory.
 CONFIGURE_ENV+=        ac_cv_path_PYTHON=${PYTHONBIN}
@@ -28,25 +41,23 @@ CONFIGURE_ENV+=     ac_cv_path_PERL=${PERL5}
 CONFIGURE_ENV+=        ac_cv_prog_ASCIIDOC=${PREFIX}/bin/asciidoctor${RUBY_VER}
 
 CONFIGURE_ARGS+=       --enable-mandoc
-
-# wants python3
-PYTHON_VERSIONS_INCOMPATIBLE=  27
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}/fvwm
+CONFIGURE_ARGS+=       --with-iconv-library=${BUILDLINK_PREFIX.iconv}/lib
+CONFIGURE_ARGS+=       --with-iconv-includes=${BUILDLINK_PREFIX.iconv}/${BUILDLINK_INCDIRS.iconv:Q}
 
 .include "options.mk"
+
+.include "../../converters/libiconv/buildlink3.mk"
 .include "../../converters/fribidi/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libevent+=       libevent>=2.0
 .include "../../devel/libevent/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../lang/python/pyversion.mk"
 .include "../../lang/ruby/rubyversion.mk"
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXcursor/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/libXi/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"
-.include "../../x11/libXrender/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/readline.buildlink3.mk"

Index: pkgsrc/wm/fvwm3/PLIST
diff -u pkgsrc/wm/fvwm3/PLIST:1.5 pkgsrc/wm/fvwm3/PLIST:1.6
--- pkgsrc/wm/fvwm3/PLIST:1.5   Sun Feb 12 06:27:26 2023
+++ pkgsrc/wm/fvwm3/PLIST       Sun Sep 10 10:27:10 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2023/02/12 06:27:26 gutteridge Exp $
+@comment $NetBSD: PLIST,v 1.6 2023/09/10 10:27:10 vins Exp $
 bin/FvwmCommand
 bin/fvwm-convert-2.6
 bin/fvwm-menu-desktop
@@ -157,3 +157,4 @@ share/fvwm3/perllib/FVWM/Tracker/Schedul
 share/fvwm3/perllib/FVWM/Tracker/WindowList.pm
 share/fvwm3/perllib/General/FileSystem.pm
 share/fvwm3/perllib/General/Parse.pm
+share/xsessions/fvwm3.desktop

Index: pkgsrc/wm/fvwm3/distinfo
diff -u pkgsrc/wm/fvwm3/distinfo:1.9 pkgsrc/wm/fvwm3/distinfo:1.10
--- pkgsrc/wm/fvwm3/distinfo:1.9        Sun Jul 16 23:21:56 2023
+++ pkgsrc/wm/fvwm3/distinfo    Sun Sep 10 10:27:10 2023
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2023/07/16 23:21:56 vins Exp $
+$NetBSD: distinfo,v 1.10 2023/09/10 10:27:10 vins Exp $
 
-BLAKE2s (fvwm3-1.0.7.tar.gz) = 1ecc4f09aff41de362bc3e52481ec896d7859a28c8a6b443a7fd058ababcea04
-SHA512 (fvwm3-1.0.7.tar.gz) = 91973abb7b3f79cec4fba28d9aa071923aa975eae3f3e00257e8633e2d376732cd5db7e42a4330bc849f807fc149abfbeef6100fe2ca6c05c847b61ee48236ed
-Size (fvwm3-1.0.7.tar.gz) = 4512128 bytes
+BLAKE2s (fvwm3-1.0.8.tar.gz) = 08089874c531f8ae2f4b58df073b6196063693bea85a193aee9401d2a1b1264a
+SHA512 (fvwm3-1.0.8.tar.gz) = fef69b6d97b3533e6722b48336aa8904b399c42437c4adcab756edf55cf839126002255dfa268bf7159d3bb9caf4d44c43a9217c9df5dc6224cef8461ecf2c34
+Size (fvwm3-1.0.8.tar.gz) = 5644021 bytes