<pre style='margin:0'>
Jyrki Wahlstedt (jyrkiwahlstedt) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ea322af94a7fba4b122c5adfbae0415b169799f5">https://github.com/macports/macports-ports/commit/ea322af94a7fba4b122c5adfbae0415b169799f5</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new ea322af sphinx: version bump to 2.2.11, modernise variants, assume maintainership
</span>ea322af is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ea322af94a7fba4b122c5adfbae0415b169799f5
</span>Author: Jyrki Wahlstedt <jwa@macports.org>
AuthorDate: Sat Nov 19 20:26:32 2016 +0200
<span style='display:block; white-space:pre;color:#404040;'> sphinx: version bump to 2.2.11, modernise variants, assume maintainership
</span>---
textproc/sphinx/Portfile | 101 +++++++++++++++++++++--------------------------
1 file changed, 46 insertions(+), 55 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/sphinx/Portfile b/textproc/sphinx/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7e1a6d7..e57c020 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/sphinx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/sphinx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,13 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# $Id$
</span>
PortSystem 1.0
name sphinx
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.2.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.2.11
</span> categories textproc net
license GPL-2
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers jwa openmaintainer
</span>
description Sphinx is a full-text search engine
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,8 +23,8 @@ homepage http://sphinxsearch.com/
</span> master_sites ${homepage}files/
distname ${name}-${version}-release
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 44d282421b62bbeb7dc269849bcc366bd16722a9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c76a88789ca1d7d86df9869718ad217ae8a72740b9e84f2b98b61fa47feb64ef
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 5804b4cce64bc03fa20bac26c7391cd661cecc77 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6662039f093314f896950519fa781bc87610f926f64b3d349229002f06ac41a9
</span>
if {${name} eq ${subport}} {
depends_lib port:expat \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,101 +72,86 @@ startupitem.executable ${prefix}/bin/searchd --nodetach
</span>
test.run yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant postgresql82 conflicts postgresql83 postgresql84 postgresql90 postgresql91 postgresql92 postgresql93 description {Enable PostgreSQL 8.2 support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:postgresql82
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-pgsql \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-pgsql-includes=${prefix}/include/postgresql82 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-pgsql-libs=${prefix}/lib/postgresql82
</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;'>-variant postgresql83 conflicts postgresql82 postgresql84 postgresql90 postgresql91 postgresql92 postgresql93 description {Enable PostgreSQL 8.3 support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:postgresql83
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-pgsql \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-pgsql-includes=${prefix}/include/postgresql83 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-pgsql-libs=${prefix}/lib/postgresql83
</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;'>-variant postgresql84 conflicts postgresql82 postgresql83 postgresql90 postgresql91 postgresql92 postgresql93 description {Enable PostgreSQL 8.4 support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:postgresql84
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-pgsql \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-pgsql-includes=${prefix}/include/postgresql84 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-pgsql-libs=${prefix}/lib/postgresql84
</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;'>-variant postgresql90 conflicts postgresql82 postgresql83 postgresql84 postgresql91 postgresql92 postgresql93 description {Enable PostgreSQL 9.0 support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:postgresql90
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-pgsql \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-pgsql-includes=${prefix}/include/postgresql90 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-pgsql-libs=${prefix}/lib/postgresql90
</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;'>-variant postgresql91 conflicts postgresql82 postgresql83 postgresql84 postgresql90 postgresql92 postgresql93 description {Enable PostgreSQL 9.1 support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant postgresql91 conflicts postgresql92 postgresql93 postgresql94 postgresql95 postgresql96 description {Enable PostgreSQL 9.1 support} {
</span> depends_lib-append port:postgresql91
configure.args-append --with-pgsql \
--with-pgsql-includes=${prefix}/include/postgresql91 \
--with-pgsql-libs=${prefix}/lib/postgresql91
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant postgresql92 conflicts postgresql82 postgresql83 postgresql84 postgresql90 postgresql91 postgresql93 description {Enable PostgreSQL 9.2 support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant postgresql92 conflicts postgresql91 postgresql93 postgresql94 postgresql95 postgresql96 description {Enable PostgreSQL 9.2 support} {
</span> depends_lib-append port:postgresql92
configure.args-append --with-pgsql \
--with-pgsql-includes=${prefix}/include/postgresql92 \
--with-pgsql-libs=${prefix}/lib/postgresql92
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant postgresql93 conflicts postgresql82 postgresql83 postgresql84 postgresql90 postgresql91 postgresql92 description {Enable PostgreSQL 9.3 support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant postgresql93 conflicts postgresql91 postgresql92 postgresql94 postgresql95 postgresql96 description {Enable PostgreSQL 9.3 support} {
</span> depends_lib-append port:postgresql93
configure.args-append --with-pgsql \
--with-pgsql-includes=${prefix}/include/postgresql93 \
--with-pgsql-libs=${prefix}/lib/postgresql93
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant mysql5 conflicts mysql51 mysql55 mysql56 mariadb percona description {Enable MySQL 5 support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:bin/mysql_config5:mysql5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --without-mysql
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-mysql-includes=${prefix}/include/mysql5/mysql \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-mysql-libs=${prefix}/lib/mysql5/mysql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant postgresql94 conflicts postgresql91 postgresql92 postgresql93 postgresql95 postgresql96 description {Enable PostgreSQL 9.4 support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:postgresql94
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-pgsql \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-pgsql-includes=${prefix}/include/postgresql94 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-pgsql-libs=${prefix}/lib/postgresql94
</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 postgresql95 conflicts postgresql91 postgresql92 postgresql93 postgresql94 postgresql96 description {Enable PostgreSQL 9.5 support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:postgresql95
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-pgsql \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-pgsql-includes=${prefix}/include/postgresql95 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-pgsql-libs=${prefix}/lib/postgresql95
</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 postgresql96 conflicts postgresql91 postgresql92 postgresql93 postgresql94 postgresql95 description {Enable PostgreSQL 9.6 support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:postgresql96
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-pgsql \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-pgsql-includes=${prefix}/include/postgresql96 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-pgsql-libs=${prefix}/lib/postgresql96
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant mysql51 conflicts mysql5 mysql55 mysql56 mariadb percona description {Enable MySQL 5.1 support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant mysql51 conflicts mysql51 mysql56 mysql57 mariadb percona description {Enable MySQL 5.1 support} {
</span> depends_lib-append port:mysql51
configure.args-delete --without-mysql
configure.args-append --with-mysql=${prefix}/lib/mysql51
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant mysql55 conflicts mysql5 mysql51 mysql56 mariadb percona description {Enable MySQL 5.5 support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant mysql55 conflicts mysql51 mysql56 mysql57 mariadb percona description {Enable MySQL 5.5 support} {
</span> depends_lib-append port:mysql55
configure.args-delete --without-mysql
configure.args-append --with-mysql=${prefix}/lib/mysql55
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant mysql56 conflicts mysql5 mysql51 mysql55 mariadb percona description {Enable MySQL 5.6 support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant mysql56 conflicts mysql51 mysql55 mysql57 mariadb percona description {Enable MySQL 5.6 support} {
</span> depends_lib-append port:mysql56
configure.args-delete --without-mysql
configure.args-append --with-mysql=${prefix}/lib/mysql56
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant mariadb conflicts mysql5 mysql51 mysql55 percona description {Enable MariaDB support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant mysql57 conflicts mysql51 mysql55 mysql56 mariadb percona description {Enable MySQL 5.6 support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:mysql56
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --without-mysql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-mysql=${prefix}/lib/mysql56
</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 mariadb conflicts mysql51 mysql55 mysql56 mysql57 percona description {Enable MariaDB support} {
</span> depends_lib-append port:mariadb
configure.args-delete --without-mysql
configure.args-append --with-mysql=${prefix}/lib/mariadb
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant percona conflicts mysql5 mysql51 mysql55 mariadb description {Enable Percona support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant percona conflicts mysql51 mysql55 mysql56 mysql57 mariadb description {Enable Percona support} {
</span> depends_lib-append port:percona
configure.args-delete --without-mysql
configure.args-append --with-mysql=${prefix}/lib/percona
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset postgresql82] && ![variant_isset postgresql83] && ![variant_isset postgresql84] && ![variant_isset postgresql90] && ![variant_isset postgresql91] && ![variant_isset postgresql92] && ![variant_isset postgresql93] && ![variant_isset mysql5] && ![variant_isset mysql51] && ![variant_isset mysql55] && ![variant_isset mysql56] && ![variant_isset mariadb] && ![variant_isset percona]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +mysql5
</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;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url ${homepage}downloads/release/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex ${name}-(\[0-9.\]+)-release${extract.suffix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset postgresql91] && ![variant_isset postgresql92] && ![variant_isset postgresql93] && ![variant_isset postgresql94] && ![variant_isset postgresql95] && ![variant_isset postgresql96] && ![variant_isset mysql51] && ![variant_isset mysql55] && ![variant_isset mysql56] && ![variant_isset mysql57] && ![variant_isset mariadb] && ![variant_isset percona]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +mysql57
</span> }
subport libsphinxclient {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -184,3 +168,10 @@ subport libsphinxclient {
</span>
use_parallel_build no
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type regex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url ${homepage}downloads/release/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex ${name}-(\[0-9.\]+)-release${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.type none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span></pre><pre style='margin:0'>
</pre>