Revision: 98314 http://trac.macports.org//changeset/98314 Author: ryandesign@macports.org Date: 2012-10-02 14:45:36 -0700 (Tue, 02 Oct 2012) Log Message: ----------- php-postgresql: add postgresql92 variant and make it the default (#36434) Modified Paths: -------------- trunk/dports/lang/php/Portfile trunk/dports/php/php5-postgresql/Portfile Modified: trunk/dports/lang/php/Portfile =================================================================== --- trunk/dports/lang/php/Portfile 2012-10-02 21:19:33 UTC (rev 98313) +++ trunk/dports/lang/php/Portfile 2012-10-02 21:45:36 UTC (rev 98314) @@ -797,44 +797,51 @@ long_description ${description} - variant postgresql82 conflicts postgresql83 postgresql84 postgresql90 postgresql91 description {Use PostgreSQL 8.2 libraries} { + variant postgresql82 conflicts postgresql83 postgresql84 postgresql90 postgresql91 postgresql92 description {Use PostgreSQL 8.2 libraries} { depends_lib-append port:postgresql82 configure.args-append --with-pgsql=${prefix}/lib/postgresql82/bin \ --with-pdo-pgsql=${prefix}/lib/postgresql82/bin } - variant postgresql83 conflicts postgresql82 postgresql84 postgresql90 postgresql91 description {Use PostgreSQL 8.3 libraries} { + variant postgresql83 conflicts postgresql82 postgresql84 postgresql90 postgresql91 postgresql92 description {Use PostgreSQL 8.3 libraries} { depends_lib-append port:postgresql83 configure.args-append --with-pgsql=${prefix}/lib/postgresql83/bin \ --with-pdo-pgsql=${prefix}/lib/postgresql83/bin } - variant postgresql84 conflicts postgresql82 postgresql83 postgresql90 postgresql91 description {Use PostgreSQL 8.4 libraries} { + variant postgresql84 conflicts postgresql82 postgresql83 postgresql90 postgresql91 postgresql92 description {Use PostgreSQL 8.4 libraries} { depends_lib-append port:postgresql84 configure.args-append --with-pgsql=${prefix}/lib/postgresql84/bin \ --with-pdo-pgsql=${prefix}/lib/postgresql84/bin } - variant postgresql90 conflicts postgresql82 postgresql83 postgresql84 postgresql91 description {Use PostgreSQL 9.0 libraries} { + variant postgresql90 conflicts postgresql82 postgresql83 postgresql84 postgresql91 postgresql92 description {Use PostgreSQL 9.0 libraries} { depends_lib-append port:postgresql90 configure.args-append --with-pgsql=${prefix}/lib/postgresql90/bin \ --with-pdo-pgsql=${prefix}/lib/postgresql90/bin } - variant postgresql91 conflicts postgresql82 postgresql83 postgresql84 postgresql90 description {Use PostgreSQL 9.1 libraries} { + variant postgresql91 conflicts postgresql82 postgresql83 postgresql84 postgresql90 postgresql92 description {Use PostgreSQL 9.1 libraries} { depends_lib-append port:postgresql91 configure.args-append --with-pgsql=${prefix}/lib/postgresql91/bin \ --with-pdo-pgsql=${prefix}/lib/postgresql91/bin } - if {![variant_isset postgresql82] && ![variant_isset postgresql83] && ![variant_isset postgresql84] && ![variant_isset postgresql90] && ![variant_isset postgresql91]} { - default_variants +postgresql91 + variant postgresql92 conflicts postgresql82 postgresql83 postgresql84 postgresql90 postgresql91 description {Use PostgreSQL 9.2 libraries} { + depends_lib-append port:postgresql92 + + configure.args-append --with-pgsql=${prefix}/lib/postgresql92/bin \ + --with-pdo-pgsql=${prefix}/lib/postgresql92/bin } + + if {![variant_isset postgresql82] && ![variant_isset postgresql83] && ![variant_isset postgresql84] && ![variant_isset postgresql90] && ![variant_isset postgresql91] && ![variant_isset postgresql92]} { + default_variants +postgresql92 + } } subport ${php}-pspell { Modified: trunk/dports/php/php5-postgresql/Portfile =================================================================== --- trunk/dports/php/php5-postgresql/Portfile 2012-10-02 21:19:33 UTC (rev 98313) +++ trunk/dports/php/php5-postgresql/Portfile 2012-10-02 21:45:36 UTC (rev 98314) @@ -24,41 +24,48 @@ use_parallel_build yes -variant postgresql82 conflicts postgresql83 postgresql84 postgresql90 postgresql91 description {Use PostgreSQL 8.2 libraries} { +variant postgresql82 conflicts postgresql83 postgresql84 postgresql90 postgresql91 postgresql92 description {Use PostgreSQL 8.2 libraries} { depends_lib-append port:postgresql82 archcheck.files-append lib/postgresql82/libpq.dylib configure.args-append --with-pgsql=${prefix}/lib/postgresql82/bin \ --with-pdo-pgsql=${prefix}/lib/postgresql82/bin } -variant postgresql83 conflicts postgresql82 postgresql84 postgresql90 postgresql91 description {Use PostgreSQL 8.3 libraries} { +variant postgresql83 conflicts postgresql82 postgresql84 postgresql90 postgresql91 postgresql92 description {Use PostgreSQL 8.3 libraries} { depends_lib-append port:postgresql83 archcheck.files-append lib/postgresql83/libpq.dylib configure.args-append --with-pgsql=${prefix}/lib/postgresql83/bin \ --with-pdo-pgsql=${prefix}/lib/postgresql83/bin } -variant postgresql84 conflicts postgresql82 postgresql83 postgresql90 postgresql91 description {Use PostgreSQL 8.4 libraries} { +variant postgresql84 conflicts postgresql82 postgresql83 postgresql90 postgresql91 postgresql92 description {Use PostgreSQL 8.4 libraries} { depends_lib-append port:postgresql84 archcheck.files-append lib/postgresql84/libpq.dylib configure.args-append --with-pgsql=${prefix}/lib/postgresql84/bin \ --with-pdo-pgsql=${prefix}/lib/postgresql84/bin } -variant postgresql90 conflicts postgresql82 postgresql83 postgresql84 postgresql91 description {Use PostgreSQL 9.0 libraries} { +variant postgresql90 conflicts postgresql82 postgresql83 postgresql84 postgresql91 postgresql92 description {Use PostgreSQL 9.0 libraries} { depends_lib-append port:postgresql90 archcheck.files-append lib/postgresql90/libpq.dylib configure.args-append --with-pgsql=${prefix}/lib/postgresql90/bin \ --with-pdo-pgsql=${prefix}/lib/postgresql90/bin } -variant postgresql91 conflicts postgresql82 postgresql83 postgresql84 postgresql90 description {Use PostgreSQL 9.1 libraries} { +variant postgresql91 conflicts postgresql82 postgresql83 postgresql84 postgresql90 postgresql92 description {Use PostgreSQL 9.1 libraries} { depends_lib-append port:postgresql91 archcheck.files-append lib/postgresql91/libpq.dylib configure.args-append --with-pgsql=${prefix}/lib/postgresql91/bin \ --with-pdo-pgsql=${prefix}/lib/postgresql91/bin } -if {![variant_isset postgresql82] && ![variant_isset postgresql83] && ![variant_isset postgresql84] && ![variant_isset postgresql90] && ![variant_isset postgresql91]} { - default_variants +postgresql91 +variant postgresql92 conflicts postgresql82 postgresql83 postgresql84 postgresql90 postgresql91 description {Use PostgreSQL 9.2 libraries} { + depends_lib-append port:postgresql92 + archcheck.files-append lib/postgresql92/libpq.dylib + configure.args-append --with-pgsql=${prefix}/lib/postgresql92/bin \ + --with-pdo-pgsql=${prefix}/lib/postgresql92/bin } + +if {![variant_isset postgresql82] && ![variant_isset postgresql83] && ![variant_isset postgresql84] && ![variant_isset postgresql90] && ![variant_isset postgresql91] && ![variant_isset postgresql92]} { + default_variants +postgresql92 +}