<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/9a457b388ecc100de7b8cfc28d8802704e3b5976">https://github.com/macports/macports-ports/commit/9a457b388ecc100de7b8cfc28d8802704e3b5976</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 9a457b388ecc100de7b8cfc28d8802704e3b5976
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sun Sep 11 12:13:10 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> glom: add variants for mysql and pgsql
</span><span style='display:block; white-space:pre;color:#404040;'> - Coincides with libgda5, allowing more flexibility
</span><span style='display:block; white-space:pre;color:#404040;'> CC: @catap
</span>---
gnome/glom/Portfile | 99 ++++++++++++++++++++++++++++++++++++++++++-----------
1 file changed, 79 insertions(+), 20 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/glom/Portfile b/gnome/glom/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 34fe6d0fa2a..38dd6fce98d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/glom/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/glom/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@ PortGroup app 1.0
</span>
name glom
version 1.32.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span>
categories gnome databases
license GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,9 +29,6 @@ checksums rmd160 02b748371658fe569ed463e175e0bdd7ed26a689 \
</span> size 9030852
set python_branch 3.10
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set mysql_branch 57
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set pgsql_branch 11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> set python_prefix ${frameworks_dir}/Python.framework/Versions/${python_branch}
set python_version [join [lrange [split ${python_branch} .] 0 1] ""]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,10 +56,8 @@ depends_lib-append \
</span> port:libxslt \
port:libgda5 \
port:libgdamm5 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:mysql${mysql_branch} \
</span> port:goocanvasmm2\
port:gtksourceviewmm3 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:postgresql${pgsql_branch} \
</span> port:py${python_version}-gobject3 \
port:libepc \
port:evince \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,10 +72,6 @@ patchfiles-append \
</span> patch-export-regex.diff \
patch-glom-libglom-connectionpool.cc.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-require_active_variants [boost::depends_portname] python${python_version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-require_active_variants libgda5 mysql${mysql_branch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-require_active_variants libgda5 postgresql${pgsql_branch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # reconfigure using upstream autogen.sh for intltool 0.51 compatibility
configure.cmd ./autogen.sh
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -98,14 +89,15 @@ compiler.blacklist-append *gcc-3.* *gcc-4.* {clang < 700}
</span> configure.args-append \
--with-boost=[boost::install_area] \
--with-boost-python=boost_python${python_version}-mt \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-postgres-utils=${prefix}/lib/postgresql${pgsql_branch}/bin \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-mysql-utils=${prefix}/lib/mysql${mysql_branch}/bin \
</span> --disable-silent-rules \
--disable-update-mime-database \
--disable-documentation
universal_variant no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+require_active_variants \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [boost::depends_portname] python${python_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> app.icon ${worksrcpath}/data/icons/scalable/glom.svg
post-activate {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -114,7 +106,78 @@ post-activate {
</span> system "${prefix}/bin/update-mime-database ${prefix}/share/mime"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Dummy variants, to ensure user's choice cascades to dependents
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc mysql_setup {db_ver} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global prefix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:mysql${db_ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-mysql-utils=${prefix}/lib/mysql${db_ver}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libgda5 mysql${db_ver}
</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;'>+proc pgsql_setup {db_ver} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global prefix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:postgresql${db_ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-postgres-utils=${prefix}/lib/postgresql${db_ver}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libgda5 postgresql${db_ver}
</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;'>+variant mysql56 conflicts mysql57 description {support for MySQL 5.6.x} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mysql_setup 56
</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;'>+variant mysql57 conflicts mysql56 description {support for MySQL 5.7.x} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mysql_setup 57
</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 {![variant_isset mysql56] && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset mysql57] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # mysql57 only builds on 10.9 and later
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && ${os.major} < 13} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +mysql56
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +mysql57
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant postgresql10 conflicts postgresql11 postgresql12 postgresql13 postgresql14 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description {support for PostgreSQL 11.x} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pgsql_setup 10
</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;'>+variant postgresql11 conflicts postgresql10 postgresql12 postgresql13 postgresql14 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description {support for PostgreSQL 11.x} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pgsql_setup 11
</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;'>+variant postgresql12 conflicts postgresql10 postgresql11 postgresql13 postgresql14 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description {support for PostgreSQL 12.x} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pgsql_setup 12
</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;'>+variant postgresql13 conflicts postgresql10 postgresql11 postgresql12 postgresql14 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description {support for PostgreSQL 13.x} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pgsql_setup 13
</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;'>+variant postgresql14 conflicts postgresql10 postgresql11 postgresql12 postgresql13 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description {support for PostgreSQL 14.x} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pgsql_setup 14
</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 {![variant_isset postgresql10] && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset postgresql11] && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset postgresql12] && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset postgresql13] && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset postgresql14] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +postgresql11
</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;'>+# Dummy variants, to ensure user's choice cascades to dependencies
</span> variant quartz conflicts x11 {}
variant x11 conflicts quartz {}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -125,19 +188,15 @@ if {![variant_isset x11]} {
</span> default_variants +quartz
}
if {![variant_isset quartz] && ![variant_isset x11]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "Either +x11 or +quartz is required"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error "Either +x11 or +quartz is required"
</span> }
# locale issues apparently only affect OS X 10.8 and earlier.
if {${os.major} < 12} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-notes "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes {
</span> To work around known locale issues, set LANG=C when starting glom
$ LANG=C glom
<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:#e0ffe0;'>+ }
</span> }
livecheck.type gnome
</pre><pre style='margin:0'>
</pre>