<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/0f47aa4ecc653c6fe1ccd6c17a8f64900ecec57e">https://github.com/macports/macports-ports/commit/0f47aa4ecc653c6fe1ccd6c17a8f64900ecec57e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0f47aa4ecc653c6fe1ccd6c17a8f64900ecec57e
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Mon Jan 29 05:03:41 2024 -0600
<span style='display:block; white-space:pre;color:#404040;'> gettext: Merge code for gettext and gettext-tools-libs subports
</span>---
devel/gettext/Portfile | 77 +++++++++++++++-----------------------------------
1 file changed, 23 insertions(+), 54 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 2e862a1cea4..088308e456c 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;'>@@ -137,46 +137,12 @@ subport ${name}-runtime {
</span> subport ${name}-tools-libs {
revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- license GPL-3+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> description GNU internationalization (i18n) and \
localization (l10n) tools libraries
long_description ${subport} provides the required libraries \
for tools like msgfmt from gettext
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:ncurses
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:libiconv \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libtextstyle \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gettext-runtime
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --disable-openmp \
</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;'>- --with-installed-libtextstyle \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-emacs
</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
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # archive because the archives they create for each architecture
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # under muniversal will differ and cannot be merged.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --without-cvs \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-git
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Don't use xz because then xz would be required by various ports
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # that just want to use gettext.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --without-xz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Prevent the lang-c++ test from failing.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # TODO: report this to the developers; there's no reason why
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # libasprintf should be getting built again. Might be the same as
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://savannah.gnu.org/bugs/?58669
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --disable-libasprintf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Install from the tools subpackage, so that only its files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # are installed.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.dir ${worksrcpath}/${name}-tools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-destroot {
# Remove the executables provided by the gettext subport.
# Just leave the libraries and headers for the tools.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -189,8 +155,6 @@ if {${subport} eq ${name}} {
</span> epoch 2
revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- license GPL-3+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> description GNU internationalization (i18n) and \
localization (l10n) tools
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -200,14 +164,32 @@ if {${subport} eq ${name}} {
</span> gettext. The runtime library libintl is in \
the separate gettext-runtime port.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${name}-tools-libs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ installs_libs no
</span><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;'>+ # Remove the libraries and headers which are provided
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # by gettext-tools-libs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete {*}[glob ${destroot}${prefix}/lib/*] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {*}[glob ${destroot}${prefix}/include/*]
</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;'>+ livecheck.type regex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.url https://ftp.gnu.org/gnu/gettext/?C=M&O=D
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.regex ${name}-(\[0-9.\]+)\\.tar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.type none
</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 {${subport} in [list ${name} ${name}-tools-libs]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ license GPL-3+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append port:ncurses
depends_lib-append port:libiconv \
port:libtextstyle \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gettext-runtime \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gettext-tools-libs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- installs_libs no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${name}-runtime
</span>
configure.args-append --disable-openmp \
--with-included-libunistring \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -233,18 +215,5 @@ if {${subport} eq ${name}} {
</span>
# Install from the tools subpackage, so that only its files
# are installed.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.dir ${worksrcpath}/${name}-tools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Remove the libraries and headers which are provided
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # by gettext-tools-libs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete {*}[glob ${destroot}${prefix}/lib/*] \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {*}[glob ${destroot}${prefix}/include/*]
</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;'>- livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.url https://ftp.gnu.org/gnu/gettext/?C=M&O=D
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.regex ${name}-(\[0-9.\]+)\\.tar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.dir ${worksrcpath}/${name}-tools
</span> }
</pre><pre style='margin:0'>
</pre>