Changeset 98257

Timestamp:

Oct 1, 2012, 4:10:09 AM (12 years ago)

Author:

jwa@…

Message:

pgAdmin3: change variant names to current, thanks Ryan, closes #36400

File:

• trunk/dports/aqua/pgAdmin3/Portfile (modified) (4 diffs)

trunk/dports/aqua/pgAdmin3/Portfile

@@ -33 +33 @@
     port:wxWidgets30
 
-configure.args  --with-pgsql=${prefix}/lib/postgresql92 \
+configure.args \
     --with-wx=${prefix} \
     --with-wx-version=2.9 \
@@ -43 +43 @@
 use_parallel_build      no
 build.target    all install
-
-default_variants    +with_postgresql92
 
 universal_variant no
@@ -58 +56 @@
 }
 
-variant with_postgresql83 conflicts with_postgresql84 with_postgresql90 with_postgresql91 with_postgresql92 \
+variant postgresql83 conflicts postgresql84 postgresql90 postgresql91 postgresql92 \
     description {support for PostgreSQL 8.3.x} {
-        depends_lib-delete      port:postgresql92
-        configure.args-delete   --with-pgsql=${prefix}/lib/postgresql92
         depends_lib-append      port:postgresql83
         configure.args-append   --with-pgsql=${prefix}/lib/postgresql83
 }
 
-variant with_postgresql84 conflicts with_postgresql83 with_postgresql90 with_postgresql91 with_postgresql92 \
+variant postgresql84 conflicts postgresql83 postgresql90 postgresql91 postgresql92 \
     description {support for PostgreSQL 8.4.x} {
-        depends_lib-delete      port:postgresql92
-        configure.args-delete   --with-pgsql=${prefix}/lib/postgresql92
         depends_lib-append      port:postgresql84
         configure.args-append   --with-pgsql=${prefix}/lib/postgresql84
 }
 
-variant with_postgresql90 conflicts with_postgresql83 with_postgresql84 with_postgresql91 with_postgresql92 \
+variant postgresql90 conflicts postgresql83 postgresql84 postgresql91 postgresql92 \
     description {support for PostgreSQL 9.0.x} {
-        depends_lib-delete      port:postgresql92
-        configure.args-delete   --with-pgsql=${prefix}/lib/postgresql92
         depends_lib-append      port:postgresql90
         configure.args-append   --with-pgsql=${prefix}/lib/postgresql90
 }
 
-variant with_postgresql91 conflicts with_postgresql83 with_postgresql84 with_postgresql90 with_postgresql92 \
+variant postgresql91 conflicts postgresql83 postgresql84 postgresql90 postgresql92 \
     description {support for PostgreSQL 9.1.x} {
-        depends_lib-delete      port:postgresql92
-        configure.args-delete   --with-pgsql=${prefix}/lib/postgresql92
         depends_lib-append      port:postgresql91
         configure.args-append   --with-pgsql=${prefix}/lib/postgresql91
 }
 
-variant with_postgresql92 conflicts with_postgresql83 with_postgresql84 with_postgresql90 with_postgresql91 \
+variant postgresql92 conflicts postgresql83 postgresql84 postgresql90 postgresql91 \
     description {support for PostgreSQL 9.2.x} {
         depends_lib-append      port:postgresql92
         configure.args-append   --with-pgsql=${prefix}/lib/postgresql92
+}
+
+if {![variant_isset postgresql83] && ![variant_isset postgresql84] && ![variant_isset postgresql90] && ![variant_isset postgresql91] && ![variant_isset postgresql92]} {
+    default_variants        +postgresql92
 }
 
@@ -100 +94 @@
 }
 
+variant with_postgresql83 requires postgresql83 description {Legacy compatibility variant} {}
+variant with_postgresql84 requires postgresql84 description {Legacy compatibility variant} {}
+variant with_postgresql90 requires postgresql90 description {Legacy compatibility variant} {}
+variant with_postgresql91 requires postgresql91 description {Legacy compatibility variant} {}
+variant with_postgresql92 requires postgresql92 description {Legacy compatibility variant} {}
+
 livecheck.type  regex
 livecheck.url   ${homepage}