<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3fdcfce7ec62d1989fd1ac92f3424cb0a7230980">https://github.com/macports/macports-ports/commit/3fdcfce7ec62d1989fd1ac92f3424cb0a7230980</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 3fdcfce xfce: Fix ports to use MP's perl 5.28 during build
</span>3fdcfce is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3fdcfce7ec62d1989fd1ac92f3424cb0a7230980
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Sun Apr 21 14:13:29 2019 +0100
<span style='display:block; white-space:pre;color:#404040;'> xfce: Fix ports to use MP's perl 5.28 during build
</span>---
xfce/Thunar/Portfile | 8 ++++++--
xfce/libxfce4ui/Portfile | 14 +++++++++-----
xfce/xfce4-appfinder/Portfile | 6 ++++++
xfce/xfce4-panel/Portfile | 10 +++++++---
xfce/xfce4-session/Portfile | 11 ++++++++---
xfce/xfce4-settings/Portfile | 8 +++++++-
xfce/xfce4-terminal/Portfile | 8 ++++++--
xfce/xfdesktop/Portfile | 9 +++++++--
8 files changed, 56 insertions(+), 18 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/xfce/Thunar/Portfile b/xfce/Thunar/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3161d62..6903550 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/xfce/Thunar/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/xfce/Thunar/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,6 +4,7 @@ PortSystem 1.0
</span>
name Thunar
version 1.6.16
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> set branch [join [lrange [split ${version} .] 0 1] .]
categories xfce
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,10 +21,13 @@ checksums rmd160 2af84abd40c210478b7626860f94b25b7de8218c \
</span> sha256 cb9fc2a8005494124a8d412eff7d7cb8032f7ff91b3d254fcff2d0a0d2790d20 \
size 1977562
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Needed for intltool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.perl ${prefix}/bin/perl5.28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args --enable-dbus --enable-startup-notification \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-pcre --enable-exif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-pcre --enable-exif INTLTOOL_PERL=${configure.perl}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:intltool port:pkgconfig port:p5.26-xml-parser
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:intltool port:pkgconfig
</span> depends_lib port:exo port:pcre port:libexif \
port:shared-mime-info port:desktop-file-utils \
port:startup-notification
<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 3a8c695..ddbbec4 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;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name libxfce4ui
version 4.12.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> set branch [join [lrange [split ${version} .] 0 1] .]
categories xfce
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,9 +19,12 @@ checksums md5 ea9fad7d059fe8f531fe8db42dabb5a9 \
</span> sha1 ef687867bd087b5fc2befee0e8ca1a281f6bf165 \
sha256 3d619811bfbe7478bb984c16543d980cadd08586365a7bc25e59e3ca6384ff43
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Needed for intltool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.perl ${prefix}/bin/perl5.28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build port:intltool \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:p5.26-xml-parser
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib port:gtk2 \
port:gtk3 \
port:libxfce4util \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,8 +32,9 @@ depends_lib port:gtk2 \
</span> port:libglade2 \
port:startup-notification
<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 --disable-gladeui INTLTOOL_PERL=${configure.perl}
</span>
platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --disable-visibility
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --disable-visibility
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/xfce/xfce4-appfinder/Portfile b/xfce/xfce4-appfinder/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9f0cd6e..3a4c882 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/xfce/xfce4-appfinder/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/xfce/xfce4-appfinder/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,6 +4,7 @@ PortSystem 1.0
</span>
name xfce4-appfinder
version 4.12.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> set branch [join [lrange [split ${version} .] 0 1] .]
categories xfce
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,3 +21,8 @@ checksums md5 0b238b30686388c507c119b12664f1a1 \
</span>
depends_build port:intltool port:xfce4-dev-tools port:pkgconfig
depends_lib port:libxfce4ui port:garcon port:Thunar
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Needed for intltool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.perl ${prefix}/bin/perl5.28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args INTLTOOL_PERL=${configure.perl}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/xfce/xfce4-panel/Portfile b/xfce/xfce4-panel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 86cb88f..d677ddc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/xfce/xfce4-panel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/xfce/xfce4-panel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,6 +4,7 @@ PortSystem 1.0
</span>
name xfce4-panel
version 4.12.2
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> set branch [join [lrange [split ${version} .] 0 1] .]
categories xfce
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,16 +20,19 @@ checksums sha256 42058abb81b8f87691d3999627447de71c3285bcf055f308aab5cefa
</span> rmd160 a336fe70ee27a36880e8004d94cf31a3315b62fd \
size 1167175
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Needed for intltool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.perl ${prefix}/bin/perl5.28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build port:intltool \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:p5.26-xml-parser
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib port:libxfce4ui \
port:exo \
path:lib/pkgconfig/cairo.pc:cairo \
port:libwnck \
port:garcon
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --disable-gtk3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --disable-gtk3 INTLTOOL_PERL=${configure.perl}
</span>
platform darwin {
configure.args-append --disable-visibility
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/xfce/xfce4-session/Portfile b/xfce/xfce4-session/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3a5cf97..6e64859 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/xfce/xfce4-session/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/xfce/xfce4-session/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name xfce4-session
version 4.12.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> set branch [join [lrange [split ${version} .] 0 1] .]
categories xfce
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,12 +22,17 @@ checksums sha256 97d7f2a2d0af7f3623b68d1f04091e02913b28f9555dab8b0d26c8a1
</span>
patchfiles patch-sleep.diff patch-launchd.diff
use_autoconf yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # need config.h.in, using autoreconf fails for some reason
pre-configure { system -W ${worksrcpath} "autoheader" }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --with-xsession-prefix=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Needed for intltool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.perl ${prefix}/bin/perl5.28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --with-xsession-prefix=${prefix} INTLTOOL_PERL=${configure.perl}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:intltool port:xfce4-dev-tools port:pkgconfig
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:intltool port:xfce4-dev-tools port:pkgconfig port:p5.26-xml-parser
</span> depends_lib port:libxfce4util port:libxfce4ui \
port:libwnck bin:iceauth:iceauth
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/xfce/xfce4-settings/Portfile b/xfce/xfce4-settings/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 93f2e6f..65b2976 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/xfce/xfce4-settings/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/xfce/xfce4-settings/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,6 +4,7 @@ PortSystem 1.0
</span>
name xfce4-settings
version 4.12.4
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> set branch [join [lrange [split ${version} .] 0 1] .]
categories xfce
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,9 +20,14 @@ checksums sha256 e2a04cad48bf9e951409d0c841829fa3b4ce632cd799082ef82d0506
</span> rmd160 34ef7b65073f05d6077759405b50ceb98704be0b \
size 1036773
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:intltool port:xfce4-dev-tools port:pkgconfig port:p5.26-xml-parser
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Needed for intltool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.perl ${prefix}/bin/perl5.28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:intltool port:xfce4-dev-tools port:pkgconfig
</span> depends_lib port:libxfce4ui port:exo port:libwnck port:xorg-libXrandr port:garcon
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args INTLTOOL_PERL=${configure.perl}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> platform darwin 8 {
patchfiles-append patch-configure.diff
if {[vercmp [macports_version] 2.5.99] >= 0} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/xfce/xfce4-terminal/Portfile b/xfce/xfce4-terminal/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 27a9eea..00a0af9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/xfce/xfce4-terminal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/xfce/xfce4-terminal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,6 +4,7 @@ PortSystem 1.0
</span>
name xfce4-terminal
version 0.6.92
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> set branch [join [lrange [split ${version} .] 0 1] .]
categories xfce
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,12 +22,15 @@ checksums sha256 62140f8956d9c9aa4d483cf6cfbf6d76749b0f1feb47fa8413f0972e
</span> rmd160 049b4cd7d6e14ff2be46426f11718c8bddc9f6e4 \
size 854899
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:intltool port:pkgconfig port:p5.26-xml-parser
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Needed for intltool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.perl ${prefix}/bin/perl5.28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:intltool port:pkgconfig
</span> depends_lib port:exo port:vte-gtk2-xfce port:dbus port:gtk2 \
path:lib/pkgconfig/glib-2.0.pc:glib2 port:hicolor-icon-theme \
port:desktop-file-utils port:vte port:libxfce4ui
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --enable-dbus
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --enable-dbus INTLTOOL_PERL=${configure.perl}
</span>
post-activate {
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/xfce/xfdesktop/Portfile b/xfce/xfdesktop/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 32fabf6..833bc2e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/xfce/xfdesktop/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/xfce/xfdesktop/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,6 +4,7 @@ PortSystem 1.0
</span>
name xfdesktop
version 4.12.4
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> set branch [join [lrange [split ${version} .] 0 1] .]
categories xfce
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,5 +24,9 @@ depends_lib port:libxml2 \
</span> port:Thunar port:libxfce4ui
depends_build port:xfce4-panel port:libglade2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:intltool port:xfce4-dev-tools port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:p5.26-xml-parser
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:intltool port:xfce4-dev-tools port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Needed for intltool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.perl ${prefix}/bin/perl5.28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args INTLTOOL_PERL=${configure.perl}
</span></pre><pre style='margin:0'>
</pre>