git: 439ccd87aaf8 - main - x11-wm/fvwm3: Remove GO option (depends on removed go1.23)
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 03 Jan 2026 00:10:44 UTC
The branch main has been updated by adamw:
URL: https://cgit.FreeBSD.org/ports/commit/?id=439ccd87aaf85378a65dc5113c234c192b6e9646
commit 439ccd87aaf85378a65dc5113c234c192b6e9646
Author: Adam Weinberger <adamw@FreeBSD.org>
AuthorDate: 2026-01-03 00:07:21 +0000
Commit: Adam Weinberger <adamw@FreeBSD.org>
CommitDate: 2026-01-03 00:10:41 +0000
x11-wm/fvwm3: Remove GO option (depends on removed go1.23)
go1.23 has expired. Thankfully, fvwm3's go dependency was optional.
I've removed the GO option, adjusted the plist accordingly, and bumped
PORTREVISION.
---
x11-wm/fvwm3/Makefile | 15 ++++++---------
x11-wm/fvwm3/pkg-plist | 12 +++++-------
2 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/x11-wm/fvwm3/Makefile b/x11-wm/fvwm3/Makefile
index 0315e63861ee..3db7c7947444 100644
--- a/x11-wm/fvwm3/Makefile
+++ b/x11-wm/fvwm3/Makefile
@@ -1,6 +1,6 @@
PORTNAME= fvwm3
DISTVERSION= 1.1.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= x11-wm
MASTER_SITES= https://github.com/fvwmorg/fvwm3/releases/download/${DISTVERSION}/ \
http://fvwm.sourceforge.net/generated/icon_download/:icons
@@ -28,20 +28,17 @@ CONFIGURE_ARGS= ac_cv_path_PYTHON=${PYTHON_CMD}
CONFLICTS_INSTALL= fvwm
PLIST_SUB= DISTVERSION=${DISTVERSION}
-OPTIONS_DEFINE= FRIBIDI GO ICONS ICONV MANPAGES NLS PERL PNG SVG \
+OPTIONS_DEFINE= FRIBIDI ICONS ICONV MANPAGES NLS PERL PNG SVG \
XCURSOR XPM
-OPTIONS_DEFAULT= FRIBIDI GO ICONV MANPAGES PERL PNG XCURSOR
+OPTIONS_DEFAULT= FRIBIDI ICONV MANPAGES PERL PNG 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
-_GO_MAXVERSION= 1.23
-_GO_VERSIONARG= ${${GO_DEFAULT:S/-devel//:S/.//} > \
- ${_GO_MAXVERSION:S/.//}:?${_GO_MAXVERSION},:}
-GO_USES= go:${_GO_VERSIONARG}no_targets
-GO_CONFIGURE_ENABLE= golang
+# GO_USES= go:no_targets
+# GO_CONFIGURE_ENABLE= golang
FVWM_ICONS= fvwm_icons-20070101
ICONS_IMPLIES= XPM
diff --git a/x11-wm/fvwm3/pkg-plist b/x11-wm/fvwm3/pkg-plist
index 33b00fb1c9e8..7572d310999f 100644
--- a/x11-wm/fvwm3/pkg-plist
+++ b/x11-wm/fvwm3/pkg-plist
@@ -1,5 +1,4 @@
bin/FvwmCommand
-%%GO%%bin/FvwmPrompt
%%PERL%%bin/fvwm-convert-2.6
bin/fvwm-menu-desktop
%%PERL%%bin/fvwm-menu-directory
@@ -11,9 +10,9 @@ libexec/fvwm3/%%DISTVERSION%%/FvwmAnimate
libexec/fvwm3/%%DISTVERSION%%/FvwmAuto
libexec/fvwm3/%%DISTVERSION%%/FvwmBacker
libexec/fvwm3/%%DISTVERSION%%/FvwmButtons
-%%GO%%libexec/fvwm3/%%DISTVERSION%%/FvwmCommandS
-%%NO_GO%%libexec/fvwm3/%%DISTVERSION%%/FvwmConsole
-%%NO_GO%%libexec/fvwm3/%%DISTVERSION%%/FvwmConsoleC
+libexec/fvwm3/%%DISTVERSION%%/FvwmCommandS
+libexec/fvwm3/%%DISTVERSION%%/FvwmConsole
+libexec/fvwm3/%%DISTVERSION%%/FvwmConsoleC
libexec/fvwm3/%%DISTVERSION%%/FvwmEvent
libexec/fvwm3/%%DISTVERSION%%/FvwmForm
libexec/fvwm3/%%DISTVERSION%%/FvwmIconMan
@@ -28,8 +27,8 @@ libexec/fvwm3/%%DISTVERSION%%/FvwmTalk
%%MANPAGES%%share/man/man1/FvwmAuto.1.gz
%%MANPAGES%%share/man/man1/FvwmBacker.1.gz
%%MANPAGES%%share/man/man1/FvwmButtons.1.gz
-%%MANPAGES%%%%GO%%share/man/man1/FvwmCommand.1.gz
-%%NO_GO%%%%MANPAGES%%share/man/man1/FvwmConsole.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
@@ -37,7 +36,6 @@ libexec/fvwm3/%%DISTVERSION%%/FvwmTalk
%%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/FvwmPrompt.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