[71453] trunk/dports

[ryandesign at macports.org]

Revision: 71453
          http://trac.macports.org/changeset/71453
Author:   ryandesign at macports.org
Date:     2010-09-13 04:11:27 -0700 (Mon, 13 Sep 2010)
Log Message:
-----------
deluge, libtorrent-rasterbar, py26-mapnik: simplify boost +python26 verification code

Modified Paths:
--------------
    trunk/dports/net/deluge/Portfile
    trunk/dports/net/libtorrent-rasterbar/Portfile
    trunk/dports/python/py26-mapnik/Portfile

Modified: trunk/dports/net/deluge/Portfile
===================================================================
--- trunk/dports/net/deluge/Portfile	2010-09-13 11:08:00 UTC (rev 71452)
+++ trunk/dports/net/deluge/Portfile	2010-09-13 11:11:27 UTC (rev 71453)
@@ -36,13 +36,10 @@
                 port:py26-openssl \
                 port:py26-mako
 
-if { ![file exists ${prefix}/lib/libboost_python-mt.dylib] } {
-        depends_lib-delete port:boost
-}
-
-pre-configure {
-        if { ![file exists ${prefix}/lib/libboost_python-mt.dylib] } {
-            ui_error "
+if {![file exists ${prefix}/lib/libboost_python-mt.dylib]} {
+    depends_lib-delete port:boost
+    pre-configure {
+        ui_error "
 ****
 **** Deluge requires port boost installed with variant +python26.
 **** Please do the following then try installing deluge again:
@@ -51,8 +48,8 @@
 ****
 
 "
-            return -code error "incompatible boost installation"
-        }
+        return -code error "incompatible boost installation"
+    }
 }
 
 build.env       PYTHON_CFLAGS="-I${prefix}/include -I${prefix}/include/boost" \

Modified: trunk/dports/net/libtorrent-rasterbar/Portfile
===================================================================
--- trunk/dports/net/libtorrent-rasterbar/Portfile	2010-09-13 11:08:00 UTC (rev 71452)
+++ trunk/dports/net/libtorrent-rasterbar/Portfile	2010-09-13 11:11:27 UTC (rev 71453)
@@ -32,13 +32,10 @@
                 port:libgeoip \
                 port:openssl
 
-if { ![file exists ${prefix}/lib/libboost_python-mt.dylib] } {
-        depends_lib-delete port:boost
-}
-
-pre-configure {
-        if { ![file exists ${prefix}/lib/libboost_python-mt.dylib] } {
-            ui_error "
+if {![file exists ${prefix}/lib/libboost_python-mt.dylib]} {
+    depends_lib-delete port:boost
+    pre-configure {
+        ui_error "
 ****
 **** Deluge requires port boost installed with variant +python26.
 **** Please do the following then try installing deluge again:
@@ -47,8 +44,8 @@
 ****
 
 "
-            return -code error "incompatible boost installation"
-        }
+        return -code error "incompatible boost installation"
+    }
 }
 
 patchfiles      patch-bindings-python-setup.py.in.diff

Modified: trunk/dports/python/py26-mapnik/Portfile
===================================================================
--- trunk/dports/python/py26-mapnik/Portfile	2010-09-13 11:08:00 UTC (rev 71452)
+++ trunk/dports/python/py26-mapnik/Portfile	2010-09-13 11:11:27 UTC (rev 71453)
@@ -86,13 +86,10 @@
 
 use_parallel_build  yes
 
-if { ![file exists ${prefix}/lib/libboost_python-mt.dylib] } {
-        depends_lib-delete port:boost
-}
-
-pre-configure {
-        if { ![file exists ${prefix}/lib/libboost_python-mt.dylib] } {
-            ui_error "
+if {![file exists ${prefix}/lib/libboost_python-mt.dylib]} {
+    depends_lib-delete port:boost
+    pre-configure {
+        ui_error "
 ****
 **** Deluge requires port boost installed with variant +python26.
 **** Please do the following then try installing deluge again:
@@ -101,8 +98,8 @@
 ****
 
 "
-            return -code error "incompatible boost installation"
-        }
+        return -code error "incompatible boost installation"
+    }
 }
 
 configure.args      PREFIX=${prefix} \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100913/6487158e/attachment.html>