[82250] trunk/dports/python

[snc at macports.org]

Revision: 82250
          http://trac.macports.org/changeset/82250
Author:   snc at macports.org
Date:     2011-08-11 11:16:51 -0700 (Thu, 11 Aug 2011)
Log Message:
-----------
py-psycopg2:
 * unify
 * drop landonf, with permission

Modified Paths:
--------------
    trunk/dports/python/py-psycopg2/Portfile

Added Paths:
-----------
    trunk/dports/python/py-psycopg2/files/patch-setup.cfg.diff

Removed Paths:
-------------
    trunk/dports/python/py-psycopg2/files/patch-setup.cfg
    trunk/dports/python/py25-psycopg2/
    trunk/dports/python/py26-psycopg2/
    trunk/dports/python/py27-psycopg2/

Modified: trunk/dports/python/py-psycopg2/Portfile
===================================================================
--- trunk/dports/python/py-psycopg2/Portfile	2011-08-11 17:47:01 UTC (rev 82249)
+++ trunk/dports/python/py-psycopg2/Portfile	2011-08-11 18:16:51 UTC (rev 82250)
@@ -1,13 +1,14 @@
 # $Id$
 
 PortSystem 1.0
-PortGroup python24 1.0
+PortGroup python 1.0
 
 name			py-psycopg2
-version			2.0.5.1
-revision        1
+version			2.4.2
+python.versions 24 25 26 27
+python.default_version  27
 categories		python databases
-maintainers		landonf
+maintainers		snc openmaintainer
 platforms		darwin freebsd
 description		A python DBAPI-2.0 ompliant database adapter for postgresql
 long_description	Psycopg2 is a postgresql database adapter for python. \
@@ -16,19 +17,57 @@
 			featuring connection pooling.
 
 homepage		http://www.initd.org/software/initd/psycopg/
-master_sites		http://initd.org/pub/software/psycopg/ \
-			http://initd.org/pub/software/psycopg/PSYCOPG-2-0/
+
+set branch          [join [lrange [split ${version} .] 0 1] -]
+master_sites		http://www.psycopg.org/psycopg/tarballs/PSYCOPG-${branch}/
 distname		psycopg2-${version}
-checksums		md5 052e4b97dab47708fdcdc36ffb25af66
 
-depends_lib		port:postgresql81 \
-			port:python24 \
-			port:openssl
+checksums           rmd160  ec0fe7573260773b5e701f00ea365a1b7d4cc329 \
+                    sha256  16c2ad8b19039888354944c75f25da40c22f91a79d230ed2aedeabf9d3b585b9
 
-patchfiles		patch-setup.cfg
+if {$subport != $name} {
+    depends_lib-append  port:openssl
 
-post-patch		{
-	reinplace \
-		s|@PG_CONFIG@|${prefix}/lib/postgresql81/bin/pg_config|g \
-		${worksrcpath}/setup.cfg
+    patchfiles		patch-setup.cfg.diff
+
+    post-patch {
+
+        if {[variant_isset postgresql83]} {
+            reinplace \
+                s|@PG_CONFIG@|${prefix}/lib/postgresql83/bin/pg_config|g \
+                ${worksrcpath}/setup.cfg
+        }
+
+        if {[variant_isset postgresql84]} {
+            reinplace \
+                s|@PG_CONFIG@|${prefix}/lib/postgresql84/bin/pg_config|g \
+                ${worksrcpath}/setup.cfg
+        }
+
+        if {[variant_isset postgresql90]} {
+            reinplace \
+                s|@PG_CONFIG@|${prefix}/lib/postgresql90/bin/pg_config|g \
+                ${worksrcpath}/setup.cfg
+        }
+    }
 }
+
+
+if {![variant_isset postgresql83] && ![variant_isset postgresql84] && ![variant_isset postgresql90]} {
+    default_variants    +postgresql90
+}
+
+variant postgresql83 conflicts postgresql84 postgresql90 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
+}
+
+variant postgresql90 conflicts postgresql83 postgresql84 description "Build using postgresql v9.0" {
+    depends_lib-append port:postgresql90
+}
+
+livecheck.url       ${master_sites}
+livecheck.regex     psycopg2-(\\d+(\\.\\d+)+)${extract.suffix}

Deleted: trunk/dports/python/py-psycopg2/files/patch-setup.cfg
===================================================================
--- trunk/dports/python/py-psycopg2/files/patch-setup.cfg	2011-08-11 17:47:01 UTC (rev 82249)
+++ trunk/dports/python/py-psycopg2/files/patch-setup.cfg	2011-08-11 18:16:51 UTC (rev 82250)
@@ -1,11 +0,0 @@
---- setup.cfg.orig	2006-06-22 18:40:29.000000000 -0700
-+++ setup.cfg	2006-06-22 18:40:40.000000000 -0700
-@@ -25,7 +25,7 @@
- # libraries needed to build psycopg2. If pg_config is not in the path or
- # is installed under a different name uncomment the following option and
- # set it to the pg_config full path.
--#pg_config=
-+pg_config=@PG_CONFIG@
- 
- # If "pg_config" is not available, "include_dirs" can be used to locate 
- # postgresql headers and libraries. Some extra checks on sys.platform will

Copied: trunk/dports/python/py-psycopg2/files/patch-setup.cfg.diff (from rev 82226, trunk/dports/python/py-psycopg2/files/patch-setup.cfg)
===================================================================
--- trunk/dports/python/py-psycopg2/files/patch-setup.cfg.diff	                        (rev 0)
+++ trunk/dports/python/py-psycopg2/files/patch-setup.cfg.diff	2011-08-11 18:16:51 UTC (rev 82250)
@@ -0,0 +1,11 @@
+--- setup.cfg.orig	2006-06-22 18:40:29.000000000 -0700
++++ setup.cfg	2006-06-22 18:40:40.000000000 -0700
+@@ -25,7 +25,7 @@
+ # libraries needed to build psycopg2. If pg_config is not in the path or
+ # is installed under a different name uncomment the following option and
+ # set it to the pg_config full path.
+-#pg_config=
++pg_config=@PG_CONFIG@
+ 
+ # If "pg_config" is not available, "include_dirs" can be used to locate 
+ # postgresql headers and libraries. Some extra checks on sys.platform will
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110811/96454697/attachment.html>