[71450] trunk/dports/net

[ryandesign at macports.org]

Revision: 71450
          http://trac.macports.org/changeset/71450
Author:   ryandesign at macports.org
Date:     2010-09-13 04:04:50 -0700 (Mon, 13 Sep 2010)
Log Message:
-----------
deluge, libtorrent-rasterbar: simplify boost +python26 installation instructions (no need to tell the user to manually deactivate an existing version; MacPorts will do so automatically)

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

Modified: trunk/dports/net/deluge/Portfile
===================================================================
--- trunk/dports/net/deluge/Portfile	2010-09-13 10:45:53 UTC (rev 71449)
+++ trunk/dports/net/deluge/Portfile	2010-09-13 11:04:50 UTC (rev 71450)
@@ -40,32 +40,18 @@
         depends_lib-delete port:boost
 }
 
-pre-extract {
+pre-configure {
         if { ![file exists ${prefix}/lib/libboost_python-mt.dylib] } {
-            if { [file exists ${prefix}/lib/libboost_system-mt.dylib] } {
-                ui_error "
+            ui_error "
 ****
 **** Deluge requires port boost installed with variant +python26.
 **** Please do the following then try installing deluge again:
 ****
-****     sudo port deactivate boost
 ****     sudo port install boost +python26
 ****
 
 "
-            } else {
-                ui_error "
-****
-**** Deluge requires port boost installed with variant +python26.
-**** Please do the following then try installing deluge again:
-****
-****     sudo port install boost +python26
-****
-
-"
-            }
-            
-            error "Deluge requires boost +python26"
+            return -code error "incompatible boost installation"
         }
 }
 

Modified: trunk/dports/net/libtorrent-rasterbar/Portfile
===================================================================
--- trunk/dports/net/libtorrent-rasterbar/Portfile	2010-09-13 10:45:53 UTC (rev 71449)
+++ trunk/dports/net/libtorrent-rasterbar/Portfile	2010-09-13 11:04:50 UTC (rev 71450)
@@ -36,32 +36,18 @@
         depends_lib-delete port:boost
 }
 
-pre-extract {
+pre-configure {
         if { ![file exists ${prefix}/lib/libboost_python-mt.dylib] } {
-            if { [file exists ${prefix}/lib/libboost_system-mt.dylib] } {
-                ui_error "
+            ui_error "
 ****
-**** libtorrent-rasterbar requires port boost installed with variant +python26.
-**** Please do the following then try installing libtorrent-rasterbar again:
+**** Deluge requires port boost installed with variant +python26.
+**** Please do the following then try installing deluge again:
 ****
-****     sudo port deactivate boost
 ****     sudo port install boost +python26
 ****
 
 "
-            } else {
-                ui_error "
-****
-**** libtorrent-rasterbar requires port boost installed with variant +python26.
-**** Please do the following then try installing libtorrent-rasterbar again:
-****
-****     sudo port install boost +python26
-****
-
-"
-            }
-
-            error "libtorrent-rasterbar requires boost +python26"
+            return -code error "incompatible boost installation"
         }
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100913/3f28be83/attachment-0001.html>