<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/90ecc09d73562f089e8a80d7a2b182af7f9c4bf8">https://github.com/macports/macports-ports/commit/90ecc09d73562f089e8a80d7a2b182af7f9c4bf8</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 90ecc09d73562f089e8a80d7a2b182af7f9c4bf8
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Sat Apr 27 20:00:13 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> libxfce4ui: fix configure options, revbump
</span>---
xfce/libxfce4ui/Portfile | 15 +++--
.../files/remove-intltool-perl-hack.diff | 78 ----------------------
2 files changed, 8 insertions(+), 85 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/xfce/libxfce4ui/Portfile b/xfce/libxfce4ui/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 832566f4cb5..f49f5fa5ab4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/xfce/libxfce4ui/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/xfce/libxfce4ui/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span>
name libxfce4ui
version 4.18.6
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,17 +21,18 @@ master_sites https://archive.xfce.org/src/xfce/${name}/${branch}/
</span> use_bzip2 yes
depends_build port:intltool \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ bin:perl:perl5 \
</span> port:pkgconfig \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- bin:perl:perl5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bin:vala:vala
</span>
depends_lib path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
port:libxfce4util \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xfconf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:startup-notification
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:startup-notification \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xfconf
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles remove-intltool-perl-hack.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --disable-gladeui
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-gladeui2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-vala
</span>
configure.cflags-append -std=c99
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/xfce/libxfce4ui/files/remove-intltool-perl-hack.diff b/xfce/libxfce4ui/files/remove-intltool-perl-hack.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6d56462aa6d..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/xfce/libxfce4ui/files/remove-intltool-perl-hack.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,78 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2015-03-16 05:14:47.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2021-11-29 23:51:03.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7286,75 +7286,7 @@ if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# Extract the first word of "perl", so it can be a program name with args.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set dummy perl; ac_word=$2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--printf %s "checking for $ac_word... " >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if test ${ac_cv_path_INTLTOOL_PERL+y}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- printf %s "(cached) " >&6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--else case e in #(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- e) case $INTLTOOL_PERL in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [\\/]* | ?:[\\/]*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- *)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--for as_dir in $PATH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- IFS=$as_save_IFS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- case $as_dir in #(((
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- '') as_dir=./ ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- */) ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- *) as_dir=$as_dir/ ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for ac_exec_ext in '' $ac_executable_extensions; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ac_cv_path_INTLTOOL_PERL="$as_dir$ac_word$ac_exec_ext"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- break 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--IFS=$as_save_IFS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--esac ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if test -n "$INTLTOOL_PERL"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--printf "%s\n" "$INTLTOOL_PERL" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--printf "%s\n" "no" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if test -z "$INTLTOOL_PERL"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- as_fn_error $? "perl not found" "$LINENO" 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--printf %s "checking for perl >= 5.8.1... " >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if test $? -ne 0; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--printf "%s\n" "$IT_PERL_VERSION" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if test "x" != "xno-xml"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--printf %s "checking for XML::Parser... " >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--printf "%s\n" "ok" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- as_fn_error $? "XML::Parser perl module is required for intltool" "$LINENO" 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Substitute ALL_LINGUAS so we can use it in po/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>\ No newline at end of file
</pre><pre style='margin:0'>
</pre>