<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b2f8526a81cde21ae5c8aff816f995766aa37a4b">https://github.com/macports/macports-ports/commit/b2f8526a81cde21ae5c8aff816f995766aa37a4b</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 b2f8526a81c xbill: Use gtk2 instead of Athena widgets
</span>b2f8526a81c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b2f8526a81cde21ae5c8aff816f995766aa37a4b
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sat Mar 19 23:27:43 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> xbill: Use gtk2 instead of Athena widgets
</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/64858
</span>---
games/xbill/Portfile | 17 +++++++-----
games/xbill/files/Makefile.in.patch | 1 +
games/xbill/files/gtk.patch | 52 +++++++++++++++++++++++++++++++++++++
3 files changed, 64 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/xbill/Portfile b/games/xbill/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c80f6996be9..9a9406ddcc8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/xbill/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/xbill/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> PortSystem 1.0
name xbill
version 2.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> checksums md5 585e4866b15255a24203db9959407b2f \
rmd160 1d8a680f45775e7c840b4fe12cd21a439d41b2dc \
sha256 0efdfff1ce2df70b7a15601cb488cd7b2eb918d21d78e877bd773f112945608d \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,12 +25,17 @@ homepage http://www.xbill.org/
</span>
master_sites ${homepage}download/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:xorg-libXaw
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:gtk2
</span>
patchfiles implicit.patch \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ gtk.patch \
</span> Makefile.in.patch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env X_PRE_LIBS=-lXpm
</span><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;'>- --localstatedir=${prefix}/share \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-motif --disable-gtk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --disable-athena \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-motif \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-gtk \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --localstatedir=${prefix}/share \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --mandir=${prefix}/share/man \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-x
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/xbill/files/Makefile.in.patch b/games/xbill/files/Makefile.in.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 6ffefada024..1a474fa3922 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/xbill/files/Makefile.in.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/xbill/files/Makefile.in.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,3 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Make sure everything has been built before trying to install it.
</span> --- Makefile.in.orig 2001-10-30 12:31:09.000000000 -0600
+++ Makefile.in 2022-03-19 22:25:27.000000000 -0500
@@ -80,7 +80,7 @@
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/xbill/files/gtk.patch b/games/xbill/files/gtk.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..fc0140bc26e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/xbill/files/gtk.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,52 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Find gtk2 using pkg-config not gtk-config. gtk-config no longer exists.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2001-10-16 22:16:48.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2022-03-19 23:04:14.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2506,46 +2506,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "$enable_gtk" != "no"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Extract the first word of "gtk-config", so it can be a program name with args.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set dummy gtk-config; ac_word=$2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-echo "configure:2512: checking for $ac_word" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if eval "test \"`echo '$''{'ac_cv_prog_GTKCONFIG'+set}'`\" = set"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo $ac_n "(cached) $ac_c" 1>&6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test -n "$GTKCONFIG"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ac_cv_prog_GTKCONFIG="$GTKCONFIG" # Let the user override the test.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ac_dummy="$PATH"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for ac_dir in $ac_dummy; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- test -z "$ac_dir" && ac_dir=.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test -f $ac_dir/$ac_word; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ac_cv_prog_GTKCONFIG="yes"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- IFS="$ac_save_ifs"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- test -z "$ac_cv_prog_GTKCONFIG" && ac_cv_prog_GTKCONFIG="no"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-GTKCONFIG="$ac_cv_prog_GTKCONFIG"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if test -n "$GTKCONFIG"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo "$ac_t""$GTKCONFIG" 1>&6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo "$ac_t""no" 1>&6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test "X$GTKCONFIG" = X"yes"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat >> confdefs.h <<\EOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define USE_GTK 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- GTK_CFLAGS="`gtk-config --cflags`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- WIDGET_LIBS="$WIDGET_LIBS `gtk-config --libs`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GTK_CFLAGS="`pkg-config gtk+-2.0 --cflags`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ WIDGET_LIBS="$WIDGET_LIBS `pkg-config gtk+-2.0 --libs`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WIDGET_OBJS="$WIDGET_OBJS gtk.o"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>