Two weeks friendly ping :) I'm reattaching the tarball and the set of patches for the other ports.
lang/guile3 builds fine and almost all tests are passing. The tarball below includes two patches for some tests, and the other failing tests are for futile reasons (like expecting crypt(3) to behave like glibc one) that can be fixed later in-tree. gkoheler has built it on powerpc64 (thanks!!) and confirmed that it's broken on powerpc. I have tested on amd64. The recap of the affected ports is: devel/autogen: ok! devel/swig: ok! cad/geda-gaf: ok! cad/lepton-eda: breaks, fixed for guile 2 net/freetalk: ok! editors/TeXmacs: ok! education/drgeo: ok! mail/mu,guile: breaks, switched to guile 3 math/graphviz: ok! print/lilypond: ok! productivity/gnucash: breaks, fixed for guile 2 x11/gnome/aisleriot: breaks, fixed for guile 2 i've built all these packages locally with all three guile version installed. i've only looked at the build logs and checked WANTLIB after the build, no runtime testing. sdk: I can postpone this until the mail/mu update goes in. The major change with the last diff is that I've fixed the build of lepton-eda with guile 2 and that the patch for x11/gnome/aisleriot was updated after upstream changes. (diff below also includes some bits for lang/guile2 to avoid conflicting with guile3, just like it was done for lang/guile once guile2 was imported.) ok?
? cad/lepton-eda/build
? cad/lepton-eda/guile3.patches
? lang/guile/build
? lang/guile/todolist
? lang/guile2/build
? lang/guile2/tests.log
? productivity/gnucash/build
? x11/gnome/aisleriot/USE_CCACHE=no
? x11/gnome/aisleriot/build
? x11/gnome/aisleriot/config.log
Index: cad/lepton-eda/Makefile
===================================================================
RCS file: /cvs/ports/cad/lepton-eda/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- cad/lepton-eda/Makefile 12 Jul 2022 21:17:30 -0000 1.4
+++ cad/lepton-eda/Makefile 29 Jul 2022 10:05:57 -0000
@@ -47,8 +47,9 @@ CONFIGURE_ARGS += --disable-attrib \
--enable-guild
CONFIGURE_ENV = GROFF=false \
- GUILE=guile2.2 \
- GUILE_SNARF=guile-snarf2.2 \
+ GUILE_EFFECTIVE_VERSION=2.2 \
+ GUILE_CFLAGS="-I${LOCALBASE}/include/guile/2.2 -I${LOCALBASE}/include" \
+ GUILE_LIBS="-L${LOCALBASE}/lib -lguile-2.2 -lgc" \
MAKEINFO=gmakeinfo \
M4=/usr/bin/m4
Index: lang/guile2/Makefile
===================================================================
RCS file: /cvs/ports/lang/guile2/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- lang/guile2/Makefile 11 Mar 2022 19:29:02 -0000 1.29
+++ lang/guile2/Makefile 29 Jul 2022 10:05:57 -0000
@@ -8,6 +8,7 @@ COMMENT= GNU's Ubiquitous Intelligent L
VERSION= 2.2.7
DISTNAME= guile-${VERSION}
PKGNAME= guile2-${VERSION}
+REVISION= 0
V= ${VERSION:R}
SUBST_VARS= V
@@ -75,6 +76,8 @@ post-install:
install -d ${PREFIX}/share/guile/site/${V}/
# fix conflict with devel/guile
mv ${PREFIX}/share/aclocal/guile{,${V}}.m4
+ # fix conflict with lang/guile3
+ rm -rf ${PREFIX}/info
.include <bsd.port.mk>
Index: lang/guile2/pkg/PLIST
===================================================================
RCS file: /cvs/ports/lang/guile2/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST
--- lang/guile2/pkg/PLIST 11 Mar 2022 19:29:02 -0000 1.10
+++ lang/guile2/pkg/PLIST 29 Jul 2022 10:05:57 -0000
@@ -132,8 +132,6 @@ include/guile/${V}/libguile/weak-set.h
include/guile/${V}/libguile/weak-table.h
include/guile/${V}/libguile/weak-vector.h
include/guile/${V}/readline.h
-@info info/guile.info
-@info info/r5rs.info
@comment lib/charset.alias
lib/guile/
lib/guile/${V}/
Index: mail/mu/Makefile
===================================================================
RCS file: /cvs/ports/mail/mu/Makefile,v
retrieving revision 1.34
diff -u -p -r1.34 Makefile
--- mail/mu/Makefile 16 Jun 2022 15:39:44 -0000 1.34
+++ mail/mu/Makefile 29 Jul 2022 10:05:57 -0000
@@ -1,9 +1,10 @@
COMMENT= maildir indexer and searcher with emacs frontend
V= 1.6.11
-GUILE_V= 2.2
+GUILE_V= 3.0
DISTNAME= mu-$V
+REVISION= 0
FLAVORS= guile
FLAVOR ?=
@@ -44,7 +45,7 @@ CONFIGURE_ARGS= --disable-gtk \
.if ${FLAVOR} == "guile"
WANTLIB += guile-${GUILE_V} gc ltdl gmp
-LIB_DEPENDS += lang/guile2
+LIB_DEPENDS += lang/guile3
.else
CONFIGURE_ARGS += --disable-guile
.endif
Index: productivity/gnucash/patches/patch-CMakeLists_txt
===================================================================
RCS file: productivity/gnucash/patches/patch-CMakeLists_txt
diff -N productivity/gnucash/patches/patch-CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ productivity/gnucash/patches/patch-CMakeLists_txt 29 Jul 2022 10:05:57 -0000
@@ -0,0 +1,15 @@
+disable guile3
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -278,7 +278,8 @@ string(REGEX MATCH "^[0-9]+[.]" SWIG_MAJOR ${SWIG_VERS
+ # Look for guile versions in this order: 3.0 > 2.2 > 2.0
+
+ # guile library and include dir
+-pkg_check_modules (GUILE3 guile-3.0 QUIET)
++#pkg_check_modules (GUILE3 guile-3.0 QUIET)
++SET(GUILE3_FOUND FALSE)
+ pkg_check_modules (GUILE22 guile-2.2 QUIET)
+ pkg_check_modules (GUILE2 guile-2.0>=2.0.9 QUIET)
+
Index: x11/gnome/aisleriot/Makefile
===================================================================
RCS file: /cvs/ports/x11/gnome/aisleriot/Makefile,v
retrieving revision 1.49
diff -u -p -r1.49 Makefile
--- x11/gnome/aisleriot/Makefile 29 Jul 2022 08:27:29 -0000 1.49
+++ x11/gnome/aisleriot/Makefile 29 Jul 2022 10:05:57 -0000
@@ -33,7 +33,8 @@ LIB_DEPENDS = audio/libcanberra,-gtk3 \
BUILD_DEPENDS = shells/bash
-CONFIGURE_ARGS = -Dtheme_kde=false
+CONFIGURE_ARGS = -Dguile=2.2 \
+ -Dtheme_kde=false
# XXX horrible hack: make it possible to build when both guile and guile2 are
# installed (take precedence over -I${LOCALBASE}/include because meson reorders
Index: x11/gnome/aisleriot/patches/patch-meson_build
===================================================================
RCS file: x11/gnome/aisleriot/patches/patch-meson_build
diff -N x11/gnome/aisleriot/patches/patch-meson_build
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/gnome/aisleriot/patches/patch-meson_build 29 Jul 2022 10:05:57 -0000
@@ -0,0 +1,31 @@
+don't pick up guile version newer than specified
+
+Index: meson.build
+--- meson.build.orig
++++ meson.build
+@@ -331,16 +331,6 @@ endif
+
+ guile_req = 'guile-' + guile_version
+
+-if guile_version == '3.0'
+- guile_req_version = guile_3_0_req_version
+-elif guile_version == '2.2'
+- guile_req_version = guile_2_2_req_version
+-elif guile_version == '2.0'
+- guile_req_version = guile_2_0_req_version
+-else
+- assert(false, 'unsupported guile version')
+-endif
+-
+ ar_pkgguiledir = ar_pkglibdir / 'guile' / guile_version
+
+ # Dependencies
+@@ -349,7 +339,7 @@ cairo_dep = dependency('cairo', version: '>=' + ca
+ gio_dep = dependency('gio-2.0', version: '>=' + gio_req_version,)
+ glib_dep = dependency('glib-2.0', version: '>=' + glib_req_version,)
+ gtk_dep = dependency('gtk+-3.0', version: '>=' + gtk_req_version,)
+-guile_dep = dependency(guile_req, version: '>=' + guile_req_version,)
++guile_dep = dependency(guile_req,)
+
+ if get_option('gconf')
+ gconf_dep = dependency('gconf-2.0', version: '>=' + gconf_req_version, required: true,)
guile3.tar.gz
Description: GNU Zip compressed data
