Index: Portfile
===================================================================
--- Portfile	(revision 101113)
+++ Portfile	(working copy)
@@ -5,7 +5,7 @@
 
 name                qore-pgsql-module
 version             2.0
-revision            1
+revision            2
 categories          lang
 license             LGPL-2.1
 maintainers         davidnichols pvanek
@@ -20,50 +20,44 @@
                     sha1    c250dab4b886158d5a7e063abb7eb242078104ef \
                     rmd160  631bc3dd26fe56e29fc2fffa8f4a98e5c17b4142
 
-variant postgresql83 conflicts psql84 psql90 psql91 psql92 postgresql84 postgresql90 postgresql91 postgresql92 \
-description {Enable PostgreSQL Driver version 8.3} {}
+variant postgresql83 conflicts postgresql84 postgresql90 postgresql91 postgresql92 description {Enable PostgreSQL Driver version 8.3} {}
+variant postgresql84 conflicts postgresql83 postgresql90 postgresql91 postgresql92 description {Enable PostgreSQL Driver version 8.4} {}
+variant postgresql90 conflicts postgresql83 postgresql84 postgresql91 postgresql92 description {Enable PostgreSQL Driver version 9.0} {}
+variant postgresql91 conflicts postgresql83 postgresql84 postgresql90 postgresql92 description {Enable PostgreSQL Driver version 9.1} {}
+variant postgresql92 conflicts postgresql83 postgresql84 postgresql90 postgresql91 description {Enable PostgreSQL Driver version 9.2} {}
 
-variant postgresql84 conflicts psql83 psql90 psql91 psql92 postgresql83 postgresql90 postgresql91 postgresql92 \
-description {Enable PostgreSQL Driver version 8.4} {}
+variant psql83 requires postgresql83 description {Legacy compatibility variant} {}
+variant psql84 requires postgresql84 description {Legacy compatibility variant} {}
+variant psql90 requires postgresql90 description {Legacy compatibility variant} {}
+variant psql91 requires postgresql91 description {Legacy compatibility variant} {}
+variant psql92 requires postgresql92 description {Legacy compatibility variant} {}
 
-variant postgresql90 conflicts psql83 psql84 psql91 psql92 postgresql83 postgresql84 postgresql91 postgresql92 \
-description {Enable PostgreSQL Driver version 9.0} {}
+if {![variant_isset postgresql83] && ![variant_isset postgresql84] && ![variant_isset postgresql90] && ![variant_isset postgresql91] && ![variant_isset postgresql92]} {
+    default_variants +postgresql92
+}
 
-variant postgresql91 conflicts psql83 psql84 psql90 psql92 postgresql83 postgresql84 postgresql90 postgresql92 \
-description {Enable PostgreSQL Driver version 9.1} {}
-
-variant postgresql92 conflicts psql83 psql84 psql90 psql91 postgresql83 postgresql84 postgresql90 postgresql91 \
-description {Enable PostgreSQL Driver version 9.2 (default if none selected)} {}
-
-variant psql83 conflicts psql84 psql90 psql91 psql92 postgresql84 postgresql90 postgresql91 postgresql92 \
-description {backwards-compatible variant with postgresql83 - will be removed: Enable PostgreSQL Driver version 8.3} {}
-
-variant psql84 conflicts psql83 psql90 psql91 psql92 postgresql83 postgresql90 postgresql91 postgresql92 \
-description {backwards-compatible variant with postgresql84 - will be removed: Enable PostgreSQL Driver version 8.4} {}
-
-variant psql90 conflicts psql83 psql84 psql91 psql92 postgresql83 postgresql84 postgresql91 postgresql92 \
-description {backwards-compatible variant with postgresql90 - will be removed: Enable PostgreSQL Driver version 9.0} {}
-
-variant psql91 conflicts psql83 psql84 psql90 psql92 postgresql83 postgresql84 postgresql90 postgresql92 \
-description {backwards-compatible variant with postgresql91 - will be removed: Enable PostgreSQL Driver version 9.1} {}
-
-variant psql92 conflicts psql83 psql84 psql90 psql91 postgresql83 postgresql84 postgresql90 postgresql91 \
-description {backwards-compatible variant with postgresql92 - will be removed: Enable PostgreSQL Driver version 9.2} {}
-
-set postgresql_version "92"
-if {[variant_isset postgresql83] || [variant_isset psql83]} {
+if {[variant_isset postgresql83]} {
     set postgresql_version "83"
-} elseif {[variant_isset postgresql84] || [variant_isset psql84]} {
+} elseif {[variant_isset postgresql84]} {
     set postgresql_version "84"
-} elseif {[variant_isset postgresql90] || [variant_isset psql90]} {
+} elseif {[variant_isset postgresql90]} {
     set postgresql_version "90"
-} elseif {[variant_isset postgresql91] || [variant_isset psql91]} {
+} elseif {[variant_isset postgresql91]} {
     set postgresql_version "91"
-} elseif {[variant_isset postgresql92] || [variant_isset psql92]} {
+} elseif {[variant_isset postgresql92]} {
     set postgresql_version "92"
 }
 
 depends_lib         port:qore \
                     port:postgresql${postgresql_version}
 
-configure.args      --disable-debug
+set postgresql_tmp ${workpath}/postgresql
+
+post-extract {
+    file mkdir ${postgresql_tmp}
+    ln -s ${prefix}/include/postgresql${postgresql_version} ${postgresql_tmp}/include
+    ln -s ${prefix}/lib/postgresql${postgresql_version} ${postgresql_tmp}/lib
+}
+
+configure.args      --disable-debug \
+                    --with-pgsql=${postgresql_tmp}