Changeset 98314

Timestamp:

Oct 2, 2012, 9:45:36 PM (12 years ago)

Author:

ryandesign@…

Message:

php-postgresql: add postgresql92 variant and make it the default (#36434)

Location:

trunk/dports

Files:

• lang/php/Portfile (modified) (6 diffs)
• php/php5-postgresql/Portfile (modified) (6 diffs)

trunk/dports/lang/php/Portfile

@@ -798 +798 @@
     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
         
@@ -805 +805 @@
     }
     
-    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
         
@@ -812 +812 @@
     }
     
-    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
         
@@ -819 +819 @@
     }
     
-    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
         
@@ -826 +826 @@
     }
     
-    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
         
@@ -833 +833 @@
     }
     
-    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
     }
 }

trunk/dports/php/php5-postgresql/Portfile

@@ -25 +25 @@
 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
@@ -32 +32 @@
 }
 
-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
@@ -39 +39 @@
 }
 
-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
@@ -46 +46 @@
 }
 
-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
@@ -53 +53 @@
 }
 
-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
@@ -60 +60 @@
 }
 
-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
+}