[111088] trunk/dports/python/py-oursql/Portfile

[larryv at macports.org]

Revision: 111088
          https://trac.macports.org/changeset/111088
Author:   larryv at macports.org
Date:     2013-09-14 14:16:18 -0700 (Sat, 14 Sep 2013)
Log Message:
-----------
py-oursql: Make sure stub port has a version too.

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

Modified: trunk/dports/python/py-oursql/Portfile
===================================================================
--- trunk/dports/python/py-oursql/Portfile	2013-09-14 21:00:45 UTC (rev 111087)
+++ trunk/dports/python/py-oursql/Portfile	2013-09-14 21:16:18 UTC (rev 111088)
@@ -6,7 +6,10 @@
 
 name                py-oursql
 python.versions     26 27 31 32 33
-version             [expr {${python.version} < 30 ? {0.9.3.1} : {0.9.3}}]
+# TODO: It would be very nice to resolve this bizarre dual-version situation.
+version             [expr {${subport} eq ${name} || ${python.version} < 30
+                        ? {0.9.3.1}
+                        : {0.9.3}}]
 
 categories-append   devel databases
 platforms           darwin
@@ -22,29 +25,29 @@
 distname            oursql-${version}
 use_zip             yes
 
-if {${python.version} < 30} {
-    master_sites    http://launchpad.net/oursql/trunk/${version}/+download/
-    checksums       md5     ad599ea2d95fc695df7195e9801b45c2 \
-                    rmd160  e38d9566acb3abe513e0cfe92a533f128410db2c \
-                    sha256  a6d8044591b2ecb859b8bf72a1c535d0b33bd249f7fecdbe63d2173855b568b7
-} else {
-    master_sites    http://launchpad.net/oursql/py3k/py3k-${version}/+download/
-    patch_sites     https://launchpadlibrarian.net/150278854
+if {${subport} ne ${name}} {
+    if {${python.version} < 30} {
+        master_sites    http://launchpad.net/oursql/trunk/${version}/+download/
+        checksums       md5     ad599ea2d95fc695df7195e9801b45c2 \
+                        rmd160  e38d9566acb3abe513e0cfe92a533f128410db2c \
+                        sha256  a6d8044591b2ecb859b8bf72a1c535d0b33bd249f7fecdbe63d2173855b568b7
+    } else {
+        master_sites    http://launchpad.net/oursql/py3k/py3k-${version}/+download/
+        patch_sites     https://launchpadlibrarian.net/150278854
 
-    dist_subdir     ${name}-py3k
-    patchfiles      patch-oursqlx-oursql.c.diff \
-                    patch-oursqlx-oursql.pyx.diff
+        dist_subdir     ${name}-py3k
+        patchfiles      patch-oursqlx-oursql.c.diff \
+                        patch-oursqlx-oursql.pyx.diff
 
-    checksums       [suffix ${distname}] \
-                        md5     1c19d9ecbfc96e071f6da463a0fc9109 \
-                        rmd160  259fb68bebf901cee83ffcadfbb17da0ff72be64 \
-                        sha256  778ccbd1cfc80cf22a2245cd63cf715348aa8bbcf1d45fb91b4aa0dd3744dd6f \
-                    patch-oursqlx-oursql.c.diff \
-                        rmd160  c2f8f42c6b1681bc3fc79eee04901207c59e5947 \
-                        sha256  58c12b577804b1d0174536ed075d31d27346aa9efc686482f99b265e5a1fa984
-}
+        checksums       [suffix ${distname}] \
+                            md5     1c19d9ecbfc96e071f6da463a0fc9109 \
+                            rmd160  259fb68bebf901cee83ffcadfbb17da0ff72be64 \
+                            sha256  778ccbd1cfc80cf22a2245cd63cf715348aa8bbcf1d45fb91b4aa0dd3744dd6f \
+                        patch-oursqlx-oursql.c.diff \
+                            rmd160  c2f8f42c6b1681bc3fc79eee04901207c59e5947 \
+                            sha256  58c12b577804b1d0174536ed075d31d27346aa9efc686482f99b265e5a1fa984
+    }
 
-if {${subport} ne ${name}} {
     variant mysql5 conflicts mysql51 mysql55 mysql56 mariadb percona description {Build with MySQL 5} {
         depends_lib-append  port:mysql5
         build.env-append    MYSQL_CONFIG=${prefix}/lib/mysql5/bin/mysql_config
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130914/2723fb0b/attachment.html>