[86373] trunk/dports/net/deluge/Portfile

[devans at macports.org]

Revision: 86373
          http://trac.macports.org/changeset/86373
Author:   devans at macports.org
Date:     2011-10-24 15:02:56 -0700 (Mon, 24 Oct 2011)
Log Message:
-----------
deluge: add +python2[67] variants, default +python27, update license, increment revision.

Modified Paths:
--------------
    trunk/dports/net/deluge/Portfile

Modified: trunk/dports/net/deluge/Portfile
===================================================================
--- trunk/dports/net/deluge/Portfile	2011-10-24 21:50:02 UTC (rev 86372)
+++ trunk/dports/net/deluge/Portfile	2011-10-24 22:02:56 UTC (rev 86373)
@@ -2,12 +2,13 @@
 # $Id$
 
 PortSystem      1.0
-PortGroup       python26 1.0
+PortGroup       python 1.0
 
 name            deluge
 version         1.3.3
+revision        1
 categories      net gnome python
-license         GPL-3 OpenSSL SSLeay
+license         GPL-3
 maintainers     devans openmaintainer
 supported_archs noarch
 
@@ -30,8 +31,17 @@
 depends_lib-append \
                 path:lib/libtorrent-rasterbar.dylib:libtorrent-rasterbar \
                 port:boost \
+                port:librsvg
+
+build.env       PYTHON_CFLAGS="-I${prefix}/include -I${prefix}/include/boost" \
+                PYTHON_LDFLAGS=-L${prefix}/lib \
+                CFLAGS="-I${prefix}/include -I${prefix}/include/boost" \
+                CC=${configure.cc} CXX=${configure.cxx} CPP=${configure.cpp}
+
+variant python26 conflicts python27 description {Build for Python 2.6} {
+        python.version 26
+        depends_lib-append \
                 port:dbus-python26 \
-                port:librsvg \
                 port:py26-chardet \
                 port:py26-game \
                 port:py26-gtk \
@@ -41,28 +51,27 @@
                 port:py26-twisted-web2 \
                 port:py26-openssl \
                 port:py26-mako
+}
 
-if {![file exists ${prefix}/lib/libboost_python-mt.dylib]} {
-    depends_lib-delete port:boost
-    pre-configure {
-        ui_error "
-****
-**** ${name} requires port boost installed with variant +python26.
-**** Please do the following then try installing ${name} again:
-****
-****     sudo port install boost +python26
-****
+variant python27 conflicts python26 description {Build for Python 2.7} {
+        python.version 27
+        depends_lib-append \
+                port:dbus-python27 \
+                port:py27-chardet \
+                port:py27-game \
+                port:py27-gtk \
+                port:py27-distribute \
+                port:py27-xdg \
+                port:py27-twisted \
+                port:py27-twisted-web2 \
+                port:py27-openssl \
+                port:py27-mako
+}
 
-"
-        return -code error "incompatible boost installation"
-    }
+if {![variant_isset python26]} {
+        default_variants +python27
 }
 
-build.env       PYTHON_CFLAGS="-I${prefix}/include -I${prefix}/include/boost" \
-                PYTHON_LDFLAGS=-L${prefix}/lib \
-                CFLAGS="-I${prefix}/include -I${prefix}/include/boost" \
-                CC=${configure.cc} CXX=${configure.cxx} CPP=${configure.cpp}
-
 livecheck.type  regex
 livecheck.url   http://download.deluge-torrent.org/source/
 livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111024/fd7b4d04/attachment.html>