[55826] trunk/dports/sysutils/duplicity/Portfile

[singingwolfboy at macports.org]

Revision: 55826
          http://trac.macports.org/changeset/55826
Author:   singingwolfboy at macports.org
Date:     2009-08-19 18:52:53 -0700 (Wed, 19 Aug 2009)
Log Message:
-----------
updated duplicity to work properly with both py25 and py26 (hopefully)

Modified Paths:
--------------
    trunk/dports/sysutils/duplicity/Portfile

Modified: trunk/dports/sysutils/duplicity/Portfile
===================================================================
--- trunk/dports/sysutils/duplicity/Portfile	2009-08-20 01:09:50 UTC (rev 55825)
+++ trunk/dports/sysutils/duplicity/Portfile	2009-08-20 01:52:53 UTC (rev 55826)
@@ -1,7 +1,6 @@
 # $Id$
 
 PortSystem    1.0
-PortGroup     python25 1.0
 
 name          duplicity
 version       0.5.18
@@ -26,38 +25,45 @@
               sha1    3999a59236900b4e8fba134dfa4b49155869694e \
               rmd160  fb2b89ac40e4122503196c16b574ef338bf71182
 
-
 depends_lib-append  port:librsync \
                     port:gnupg
 
-depends_run-append  port:py25-gnupg \
-                    port:py25-boto \
-                    port:ncftp
+depends_run-append  port:ncftp
 
 build.cmd-append    --librsync-dir=${prefix}
 
 universal_variant no
 
-variant python26 description {use Python 2.6} {
-  depends_lib-delete    port:python25
-  depends_lib-append    port:python26
-  depends_run-delete    port:py25-gnupg port:py25-boto
-  depends_run-append    port:py26-gnupg port:py26-boto
- 
-  # apparently, all of these need to be reset.
-  set python.branch     2.6
-  set python.bin        ${prefix}/bin/python${python.branch}
-  set python.lib        ${prefix}/lib/libpython${python.branch}.dylib 
-  set python.libdir     ${prefix}/lib/python${python.branch}
-  set python.pkgd       ${prefix}/lib/python${python.branch}/site-packages
-  set python.include    ${prefix}/include/python${python.branch}
-  
-  build.cmd             ${python.bin} setup.py --no-user-cfg
-  destroot.cmd          ${python.bin} setup.py --no-user-cfg
-  
-  build.cmd-append      --librsync-dir=${prefix}
+if {![variant_isset python25] && ![variant_isset python26]} {
+    default_variants    +python26
+}                   
+                    
+variant python25 conflicts python26 {
+    PortGroup           python25 1.0
+    depends_run-append  port:py25-gnupg \
+                        port:py25-boto
+    # it looks like setting the PortGroups clears all the depends_lib
+    # and just sets it to python25, so we have to remind it of its
+    # other lib dependents
+    depends_lib-append  port:librsync \
+                        port:gnupg
+    # ditto here: PortGroup resets the build cmd
+    build.cmd-append    --librsync-dir=${prefix}
 }
 
+variant python26 conflicts python25 {
+    PortGroup           python26 1.0
+    depends_run-append  port:py26-gnupg \
+                        port:py26-boto
+    # it looks like setting the PortGroups clears all the depends_lib
+    # and just sets it to python26, so we have to remind it of its
+    # other lib dependents
+    depends_lib-append  port:librsync \
+                        port:gnupg
+    # ditto here: PortGroup resets the build cmd
+    build.cmd-append    --librsync-dir=${prefix}
+}
+
 livecheck.check   regex
 livecheck.url     ${homepage}
 livecheck.regex   {The current (?:stable )?release is (\d+(?:\.\d+)*)}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090819/0544f72c/attachment.html>