<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f54e8d48523e404d2f9613a06c1af87c98437911">https://github.com/macports/macports-ports/commit/f54e8d48523e404d2f9613a06c1af87c98437911</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f54e8d48523e404d2f9613a06c1af87c98437911
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sun Jun 28 08:45:30 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> Move tools-specific configure flags to main subport
</span>---
devel/gettext/Portfile | 36 +++++++++++++++++++-----------------
1 file changed, 19 insertions(+), 17 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gettext/Portfile b/devel/gettext/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 329f4055a59..761e96739fb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/gettext/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/gettext/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,22 +45,9 @@ if {${subport} ne "libtextstyle"} {
</span> configure.args-append \
--disable-csharp \
--disable-java \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-openmp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-emacs \
</span> --with-included-gettext \
--with-included-glib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-included-libcroco \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-included-libunistring \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-included-libxml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Don't use possibly installed cvs or git to create the autopoint archive
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # because the archives they create for each architecture under muniversal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # will differ and cannot be merged. Don't use xz either because then xz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # would be required by various ports that just want to use gettext.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-cvs \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-git \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-xz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-included-libcroco
</span> }
test.run yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -118,9 +105,24 @@ if {${subport} eq ${name}} {
</span>
worksrcdir ${distname}/gettext-tools
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # disable libasprintf to make test lang-c++ check not fail
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-installed-libtextstyle \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-libasprintf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --disable-openmp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-included-libunistring \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-included-libxml \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-installed-libtextstyle \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-emacs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Don't use possibly installed cvs or git to create the autopoint
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # archive because the archives they create for each architecture
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # under muniversal will differ and cannot be merged.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --without-cvs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-git
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Don't use xz because then xz would be required by various ports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # that just want to use gettext.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --without-xz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Disable libasprintf to make the lang-c++ test not fail.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --disable-libasprintf
</span>
# The gettext-tools installation also installs libintl again. Here
# I remove the libintl parts because they are provided by the runtime
</pre><pre style='margin:0'>
</pre>