<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/fea008a043ad2b96fd1ee872d7b2152de8210614">https://github.com/macports/macports-ports/commit/fea008a043ad2b96fd1ee872d7b2152de8210614</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit fea008a043ad2b96fd1ee872d7b2152de8210614
</span>Author: Friedrich Beckmann <friedrich.beckmann@gmx.de>
AuthorDate: Wed Jun 10 22:40:01 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> gettext: update to 0.20.2 with runtime and tools split
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - Update to upstream version 0.20.2
</span><span style='display:block; white-space:pre;color:#404040;'> - Added two subports gettext-runtime and gettext-libtextstyle
</span><span style='display:block; white-space:pre;color:#404040;'> - Removed the gettext-bootstrap subport
</span><span style='display:block; white-space:pre;color:#404040;'> - Removed the myprefix construction
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The gettext port can now install just the libintl library via
</span><span style='display:block; white-space:pre;color:#404040;'> the gettext-runtime subport. The gettext tools like msgfmt are
</span><span style='display:block; white-space:pre;color:#404040;'> installed via the gettext port. The tools have a dependency
</span><span style='display:block; white-space:pre;color:#404040;'> libtextstyle which is also added via a subport. I removed
</span><span style='display:block; white-space:pre;color:#404040;'> the bootstrap subport and the myprefix parts.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/58526
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://github.com/macports/macports-ports/pull/7074
</span>---
devel/gettext/Portfile | 119 +++++++++++++++++----------------
devel/gettext/files/write-java.c.patch | 11 ---
2 files changed, 60 insertions(+), 70 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 37869b61ab9..1a40c0740db 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,9 +6,7 @@ PortGroup muniversal 1.0
</span> PortGroup clang_dependency 1.0
name gettext
<span style='display:block; white-space:pre;background:#ffe0e0;'>-epoch 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.19.8.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.20.2
</span> categories devel
maintainers {ryandesign @ryandesign}
# libs are LGPL and executables are GPL
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,60 +20,24 @@ description GNU internationalization (i18n) and localization (l10n)
</span>
long_description ${name} is the ${description}, used for writing multilingual programs.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 29a5f29d186fe2aece5c450fd1a743b819c02c5b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ff942af0e438ced4a8b0ea4b0b6e0d6d657157c5e2364de57baa279c1c125c43
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/58323
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles write-java.c.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 32e99c55361970315dd9d43f9e36dd43f05fc09e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ecb9d0908ca41d5ca5fef974323b3bba6bec19eebba0b44f396de98cfcc089f1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 23717789
</span>
# https://trac.macports.org/ticket/31167
compiler.blacklist-append {clang < 211.10.1}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set localbindir ${workpath}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file mkdir ${localbindir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Don't find any Java programs.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach prog {gcj java javac jikes} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set fp [open ${localbindir}/${prog} w]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${fp} {#!/bin/sh}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${fp} {exit 1}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- close ${fp}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file attributes ${localbindir}/${prog} -permissions a+x
</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> depends_lib port:libiconv \
port:ncurses
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set myprefix ${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set mypath $env(PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.cppflags -no-cpp-precomp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# This port is used by clang-3.4 to bootstrap libcxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-subport ${name}-bootstrap {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set myprefix ${prefix}/libexec/libcxx-bootstrap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.pre_args --prefix=${myprefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-replace port:libiconv port:libiconv-bootstrap \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:ncurses port:ncurses-bootstrap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set mypath ${myprefix}/bin:$env(PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append PATH=${mypath}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cppflags-prepend -I${myprefix}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-prepend -L${myprefix}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxx_stdlib libstdc++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.whitelist clang llvm-gcc-4.2 gcc-4.2 apple-gcc-4.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> # Also needed by later clangs.
if {${os.platform} eq "darwin" && ${os.major} < 11 && ${cxx_stdlib} eq "libc++"} {
clang_dependency.extra_versions 3.7
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append PATH=${localbindir}:${mypath}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args ac_cv_prog_AWK=/usr/bin/awk \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append ac_cv_prog_AWK=/usr/bin/awk \
</span> ac_cv_path_GREP=/usr/bin/grep \
ac_cv_path_SED=/usr/bin/sed \
--disable-csharp \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -100,24 +62,63 @@ configure.args-append --without-cvs \
</span> test.run yes
test.target check
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file exists ${destroot}${myprefix}/lib/charset.alias]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${myprefix}/lib/charset.alias
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${name}-runtime {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description GNU internationalization (i18n) and localization (l10n) runtime library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description ${subport} is the ${description}, used for writing multilingual programs. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ This is part of GNU gettext. For building applications with gettext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ you need gettext tools provided by the gettext port. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${subport} provides the libintl library.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ worksrcdir ${distname}/gettext-runtime
</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;'>+ delete ${destroot}${prefix}/lib/charset.alias
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${prefix}/share/locale/locale.alias
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file exists ${destroot}${myprefix}/share/locale/locale.alias]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${myprefix}/share/locale/locale.alias
</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;'>+subport ${name}-libtextstyle {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description ${subport} is a text styling library and part of gettext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description ${subport} provides an easy way to add styling to programs that \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ produce output to a console or terminal emulator window. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ The library is part of gettext and a prerequisite for tools like \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ msgfmt and friends.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib port:libiconv \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ncurses
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ worksrcdir ${distname}/libtextstyle
</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 eq $name} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ epoch 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description ${name} provides the tools like msgfmt for writing multilanguage applications. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ The tools are required during the build of applications which use \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ the gettext system for multilanguage support. The libraries for \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ runtime (libintl) are provided via the gettext-runtime subport.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:gettext-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;'>+ worksrcdir ${distname}/gettext-tools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # disable libasprintf to make test lang-c++ check not fail
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-installed-libtextstyle \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-libasprintf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The gettext-tools installation also installs libintl again. Here
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # I remove the libintl parts because they are provided by the runtime
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # subport gettext-runtime
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${prefix}/include/libintl.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${prefix}/lib/libintl.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${prefix}/lib/libintl.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${prefix}/lib/libintl.8.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${prefix}/share/locale/locale.alias
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AUTHORS \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COPYING \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ChangeLog \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ChangeLog.0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEPENDENCIES \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HACKING \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NEWS \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- README \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- THANKS \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${myprefix}/share/doc/${name}
</span> }
livecheck.type regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gettext/files/write-java.c.patch b/devel/gettext/files/write-java.c.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d847a9011f5..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/gettext/files/write-java.c.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gettext-tools/src/write-java.c.orig 2016-03-20 18:37:53.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gettext-tools/src/write-java.c 2019-04-10 22:00:47.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -150,7 +150,7 @@ msgid_hashcode (const char *msgctxt, con
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *combined;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unsigned int result;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- combined = (char *) xmalloca (combined_len);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ combined = (char *) xmalloca (combined_len+1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- memcpy (combined, msgctxt, msgctxt_len);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- combined[msgctxt_len] = MSGCTXT_SEPARATOR;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- memcpy (combined + msgctxt_len + 1, msgid, msgid_len + 1);
</span></pre><pre style='margin:0'>
</pre>