<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/baf0c8bd508912bfedaf58c40dba1a402ffdf2ed">https://github.com/macports/macports-ports/commit/baf0c8bd508912bfedaf58c40dba1a402ffdf2ed</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit baf0c8bd508912bfedaf58c40dba1a402ffdf2ed
</span>Author: Friedrich Beckmann <friedrich.beckmann@gmx.de>
AuthorDate: Sun Sep 6 15:52:35 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> split gettext and gettext-tools-libs
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The subport gettext-tools-libs provides the libraries for the
</span><span style='display:block; white-space:pre;color:#404040;'> gettext tools like msgfmt which are und GPL+3 license. The
</span><span style='display:block; white-space:pre;color:#404040;'> gettext tools port can now be marked "installslibs no".
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> If a package which has a license not compatible with GPL+3, then
</span><span style='display:block; white-space:pre;color:#404040;'> it can still use the gettext tools unless it does not link to
</span><span style='display:block; white-space:pre;color:#404040;'> the gettext libraries.
</span>---
devel/gettext/Portfile | 64 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 62 insertions(+), 2 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 724fa643277..64b51e68eec 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;'>@@ -120,6 +120,60 @@ subport ${name}-runtime {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${name}-tools-libs {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ license GPL-3+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description GNU internationalization (i18n) and \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ localization (l10n) tools libraries
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description ${subport} provides the required libraries \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for tools like msgfmt from gettext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:libiconv \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libtextstyle \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gettext-runtime
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Set configure.dir and build.dir rather than worksrcdir so that the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # muniversal portgroup will copy the entire worksrcdir and not just
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # this subdirectory, because the build compiles files outside of this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # directory and we need separate builds of everything for each arch.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.dir ${worksrcpath}/${name}-tools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.dir ${configure.dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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;'>+ # Prevent the lang-c++ test from failing.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # TODO: report this to the developers; there's no reason why
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # libasprintf should be getting built again. Might be the same as
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://savannah.gnu.org/bugs/?58669
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --disable-libasprintf
</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 executables and the libraries provided
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # by the runtime. Just leave the libraries and headers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # for the tools.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete {*}[glob ${destroot}${prefix}/*/libintl.*] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {*}[glob ${destroot}${prefix}/bin/*] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {*}[glob ${destroot}${prefix}/share/*]
</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;'>+
</span> if {${subport} in "${name}-runtime libasprintf"} {
pre-activate {
# gettext < 0.20 installed files now installed by gettext-runtime and
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -150,7 +204,10 @@ if {${subport} eq ${name}} {
</span>
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:#e0ffe0;'>+ port:gettext-runtime \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gettext-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>
# Set configure.dir and build.dir rather than worksrcdir so that the
# muniversal portgroup will copy the entire worksrcdir and not just
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -184,7 +241,10 @@ if {${subport} eq ${name}} {
</span> post-destroot {
# Remove files already installed by gettext-runtime.
# https://savannah.gnu.org/bugs/?58669
<span style='display:block; white-space:pre;background:#ffe0e0;'>- delete {*}[glob ${destroot}${prefix}/*/libintl.*] \
</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> ${destroot}${prefix}/share/locale/locale.alias
}
</pre><pre style='margin:0'>
</pre>