git: c26dd29e05d0 - main - x11-wm/fvwm3: Update to 1.1.4

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Yoshihiro Takahashi <nyan_at_FreeBSD.org>
Date: Wed, 18 Feb 2026 13:18:30 UTC
The branch main has been updated by nyan:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c26dd29e05d0b0f7d12a0c86cb2c1f2e05c3b61d

commit c26dd29e05d0b0f7d12a0c86cb2c1f2e05c3b61d
Author:     Yoshihiro Takahashi <nyan@FreeBSD.org>
AuthorDate: 2026-02-18 13:08:39 +0000
Commit:     Yoshihiro Takahashi <nyan@FreeBSD.org>
CommitDate: 2026-02-18 13:15:15 +0000

    x11-wm/fvwm3: Update to 1.1.4
    
    - Migrate to meson.
    - Restore GO option.
    - Take maintainership.
    
    Changes:
    - https://github.com/fvwmorg/fvwm3/releases/tag/1.1.1
    - https://github.com/fvwmorg/fvwm3/releases/tag/1.1.2
    - https://github.com/fvwmorg/fvwm3/releases/tag/1.1.3
    - https://github.com/fvwmorg/fvwm3/releases/tag/1.1.4
    
    PR:             292149
    Approved by:    vvd
---
 x11-wm/fvwm3/Makefile  |  77 ++++++++++++++----------------
 x11-wm/fvwm3/distinfo  |   6 +--
 x11-wm/fvwm3/pkg-plist | 126 +++++++++++++++++++++++--------------------------
 3 files changed, 99 insertions(+), 110 deletions(-)

diff --git a/x11-wm/fvwm3/Makefile b/x11-wm/fvwm3/Makefile
index 3db7c7947444..4dd10447dbc0 100644
--- a/x11-wm/fvwm3/Makefile
+++ b/x11-wm/fvwm3/Makefile
@@ -1,11 +1,10 @@
 PORTNAME=	fvwm3
-DISTVERSION=	1.1.0
-PORTREVISION=	9
+DISTVERSION=	1.1.4
 CATEGORIES=	x11-wm
 MASTER_SITES=	https://github.com/fvwmorg/fvwm3/releases/download/${DISTVERSION}/ \
 		http://fvwm.sourceforge.net/generated/icon_download/:icons
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	nyan@FreeBSD.org
 COMMENT=	F? Virtual Window Manager
 WWW=		https://www.fvwm.org/
 
@@ -13,79 +12,75 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libevent.so:devel/libevent \
+		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
-		libfontconfig.so:x11-fonts/fontconfig
+		libxkbcommon.so:x11/libxkbcommon
 
-USES=		compiler:c11 cpe pkgconfig python readline xorg
+USES=		compiler:c11 cpe localbase:ldflags meson perl5 pkgconfig \
+		python shebangfix xorg
 CPE_VENDOR=	fvwm
 CPE_PRODUCT=	fvwm
-USE_XORG=	ice sm x11 xext xft xrandr xrender xt
-
-GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
-CONFIGURE_ARGS=	ac_cv_path_PYTHON=${PYTHON_CMD}
+USE_XORG=	ice sm x11 xext xft xrandr xrender xt xtrans
+SHEBANG_FILES=	bin/FvwmCommand.in bin/fvwm-menu-desktop.in
+python_OLD_CMD=	@PYTHON@
 
 CONFLICTS_INSTALL=	fvwm
+
+BINARY_ALIAS=		python3=${PYTHON_CMD}
+
 PLIST_SUB=		DISTVERSION=${DISTVERSION}
 
-OPTIONS_DEFINE=		FRIBIDI ICONS ICONV MANPAGES NLS PERL PNG SVG \
+OPTIONS_DEFINE=		FRIBIDI GO ICONS ICONV MANPAGES NLS PNG READLINE SVG \
 			XCURSOR XPM
-OPTIONS_DEFAULT=	FRIBIDI ICONV MANPAGES PERL PNG XCURSOR
+OPTIONS_DEFAULT=	FRIBIDI GO ICONV MANPAGES PNG READLINE XCURSOR
 OPTIONS_SUB=		yes
-# GO_DESC=		Build and install modules written in Go
+GO_DESC=		Build and install modules written in Go
 
-FRIBIDI_LIB_DEPENDS=		libfribidi.so:converters/fribidi
-FRIBIDI_CONFIGURE_ENABLE=	bidi
+FRIBIDI_LIB_DEPENDS=	libfribidi.so:converters/fribidi
+FRIBIDI_MESON_ENABLED=	bidi
 
-# GO_USES=		go:no_targets
-# GO_CONFIGURE_ENABLE=	golang
+GO_USES=		go:no_targets
+GO_MESON_ENABLED=	golang
 
 FVWM_ICONS=		fvwm_icons-20070101
 ICONS_IMPLIES=		XPM
 ICONS_DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${FVWM_ICONS}.tar.bz2:icons
 
 ICONV_USES=		iconv:translit
-ICONV_CONFIGURE_ENABLE=	iconv
+ICONV_MESON_ENABLED=	iconv
 
-MANPAGES_IMPLIES=	PERL
 MANPAGES_BUILD_DEPENDS=	rubygem-asciidoctor>0:textproc/rubygem-asciidoctor
-MANPAGES_USES=		gmake
-MANPAGES_CONFIGURE_ENABLE=	mandoc
-
-NLS_USES=		gettext-runtime
-NLS_CONFIGURE_ENABLE=	nls
+MANPAGES_MESON_TRUE=	mandoc
 
-PERL_USES=		perl5
-PERL_CONFIGURE_ENABLE=	perllib
+NLS_USES=		gettext
+NLS_MESON_ENABLED=	nls
 
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
-PNG_CONFIGURE_ENABLE=	png
+PNG_MESON_ENABLED=	png
+
+READLINE_USES=		readline
+READLINE_MESON_ENABLED=	readline
 
 SVG_USES=		gnome
-SVG_USE=		gnome=cairo,glib20,gdkpixbuf,librsvg2
-SVG_CONFIGURE_ENABLE=	rsvg
+SVG_USE=		GNOME=librsvg2
+SVG_MESON_ENABLED=	svg
 
-XCURSOR_USE=			xorg=xcursor
-XCURSOR_CONFIGURE_ENABLE=	xcursor
+XCURSOR_USE=		XORG=xcursor,xfixes
+XCURSOR_MESON_ENABLED=	xcursor xfixes
 
-XPM_USE=		xorg=xpm
-XPM_CONFIGURE_OFF=	--with-xpm-library=no
+XPM_USE=		XORG=xpm
+XPM_MESON_ENABLED=	xpm
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,/etc/,${LOCALBASE}/etc/,g' \
 		${WRKSRC}/bin/fvwm-menu-desktop.in
 
+post-install-GO-on:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/FvwmPrompt
+
 post-install-ICONS-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/fvwm3/pixmaps
 	${INSTALL_DATA} ${WRKDIR}/${FVWM_ICONS}/*.xpm \
 		${STAGEDIR}${PREFIX}/share/fvwm3/pixmaps
 
-post-install-PERL-off:
-.for script in fvwm-convert-2.6 fvwm-menu-directory fvwm-menu-xlock fvwm-perllib
-	${RM} ${STAGEDIR}${PREFIX}/bin/${script}
-.endfor
-.for script in FvwmConsoleC.pl FvwmPerl
-	${RM} ${STAGEDIR}${PREFIX}/libexec/fvwm3/${DISTVERSION}/${script}
-.endfor
-
 .include <bsd.port.mk>
diff --git a/x11-wm/fvwm3/distinfo b/x11-wm/fvwm3/distinfo
index 248e3abe0bac..574df736afb7 100644
--- a/x11-wm/fvwm3/distinfo
+++ b/x11-wm/fvwm3/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1711884487
-SHA256 (fvwm3-1.1.0.tar.gz) = cb427d58d49e4f8db013d878fa9aa7a360e98706f1c6d08ea3ad8066ae8660d3
-SIZE (fvwm3-1.1.0.tar.gz) = 4527424
+TIMESTAMP = 1767253845
+SHA256 (fvwm3-1.1.4.tar.gz) = 6df420ab492dcecd9d302880a9e97f689e9181db8850f5f7945e652bb8dd62a0
+SIZE (fvwm3-1.1.4.tar.gz) = 3994027
 SHA256 (fvwm_icons-20070101.tar.bz2) = 86b0164430a3087f5cb8d55eb43a8676bbce495814b30c6844eb127f952642ab
 SIZE (fvwm_icons-20070101.tar.bz2) = 330862
diff --git a/x11-wm/fvwm3/pkg-plist b/x11-wm/fvwm3/pkg-plist
index 7572d310999f..f96f61885eab 100644
--- a/x11-wm/fvwm3/pkg-plist
+++ b/x11-wm/fvwm3/pkg-plist
@@ -1,9 +1,10 @@
 bin/FvwmCommand
-%%PERL%%bin/fvwm-convert-2.6
+%%GO%%bin/FvwmPrompt
+bin/fvwm-convert-2.6
 bin/fvwm-menu-desktop
-%%PERL%%bin/fvwm-menu-directory
-%%PERL%%bin/fvwm-menu-xlock
-%%PERL%%bin/fvwm-perllib
+bin/fvwm-menu-directory
+bin/fvwm-menu-xlock
+bin/fvwm-perllib
 bin/fvwm-root
 bin/fvwm3
 libexec/fvwm3/%%DISTVERSION%%/FvwmAnimate
@@ -11,44 +12,18 @@ libexec/fvwm3/%%DISTVERSION%%/FvwmAuto
 libexec/fvwm3/%%DISTVERSION%%/FvwmBacker
 libexec/fvwm3/%%DISTVERSION%%/FvwmButtons
 libexec/fvwm3/%%DISTVERSION%%/FvwmCommandS
-libexec/fvwm3/%%DISTVERSION%%/FvwmConsole
-libexec/fvwm3/%%DISTVERSION%%/FvwmConsoleC
+%%NO_GO%%libexec/fvwm3/%%DISTVERSION%%/FvwmConsole
+%%NO_GO%%libexec/fvwm3/%%DISTVERSION%%/FvwmConsoleC
 libexec/fvwm3/%%DISTVERSION%%/FvwmEvent
 libexec/fvwm3/%%DISTVERSION%%/FvwmForm
 libexec/fvwm3/%%DISTVERSION%%/FvwmIconMan
 libexec/fvwm3/%%DISTVERSION%%/FvwmIdent
 libexec/fvwm3/%%DISTVERSION%%/FvwmMFL
 libexec/fvwm3/%%DISTVERSION%%/FvwmPager
-%%PERL%%libexec/fvwm3/%%DISTVERSION%%/FvwmPerl
+libexec/fvwm3/%%DISTVERSION%%/FvwmPerl
 libexec/fvwm3/%%DISTVERSION%%/FvwmRearrange
 libexec/fvwm3/%%DISTVERSION%%/FvwmScript
 libexec/fvwm3/%%DISTVERSION%%/FvwmTalk
-%%MANPAGES%%share/man/man1/FvwmAnimate.1.gz
-%%MANPAGES%%share/man/man1/FvwmAuto.1.gz
-%%MANPAGES%%share/man/man1/FvwmBacker.1.gz
-%%MANPAGES%%share/man/man1/FvwmButtons.1.gz
-%%MANPAGES%%share/man/man1/FvwmCommand.1.gz
-%%MANPAGES%%share/man/man1/FvwmConsole.1.gz
-%%MANPAGES%%share/man/man1/FvwmEvent.1.gz
-%%MANPAGES%%share/man/man1/FvwmForm.1.gz
-%%MANPAGES%%share/man/man1/FvwmIconMan.1.gz
-%%MANPAGES%%share/man/man1/FvwmIdent.1.gz
-%%MANPAGES%%share/man/man1/FvwmMFL.1.gz
-%%MANPAGES%%share/man/man1/FvwmPager.1.gz
-%%MANPAGES%%share/man/man1/FvwmPerl.1.gz
-%%MANPAGES%%share/man/man1/FvwmRearrange.1.gz
-%%MANPAGES%%share/man/man1/FvwmScript.1.gz
-%%MANPAGES%%share/man/man1/fvwm-convert-2.6.1.gz
-%%MANPAGES%%share/man/man1/fvwm-menu-desktop.1.gz
-%%MANPAGES%%share/man/man1/fvwm-menu-directory.1.gz
-%%MANPAGES%%share/man/man1/fvwm-menu-xlock.1.gz
-%%MANPAGES%%share/man/man1/fvwm-perllib.1.gz
-%%MANPAGES%%share/man/man1/fvwm-root.1.gz
-%%MANPAGES%%share/man/man1/fvwm3.1.gz
-%%MANPAGES%%share/man/man1/fvwm3all.1.gz
-%%MANPAGES%%share/man/man1/fvwm3commands.1.gz
-%%MANPAGES%%share/man/man1/fvwm3menus.1.gz
-%%MANPAGES%%share/man/man1/fvwm3styles.1.gz
 %%DATADIR%%/ConfigFvwmBacker
 %%DATADIR%%/ConfigFvwmButtons
 %%DATADIR%%/ConfigFvwmDefaults
@@ -123,23 +98,22 @@ libexec/fvwm3/%%DISTVERSION%%/FvwmTalk
 %%DATADIR%%/default-config/stalonetrayrc
 %%DATADIR%%/fvwm-menu-desktop-config.fpl
 %%DATADIR%%/fvwm-script-ComExample.pl
-share/xsessions/fvwm3.desktop
-%%PERL%%%%DATADIR%%/perllib/FVWM/Commands.pm
-%%PERL%%%%DATADIR%%/perllib/FVWM/Constants.pm
-%%PERL%%%%DATADIR%%/perllib/FVWM/Event.pm
-%%PERL%%%%DATADIR%%/perllib/FVWM/EventNames.pm
-%%PERL%%%%DATADIR%%/perllib/FVWM/Module.pm
-%%PERL%%%%DATADIR%%/perllib/FVWM/Module/Terminal.pm
-%%PERL%%%%DATADIR%%/perllib/FVWM/Module/Toolkit.pm
-%%PERL%%%%DATADIR%%/perllib/FVWM/Tracker.pm
-%%PERL%%%%DATADIR%%/perllib/FVWM/Tracker/Colorsets.pm
-%%PERL%%%%DATADIR%%/perllib/FVWM/Tracker/GlobalConfig.pm
-%%PERL%%%%DATADIR%%/perllib/FVWM/Tracker/ModuleConfig.pm
-%%PERL%%%%DATADIR%%/perllib/FVWM/Tracker/PageInfo.pm
-%%PERL%%%%DATADIR%%/perllib/FVWM/Tracker/Scheduler.pm
-%%PERL%%%%DATADIR%%/perllib/FVWM/Tracker/WindowList.pm
-%%PERL%%%%DATADIR%%/perllib/General/FileSystem.pm
-%%PERL%%%%DATADIR%%/perllib/General/Parse.pm
+%%DATADIR%%/perllib/FVWM/Commands.pm
+%%DATADIR%%/perllib/FVWM/Constants.pm
+%%DATADIR%%/perllib/FVWM/Event.pm
+%%DATADIR%%/perllib/FVWM/EventNames.pm
+%%DATADIR%%/perllib/FVWM/Module.pm
+%%DATADIR%%/perllib/FVWM/Module/Terminal.pm
+%%DATADIR%%/perllib/FVWM/Module/Toolkit.pm
+%%DATADIR%%/perllib/FVWM/Tracker.pm
+%%DATADIR%%/perllib/FVWM/Tracker/Colorsets.pm
+%%DATADIR%%/perllib/FVWM/Tracker/GlobalConfig.pm
+%%DATADIR%%/perllib/FVWM/Tracker/ModuleConfig.pm
+%%DATADIR%%/perllib/FVWM/Tracker/PageInfo.pm
+%%DATADIR%%/perllib/FVWM/Tracker/Scheduler.pm
+%%DATADIR%%/perllib/FVWM/Tracker/WindowList.pm
+%%DATADIR%%/perllib/General/FileSystem.pm
+%%DATADIR%%/perllib/General/Parse.pm
 %%ICONS%%%%DATADIR%%/pixmaps/Jlock.xpm
 %%ICONS%%%%DATADIR%%/pixmaps/Jnews.xpm
 %%ICONS%%%%DATADIR%%/pixmaps/Jrecycle.xpm
@@ -456,19 +430,39 @@ share/xsessions/fvwm3.desktop
 %%ICONS%%%%DATADIR%%/pixmaps/xv.xpm
 %%ICONS%%%%DATADIR%%/pixmaps/xv2.xpm
 %%ICONS%%%%DATADIR%%/pixmaps/xview.xpm
-%%NLS%%%%DATADIR%%/locale/ar/LC_MESSAGES/FvwmScript.mo
-%%NLS%%%%DATADIR%%/locale/ar/LC_MESSAGES/fvwm.mo
-%%NLS%%%%DATADIR%%/locale/da/LC_MESSAGES/FvwmScript.mo
-%%NLS%%%%DATADIR%%/locale/da/LC_MESSAGES/fvwm.mo
-%%NLS%%%%DATADIR%%/locale/de/LC_MESSAGES/FvwmScript.mo
-%%NLS%%%%DATADIR%%/locale/de/LC_MESSAGES/fvwm.mo
-%%NLS%%%%DATADIR%%/locale/es/LC_MESSAGES/FvwmScript.mo
-%%NLS%%%%DATADIR%%/locale/es/LC_MESSAGES/fvwm.mo
-%%NLS%%%%DATADIR%%/locale/fr/LC_MESSAGES/FvwmScript.mo
-%%NLS%%%%DATADIR%%/locale/fr/LC_MESSAGES/fvwm.mo
-%%NLS%%%%DATADIR%%/locale/ru/LC_MESSAGES/FvwmScript.mo
-%%NLS%%%%DATADIR%%/locale/ru/LC_MESSAGES/fvwm.mo
-%%NLS%%%%DATADIR%%/locale/sv_SE/LC_MESSAGES/FvwmScript.mo
-%%NLS%%%%DATADIR%%/locale/sv_SE/LC_MESSAGES/fvwm.mo
-%%NLS%%%%DATADIR%%/locale/zh_CN/LC_MESSAGES/FvwmScript.mo
-%%NLS%%%%DATADIR%%/locale/zh_CN/LC_MESSAGES/fvwm.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/fvwm3.mo
+%%NLS%%share/locale/da/LC_MESSAGES/fvwm3.mo
+%%NLS%%share/locale/de/LC_MESSAGES/fvwm3.mo
+%%NLS%%share/locale/es/LC_MESSAGES/fvwm3.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/fvwm3.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/fvwm3.mo
+%%NLS%%share/locale/sv_SE/LC_MESSAGES/fvwm3.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/fvwm3.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/fvwm3.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/fvwm3.mo
+%%MANPAGES%%share/man/man1/FvwmAnimate.1.gz
+%%MANPAGES%%share/man/man1/FvwmAuto.1.gz
+%%MANPAGES%%share/man/man1/FvwmBacker.1.gz
+%%MANPAGES%%share/man/man1/FvwmButtons.1.gz
+%%MANPAGES%%share/man/man1/FvwmCommand.1.gz
+%%MANPAGES%%share/man/man1/FvwmEvent.1.gz
+%%MANPAGES%%share/man/man1/FvwmForm.1.gz
+%%MANPAGES%%share/man/man1/FvwmIconMan.1.gz
+%%MANPAGES%%share/man/man1/FvwmIdent.1.gz
+%%MANPAGES%%share/man/man1/FvwmMFL.1.gz
+%%MANPAGES%%share/man/man1/FvwmPager.1.gz
+%%MANPAGES%%share/man/man1/FvwmPerl.1.gz
+%%MANPAGES%%share/man/man1/FvwmRearrange.1.gz
+%%MANPAGES%%share/man/man1/FvwmScript.1.gz
+%%MANPAGES%%share/man/man1/fvwm-convert-2.6.1.gz
+%%MANPAGES%%share/man/man1/fvwm-menu-desktop.1.gz
+%%MANPAGES%%share/man/man1/fvwm-menu-directory.1.gz
+%%MANPAGES%%share/man/man1/fvwm-menu-xlock.1.gz
+%%MANPAGES%%share/man/man1/fvwm-perllib.1.gz
+%%MANPAGES%%share/man/man1/fvwm-root.1.gz
+%%MANPAGES%%share/man/man1/fvwm3.1.gz
+%%MANPAGES%%share/man/man1/fvwm3all.1.gz
+%%MANPAGES%%share/man/man1/fvwm3commands.1.gz
+%%MANPAGES%%share/man/man1/fvwm3menus.1.gz
+%%MANPAGES%%share/man/man1/fvwm3styles.1.gz
+share/xsessions/fvwm3.desktop