[71744] trunk/dports/python

[ryandesign at macports.org]

Revision: 71744
          http://trac.macports.org/changeset/71744
Author:   ryandesign at macports.org
Date:     2010-09-21 16:19:23 -0700 (Tue, 21 Sep 2010)
Log Message:
-----------
py2*-psycopg2: add postgresql90 variant, remove postgresql82 variant; see #26573, #26572

Modified Paths:
--------------
    trunk/dports/python/py25-psycopg2/Portfile
    trunk/dports/python/py26-psycopg2/Portfile
    trunk/dports/python/py27-psycopg2/Portfile

Modified: trunk/dports/python/py25-psycopg2/Portfile
===================================================================
--- trunk/dports/python/py25-psycopg2/Portfile	2010-09-21 21:09:40 UTC (rev 71743)
+++ trunk/dports/python/py25-psycopg2/Portfile	2010-09-21 23:19:23 UTC (rev 71744)
@@ -28,36 +28,36 @@
 
 patchfiles          patch-setup.cfg
 
-if {![variant_isset postgresql82] && ![variant_isset postgresql83] && ![variant_isset postgresql84]} {
-    default_variants    +postgresql84
+if {![variant_isset postgresql83] && ![variant_isset postgresql84] && ![variant_isset postgresql90]} {
+    default_variants    +postgresql90
 }
 
-variant postgresql82 conflicts postgresql83 postgresql84 description "Build using postgresql v8.2" {
-    depends_lib-append  port:postgresql82
+variant postgresql83 conflicts postgresql84 postgresql90 description "Build using postgresql v8.3" {
+    depends_lib-append port:postgresql83
 
     post-patch {
-    reinplace \
-        s|@PG_CONFIG@|${prefix}/lib/postgresql82/bin/pg_config|g \
-        ${worksrcpath}/setup.cfg
+        reinplace \
+            s|@PG_CONFIG@|${prefix}/lib/postgresql83/bin/pg_config|g \
+            ${worksrcpath}/setup.cfg
     }
 }
 
-variant postgresql83 conflicts postgresql82 postgresql84 description "Build using postgresql v8.3" {
-    depends_lib-append  port:postgresql83
+variant postgresql84 conflicts postgresql83 postgresql90 description "Build using postgresql v8.4" {
+    depends_lib-append port:postgresql84
 
     post-patch {
         reinplace \
-            s|@PG_CONFIG@|${prefix}/lib/postgresql83/bin/pg_config|g \
+            s|@PG_CONFIG@|${prefix}/lib/postgresql84/bin/pg_config|g \
             ${worksrcpath}/setup.cfg
     }
 }
 
-variant postgresql84 conflicts postgresql82 postgresql83 description "Build using postgresql v8.4" {
-    depends_lib-append  port:postgresql84
+variant postgresql90 conflicts postgresql83 postgresql84 description "Build using postgresql v9.0" {
+    depends_lib-append port:postgresql90
 
     post-patch {
         reinplace \
-            s|@PG_CONFIG@|${prefix}/lib/postgresql84/bin/pg_config|g \
+            s|@PG_CONFIG@|${prefix}/lib/postgresql90/bin/pg_config|g \
             ${worksrcpath}/setup.cfg
     }
 }

Modified: trunk/dports/python/py26-psycopg2/Portfile
===================================================================
--- trunk/dports/python/py26-psycopg2/Portfile	2010-09-21 21:09:40 UTC (rev 71743)
+++ trunk/dports/python/py26-psycopg2/Portfile	2010-09-21 23:19:23 UTC (rev 71744)
@@ -28,36 +28,36 @@
 patchfiles          patch-setup.cfg.diff
 
 
-if {![variant_isset postgresql82] && ![variant_isset postgresql83] && ![variant_isset postgresql84]} {
-    default_variants    +postgresql84
+if {![variant_isset postgresql83] && ![variant_isset postgresql84] && ![variant_isset postgresql90]} {
+    default_variants    +postgresql90
 }
 
-variant postgresql82 conflicts postgresql83 postgresql84 description "Build using postgresql v8.2" {
-    depends_lib-append  port:postgresql82
+variant postgresql83 conflicts postgresql84 postgresql90 description "Build using postgresql v8.3" {
+    depends_lib-append port:postgresql83
 
     post-patch {
         reinplace \
-            s|@PG_CONFIG@|${prefix}/lib/postgresql82/bin/pg_config|g \
+            s|@PG_CONFIG@|${prefix}/lib/postgresql83/bin/pg_config|g \
             ${worksrcpath}/setup.cfg
     }
 }
 
-variant postgresql83 conflicts postgresql82 postgresql84 description "Build using postgresql v8.3" {
-    depends_lib-append port:postgresql83
+variant postgresql84 conflicts postgresql83 postgresql90 description "Build using postgresql v8.4" {
+    depends_lib-append port:postgresql84
 
     post-patch {
         reinplace \
-            s|@PG_CONFIG@|${prefix}/lib/postgresql83/bin/pg_config|g \
+            s|@PG_CONFIG@|${prefix}/lib/postgresql84/bin/pg_config|g \
             ${worksrcpath}/setup.cfg
     }
 }
 
-variant postgresql84 conflicts postgresql82 postgresql83 description "Build using postgresql v8.4" {
-    depends_lib-append port:postgresql84
+variant postgresql90 conflicts postgresql83 postgresql84 description "Build using postgresql v9.0" {
+    depends_lib-append port:postgresql90
 
     post-patch {
         reinplace \
-            s|@PG_CONFIG@|${prefix}/lib/postgresql84/bin/pg_config|g \
+            s|@PG_CONFIG@|${prefix}/lib/postgresql90/bin/pg_config|g \
             ${worksrcpath}/setup.cfg
     }
 }

Modified: trunk/dports/python/py27-psycopg2/Portfile
===================================================================
--- trunk/dports/python/py27-psycopg2/Portfile	2010-09-21 21:09:40 UTC (rev 71743)
+++ trunk/dports/python/py27-psycopg2/Portfile	2010-09-21 23:19:23 UTC (rev 71744)
@@ -28,36 +28,36 @@
 patchfiles          patch-setup.cfg.diff
 
 
-if {![variant_isset postgresql82] && ![variant_isset postgresql83] && ![variant_isset postgresql84]} {
-    default_variants    +postgresql84
+if {![variant_isset postgresql83] && ![variant_isset postgresql84] && ![variant_isset postgresql90]} {
+    default_variants    +postgresql90
 }
 
-variant postgresql82 conflicts postgresql83 postgresql84 description "Build using postgresql v8.2" {
-    depends_lib-append  port:postgresql82
+variant postgresql83 conflicts postgresql84 postgresql90 description "Build using postgresql v8.3" {
+    depends_lib-append port:postgresql83
 
     post-patch {
         reinplace \
-            s|@PG_CONFIG@|${prefix}/lib/postgresql82/bin/pg_config|g \
+            s|@PG_CONFIG@|${prefix}/lib/postgresql83/bin/pg_config|g \
             ${worksrcpath}/setup.cfg
     }
 }
 
-variant postgresql83 conflicts postgresql82 postgresql84 description "Build using postgresql v8.3" {
-    depends_lib-append port:postgresql83
+variant postgresql84 conflicts postgresql83 postgresql90 description "Build using postgresql v8.4" {
+    depends_lib-append port:postgresql84
 
     post-patch {
         reinplace \
-            s|@PG_CONFIG@|${prefix}/lib/postgresql83/bin/pg_config|g \
+            s|@PG_CONFIG@|${prefix}/lib/postgresql84/bin/pg_config|g \
             ${worksrcpath}/setup.cfg
     }
 }
 
-variant postgresql84 conflicts postgresql82 postgresql83 description "Build using postgresql v8.4" {
-    depends_lib-append port:postgresql84
+variant postgresql90 conflicts postgresql83 postgresql84 description "Build using postgresql v9.0" {
+    depends_lib-append port:postgresql90
 
     post-patch {
         reinplace \
-            s|@PG_CONFIG@|${prefix}/lib/postgresql84/bin/pg_config|g \
+            s|@PG_CONFIG@|${prefix}/lib/postgresql90/bin/pg_config|g \
             ${worksrcpath}/setup.cfg
     }
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100921/d3776459/attachment.html>