<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/46e03c4a3a0ca17734ea0d8a77a414c9e0c43eed">https://github.com/macports/macports-ports/commit/46e03c4a3a0ca17734ea0d8a77a414c9e0c43eed</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 46e03c4a3a0ca17734ea0d8a77a414c9e0c43eed
</span>Author: Timo Früh <timo.frueh@icloud.com>
AuthorDate: Sun Dec 3 20:04:43 2023 +0100
<span style='display:block; white-space:pre;color:#404040;'> gettext: Update to version 0.22.4
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Update version number
</span><span style='display:block; white-space:pre;color:#404040;'> * Update checksums
</span><span style='display:block; white-space:pre;color:#404040;'> * Update to new build process
</span><span style='display:block; white-space:pre;color:#404040;'> * Build the whole of gettext in gettext and gettext-tools-libs, but
</span><span style='display:block; white-space:pre;color:#404040;'> only install the correct files for either port
</span><span style='display:block; white-space:pre;color:#404040;'> * This is due to 'gettext-tools' not being buildable without building
</span><span style='display:block; white-space:pre;color:#404040;'> 'gettext-runtime' first
</span><span style='display:block; white-space:pre;color:#404040;'> * Add ncurses as build dependency for gettext and gettext-tools-libs
</span><span style='display:block; white-space:pre;color:#404040;'> because libtextstyle is built again when building gettext and
</span><span style='display:block; white-space:pre;color:#404040;'> gettext-tools-libs
</span><span style='display:block; white-space:pre;color:#404040;'> * Remove deactivate hack
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/68030
</span>---
devel/gettext/Portfile | 60 +++++++++++++++++---------------------------------
1 file changed, 20 insertions(+), 40 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 46f76fcec0d..0645375bf93 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;'>@@ -6,10 +6,10 @@ PortGroup muniversal 1.0
</span> PortGroup clang_dependency 1.0
name gettext
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.21.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 fbdfec7f0be090da26f9864be03c4565a3dc0d6a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e8c3650e1d8cee875c4f355642382c1df83058bd5a11ee8555c0cf276d646d45 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 25248473
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.22.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 4d022f548b14338d0515e82bfd6c66ba2c54c276 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c1e0bb2a4427a9024390c662cd532d664c4b36b8ff444ed5e54b115fdb7a1aea \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 26753319
</span>
categories devel
maintainers {ryandesign @ryandesign}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -149,17 +149,12 @@ subport ${name}-tools-libs {
</span> long_description ${subport} provides the required libraries \
for tools like msgfmt from gettext
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:ncurses
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib-append port:libiconv \
port:libtextstyle \
port:gettext-runtime
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Set configure.dir and build.dir rather than worksrcdir so that the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # muniversal portgroup will copy the entire worksrcdir and not just
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # this subdirectory, because the build compiles files outside of this
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # directory and we need separate builds of everything for each arch.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.dir ${worksrcpath}/${name}-tools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.dir ${configure.dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args-append --disable-openmp \
--with-included-libunistring \
--with-included-libxml \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -182,29 +177,18 @@ subport ${name}-tools-libs {
</span> # https://savannah.gnu.org/bugs/?58669
configure.args-append --disable-libasprintf
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Install from the tools subpackage, so that only its files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # are installed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.dir ${worksrcpath}/${name}-tools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Remove the executables and the libraries provided
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # by the runtime. Just leave the libraries and headers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # for the tools.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete {*}[glob ${destroot}${prefix}/*/libintl.*] \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {*}[glob ${destroot}${prefix}/bin/*] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Remove the executables provided by the gettext subport.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Just leave the libraries and headers for the tools.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete {*}[glob ${destroot}${prefix}/bin/*] \
</span> {*}[glob ${destroot}${prefix}/share/*]
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${subport} in "${name}-runtime ${name}-tools-libs libasprintf"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-activate {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # gettext < 0.20 installed files now installed by gettext-runtime and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # libasprintf. This deactivate hack can be removed after 2022-11-29.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![catch {set installed [lindex [registry_active gettext] 0]}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set installed_version [lindex ${installed} 1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${installed_version} 0.20] < 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- registry_deactivate_composite gettext "" [list ports_nodepcheck 1]
</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;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {${subport} eq ${name}} {
epoch 2
revision 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -220,6 +204,8 @@ 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_build-append port:ncurses
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib-append port:libiconv \
port:libtextstyle \
port:gettext-runtime \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -227,13 +213,6 @@ if {${subport} eq ${name}} {
</span>
installs_libs no
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Set configure.dir and build.dir rather than worksrcdir so that the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # muniversal portgroup will copy the entire worksrcdir and not just
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # this subdirectory, because the build compiles files outside of this
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # directory and we need separate builds of everything for each arch.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.dir ${worksrcpath}/${name}-tools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.dir ${configure.dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args-append --disable-openmp \
--with-included-libunistring \
--with-included-libxml \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -256,14 +235,15 @@ if {${subport} eq ${name}} {
</span> # https://savannah.gnu.org/bugs/?58669
configure.args-append --disable-libasprintf
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Install from the tools subpackage, so that only its files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # are installed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.dir ${worksrcpath}/${name}-tools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Remove files already installed by gettext-runtime.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://savannah.gnu.org/bugs/?58669
</span> # Remove the libraries and headers which are provided
# by gettext-tools-libs
delete {*}[glob ${destroot}${prefix}/lib/*] \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- {*}[glob ${destroot}${prefix}/include/*] \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/share/locale/locale.alias
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {*}[glob ${destroot}${prefix}/include/*]
</span> }
livecheck.type regex
</pre><pre style='margin:0'>
</pre>