[98257] trunk/dports/aqua/pgAdmin3/Portfile

[jwa at macports.org]

Revision: 98257
          http://trac.macports.org//changeset/98257
Author:   jwa at macports.org
Date:     2012-09-30 21:10:09 -0700 (Sun, 30 Sep 2012)
Log Message:
-----------
pgAdmin3: change variant names to current, thanks Ryan, closes #36400

Modified Paths:
--------------
    trunk/dports/aqua/pgAdmin3/Portfile

Modified: trunk/dports/aqua/pgAdmin3/Portfile
===================================================================
--- trunk/dports/aqua/pgAdmin3/Portfile	2012-10-01 04:03:38 UTC (rev 98256)
+++ trunk/dports/aqua/pgAdmin3/Portfile	2012-10-01 04:10:09 UTC (rev 98257)
@@ -32,7 +32,7 @@
     port:libxslt \
     port:wxWidgets30
 
-configure.args	--with-pgsql=${prefix}/lib/postgresql92 \
+configure.args \
     --with-wx=${prefix} \
     --with-wx-version=2.9 \
     --with-libxml2=${prefix} \
@@ -43,8 +43,6 @@
 use_parallel_build	no
 build.target	all install
 
-default_variants    +with_postgresql92
-
 universal_variant no
 
 post-configure {
@@ -57,48 +55,50 @@
     file copy ${worksrcpath}/${name}.app ${destroot}${applications_dir}/${name}.app
 }
 
-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
+}
+
 variant debug description {provide a debug build in case of difficulties} {
     configure.args-append	--enable-debug
 }
 
+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}
 livecheck.regex	pgAdmin v(1\\.\[0-9\]+\\.\[0-9\]+)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120930/6392e294/attachment-0001.html>