<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/e62efc9fe5fa5534b30b6d2d804ba1c9c726699f">https://github.com/macports/macports-ports/commit/e62efc9fe5fa5534b30b6d2d804ba1c9c726699f</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e62efc9fe5fa5534b30b6d2d804ba1c9c726699f
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sun Jul 3 14:38:42 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> evolution-data-server: portfile cleanup
</span>---
gnome/evolution-data-server/Portfile | 54 +++++++++++++++++++++---------------
1 file changed, 31 insertions(+), 23 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/evolution-data-server/Portfile b/gnome/evolution-data-server/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a4aa2df0dd9..f4d94a9d047 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/evolution-data-server/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/evolution-data-server/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,17 +6,18 @@ PortGroup cmake 1.1
</span> name evolution-data-server
version 3.36.5
revision 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set branch [join [lrange [split ${version} .] 0 1] .]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories gnome
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license LGPL-2+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {mascguy @mascguy} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> description Addressbook and calender libs for GNOME.
long_description Evolution Data Server provides a central location for \
addressbook and calendar in the GNOME Desktop.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {mascguy @mascguy} openmaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories gnome
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license LGPL-2+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> homepage https://wiki.gnome.org/Apps/Evolution
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites gnome:sources/${name}/${branch}/
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set branch [join [lrange [split ${version} .] 0 1] .]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites gnome:sources/${name}/${branch}/
</span> use_xz yes
checksums rmd160 37f0434b0d89dbbae40343718b347d3788753373 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,7 +33,8 @@ depends_build-append \
</span> depends_build-append \
port:python38
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
</span> port:gcr \
port:gnome-online-accounts \
port:icu \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,15 +54,18 @@ depends_lib path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
</span> port:db53
# our choice of perl for installed scripts
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:perl5.28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:perl5.28
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-cmake-find-our-build-tools.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-remove-linker-flag-no-undefined.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-cmake-find-our-build-tools.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-remove-linker-flag-no-undefined.diff
</span>
# libphonenumber-cpp uses C++11 extensions but evolution-data-server doesn't assert -std=c++11
# this causes configuration failures when testing for libphonenumber on at least Mojave/Xcode 10
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cxxflags-append -std=c++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cxxflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -std=c++11
</span>
configure.args-append \
-DENABLE_SCHEMAS_COMPILE=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,18 +84,18 @@ configure.args-append \
</span> -DWITH_LIBDB_CFLAGS="-I${prefix}/include/db53" \
-DWITH_LIBDB_LIBS="-L${prefix}/lib/db53 -ldb"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span> # port nss is not universal
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> universal_variant no
use_parallel_build no
variant phonenumber description {Phone number parsing/validation using libphonenumber} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:libphonenumber-cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxxflags-append -DI18N_PHONENUMBERS_USE_BOOST
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DWITH_PHONENUMBER=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libphonenumber-cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DI18N_PHONENUMBERS_USE_BOOST
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_PHONENUMBER=${prefix}/lib
</span> }
# TODO: Need to fix CMake detection for 'libphonenumber-cpp', before we can enable
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -107,12 +112,15 @@ post-activate {
</span>
platform darwin {
if {${configure.cxx_stdlib} eq "libstdc++"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# google auth requires webkit2gtk-4.0 >= 2.11.91 json-glib >= 1.0.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DENABLE_OAUTH2=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # google auth requires webkit2gtk-4.0 >= 2.11.91 json-glib >= 1.0.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_OAUTH2=OFF
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DENABLE_OAUTH2=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:lib/pkgconfig/webkit2gtk-4.0.pc:webkit2-gtk \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:json-glib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_OAUTH2=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/webkit2gtk-4.0.pc:webkit2-gtk \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:json-glib
</span> }
}
</pre><pre style='margin:0'>
</pre>