<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3ec9a120286fb91459817ad39ab9fc757ba60ee9">https://github.com/macports/macports-ports/commit/3ec9a120286fb91459817ad39ab9fc757ba60ee9</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 3ec9a120286fb91459817ad39ab9fc757ba60ee9
</span>Author: Tomas Volf <~@wolfsden.cz>
AuthorDate: Mon Aug 12 17:18:40 2024 +0200
<span style='display:block; white-space:pre;color:#404040;'> TeXmacs: Use guile-1.8.
</span>---
editors/TeXmacs/Portfile | 6 ++---
editors/TeXmacs/files/patch-aclocal.m4.diff | 16 ++++++-------
editors/TeXmacs/files/patch-configure.in.diff | 28 +++++++++++-----------
.../files/patch-src-Scheme-Guile-guile_tm.hpp.diff | 14 -----------
4 files changed, 24 insertions(+), 40 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/TeXmacs/Portfile b/editors/TeXmacs/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b08f7de5df3..9550d0cd914 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/TeXmacs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/TeXmacs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup qt4 1.0
</span> name TeXmacs
conflicts fig2ps
version 1.99.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 6
</span> distname ${distname}-src
categories editors
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,7 +58,7 @@ checksums ${name}-${version}-src${extract.suffix} \
</span> rmd160 ae539c873f16463a3c19fcaf69fd338a1eadd7ce
depends_lib port:freetype \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:guile18 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:guile-1.8 \
</span> port:libiconv \
port:libtool \
port:texlive \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,7 +75,6 @@ post-extract { system "${extract.cmd} ${extract.pre_args} ${distpath}/${name}-ex
</span> patchfiles-append patch-Makefile.in.diff
patchfiles-append patch-aclocal.m4.diff
patchfiles-append patch-configure.in.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-src-Scheme-Guile-guile_tm.hpp.diff
</span>
use_autoconf yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -101,4 +100,3 @@ post-deactivate {
</span> livecheck.type regex
livecheck.url ${homepage}tmweb/download/sources.en.html
livecheck.regex /${name}-(\[0-9.\]+)-src${extract.suffix}">latest stable version
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/TeXmacs/files/patch-aclocal.m4.diff b/editors/TeXmacs/files/patch-aclocal.m4.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index fd5f0aef010..b21f0270dad 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/TeXmacs/files/patch-aclocal.m4.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/TeXmacs/files/patch-aclocal.m4.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,27 +6,27 @@
</span> AC_MSG_CHECKING(for Guile)
- guile-config link > /dev/null || {
- echo "configure: cannot find guile-config; is Guile installed?" 1>&2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ guile18-config link > /dev/null || {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo "configure: cannot find guile18-config; is Guile installed?" 1>&2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ guile-config-1.8 link > /dev/null || {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "configure: cannot find guile-config-1.8; is Guile installed?" 1>&2
</span> exit 1
}
- GUILE_ORIGINAL_CFLAGS="`guile-config compile`"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ GUILE_ORIGINAL_CFLAGS="`guile18-config compile`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GUILE_ORIGINAL_CFLAGS="`guile-config-1.8 compile`"
</span> GUILE_CFLAGS="$GUILE_ORIGINAL_CFLAGS"
GUILE_VARIANT_CFLAGS="$GUILE_ORIGINAL_CFLAGS $GUILE_ORIGINAL_CFLAGS/guile $GUILE_ORIGINAL_CFLAGS/libguile"
- GUILE_LDFLAGS="`guile-config link`"
- GUILE_VARIANT_LDFLAGS="-L`guile-config info libdir` -lguile -lreadline -ltermcap"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ GUILE_LDFLAGS="`guile18-config link`"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ GUILE_VARIANT_LDFLAGS="-L`guile18-config info libdir` -lguile -lreadline -ltermcap"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GUILE_LDFLAGS="`guile-config-1.8 link`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GUILE_VARIANT_LDFLAGS="-L`guile-config-1.8 info libdir` -lguile -lreadline -ltermcap"
</span> AC_SUBST(GUILE_CFLAGS)
AC_SUBST(GUILE_LDFLAGS)
AC_MSG_RESULT(yes)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28,7 +28,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,0 +28,0 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> AC_DEFUN(TEXMACS_LINK_GUILE,
[AC_TRY_LINK([
-#include <guile/gh.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <guile18/gh.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <guile/gh.h>
</span> $CONFIG_DOTS
],[
struct dummy {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/TeXmacs/files/patch-configure.in.diff b/editors/TeXmacs/files/patch-configure.in.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 989f25e5b54..5bdd5ec22bb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/TeXmacs/files/patch-configure.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/TeXmacs/files/patch-configure.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,32 +5,32 @@
</span> AC_MSG_CHECKING(version of guile)
if test -z "$GUILE_EFFECTIVE_VERSION" ; then
- GUILE_EFFECTIVE_VERSION=`guile -c '(display (version))'`
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ GUILE_EFFECTIVE_VERSION=`guile18 -c '(display (version))'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GUILE_EFFECTIVE_VERSION=`guile-1.8 -c '(display (version))'`
</span> fi
AC_MSG_RESULT($GUILE_EFFECTIVE_VERSION)
AC_MSG_CHECKING(guile data path)
if test -z "$GUILE_DATA_PATH" ; then
- GUILE_DATA_PATH=`guile-config info pkgdatadir`
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ GUILE_DATA_PATH=`guile18-config info pkgdatadir`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GUILE_DATA_PATH=`guile-config-1.8 info pkgdatadir`
</span> fi
AC_MSG_RESULT($GUILE_DATA_PATH)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> @@ -596,14 +596,15 @@
#--------------------------------------------------------------------
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> AC_MSG_CHECKING(whether ... arguments behave correctly)
+SAVE_CXXFLAGS="$CXXFLAGS"
if test -z "$GUILE_CFLAGS"; then
- CXXFLAGS="`guile-config compile`"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CXXFLAGS="`guile18-config compile`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CXXFLAGS="`guile-config-1.8 compile`"
</span> else
CXXFLAGS="$GUILE_CFLAGS"
fi
AC_TRY_COMPILE([
- #include <guile/gh.h>
- #include <libguile.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #include <guile18/gh.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #include <libguile18.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #include <guile/gh.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #include <libguile.h>
</span> typedef SCM (*FN)(...);
static SCM identity (SCM x) { return x; }
void declare () { gh_new_procedure ("identity", (FN) identity, 1, 0, 0); }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,19 +39,19 @@
</span> AC_MSG_RESULT(no)
])
-CXXFLAGS=""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> AC_MSG_CHECKING(the size_t of guile strings)
if test -z "$GUILE_CFLAGS"; then
- CXXFLAGS="`guile-config compile`"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CXXFLAGS="`guile18-config compile`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CXXFLAGS="`guile-config-1.8 compile`"
</span> else
CXXFLAGS="$GUILE_CFLAGS"
fi
AC_TRY_COMPILE([
- #include <guile/gh.h>
- #include <libguile.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #include <guile18/gh.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #include <libguile18.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #include <guile/gh.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #include <libguile.h>
</span> void print_string (SCM s) {
int len_r;
char* r= gh_scm2newstr (s, &len_r); }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,13 +61,13 @@
</span> ])
-CXXFLAGS=""
+CXXFLAGS="$SAVE_CXXFLAGS"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> AC_MSG_CHECKING([if statically linking with guile works])
SAVE_CPPFLAGS="$CPPFLAGS"
@@ -1178,6 +1178,7 @@
STD_DEBUG_FLAGS=""
fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> +SAVE_CXXFLAGS="$CXXFLAGS"
AC_MSG_CHECKING(if compiler supports $STD_DEBUG_FLAGS)
CXXFLAGS="$STD_DEBUG_FLAGS"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,5 +79,5 @@
</span> -CXXFLAGS=""
+CXXFLAGS="$SAVE_CXXFLAGS"
AC_SUBST(CONFIG_CXXDIALECT)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> AC_ARG_ENABLE(profile,
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/TeXmacs/files/patch-src-Scheme-Guile-guile_tm.hpp.diff b/editors/TeXmacs/files/patch-src-Scheme-Guile-guile_tm.hpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c21382a6310..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/TeXmacs/files/patch-src-Scheme-Guile-guile_tm.hpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Scheme/Guile/guile_tm.hpp.orig 2014-03-03 05:44:14.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Scheme/Guile/guile_tm.hpp 2015-03-29 20:19:29.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -37,9 +37,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif // __MINGW32__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(GUILE_D) || defined(GUILE_C)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <libguile.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <libguile18.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <guile/gh.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <guile18/gh.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef __MINGW32__
</span></pre><pre style='margin:0'>
</pre>