<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3020760de1466afb2e7285f57f359f9f33b7dfde">https://github.com/macports/macports-ports/commit/3020760de1466afb2e7285f57f359f9f33b7dfde</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 3020760de14 jed: Fix x11 variant; cleanup
</span>3020760de14 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3020760de1466afb2e7285f57f359f9f33b7dfde
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Wed Apr 24 17:20:39 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> jed: Fix x11 variant; cleanup
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> In x11 variant, add xorg-libXt dependency for <X11/Intrinsic.h> and add
</span><span style='display:block; white-space:pre;color:#404040;'> pkgconfig dependency so it can find <ft2build.h>.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Remove x11 variant description which overrode the default one.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Move the part of the post-destroot block that was specific to the x11
</span><span style='display:block; white-space:pre;color:#404040;'> variant into the x11 variant code.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Explicitly disable features that the configure script searches for.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add a patch to ensure gtk2 isn't used, since no other way to do so could
</span><span style='display:block; white-space:pre;color:#404040;'> be found.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Modernize checksums.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Remove platforms darwin which is the default.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Remove -L${prefix}/lib from configure.cppflags which doesn't go there.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/69754
</span>---
editors/jed/Portfile | 38 ++++++++++++++++++++++++--------------
editors/jed/files/no-gtk.patch | 34 ++++++++++++++++++++++++++++++++++
2 files changed, 58 insertions(+), 14 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/jed/Portfile b/editors/jed/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1ea642ed4cf..15de2c7b2ff 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/jed/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/jed/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,9 +3,12 @@ PortSystem 1.0
</span> name jed
version 0.99-19
revision 1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 c6182d918322c30922f7590c7e8b15a1da0ba22f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 97a339ce2fb0a446767ee550786e6914fa2e8cdbad39a402e48368cd0d6b5763 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 884198
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories editors
license GPL-2+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> maintainers nomaintainer
description JED is a powerful editor for programmers.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,25 +25,22 @@ master_sites ftp://space.mit.edu/pub/davis/jed/v0.99/ \
</span> ftp://space.mit.edu/pub/davis/jed/v0.99/old/
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 c9b2f58a3defc6f61faa1ce7d6d629ea \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 7783ac9035c7221575e74b544902151309d0d0ef \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 c6182d918322c30922f7590c7e8b15a1da0ba22f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_lib port:slang2
patchfiles patch-pty.c \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ no-gtk.patch \
</span> patch-unix.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --mandir=${prefix}/share/man \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-slang=${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cppflags-append -L${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --disable-gpm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-xft \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --mandir=${prefix}/share/man \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-slang=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.env JED_ROOT=${prefix}/share/jed
destroot {
xinstall ${worksrcpath}/src/objs/jed ${destroot}${prefix}/bin
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset x11]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall ${worksrcpath}/src/objs/xjed ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span>
xinstall ${worksrcpath}/doc/manual/jed.1 ${destroot}${prefix}/share/man/man1/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,10 +66,20 @@ destroot {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant x11 description {Build xjed} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:Xft2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant x11 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append path:bin/pkg-config:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:Xft2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --disable-xft --enable-xft \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-x --with-x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build.target-append xjed
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall ${worksrcpath}/src/objs/xjed ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
livecheck.type regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/jed/files/no-gtk.patch b/editors/jed/files/no-gtk.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..93a842055eb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/jed/files/no-gtk.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Disable gtk2 support by deleting all references to the gtk+-2.0.pc pkg-config file.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/jedsoft/jed/issues/11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2009-12-13 20:12:55.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2024-04-24 17:14:41.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11773,7 +11773,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test -n "$PKG_CONFIG" && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.8.0\"") >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.8.0") 2>&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_status=$?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (exit $ac_status); }; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11791,7 +11791,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test -n "$PKG_CONFIG" && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.8.0\"") >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.8.0") 2>&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_status=$?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (exit $ac_status); }; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11813,11 +11813,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _pkg_short_errors_supported=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test $_pkg_short_errors_supported = yes; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= 2.8.0"`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= 2.8.0"`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Put the nasty error message in config.log where it belongs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "$GTK_PKG_ERRORS" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>