[68598] trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl

[jmr at macports.org]

Revision: 68598
          http://trac.macports.org/changeset/68598
Author:   jmr at macports.org
Date:     2010-06-07 08:54:08 -0700 (Mon, 07 Jun 2010)
Log Message:
-----------
muniversal: remove 1.7 compatibility code

Modified Paths:
--------------
    trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl

Modified: trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl	2010-06-07 15:46:05 UTC (rev 68597)
+++ trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl	2010-06-07 15:54:08 UTC (rev 68598)
@@ -274,12 +274,7 @@
                 }
             }
 
-            # XXX Quick hack for base after r49087
-            if {[llength [info commands "portconfigure::*"]] > 0} {
-                portconfigure::configure_main
-            } else {
-                configure_main
-            }
+            portconfigure::configure_main
 
             # Undo changes to the configure related variables
             eval autoreconf.dir ${autoreconf_dir_save}
@@ -345,11 +340,9 @@
                     file mkdir ${build.dir}
                 }
             }
-            if {[llength [info commands "portbuild::*"]] > 0} {
-                portbuild::build_main
-            } else {
-                build_main
-            }
+
+            portbuild::build_main
+
             eval build.dir  ${build_dir_save}
             if { [info exists merger_build_args(${arch})] } {
                 build.args-delete $merger_build_args(${arch})
@@ -381,11 +374,9 @@
                     file mkdir ${destroot.dir}
                 }
             }
-            if {[llength [info commands "portdestroot::*"]] > 0} {
-                portdestroot::destroot_main
-            } else {
-                destroot_main
-            }
+
+            portdestroot::destroot_main
+
             destroot.dir  ${destroot_dir_save}
             if { [info exists merger_destroot_env(${arch})] } {
                 destroot.env-delete  $merger_destroot_env(${arch})
@@ -619,11 +610,9 @@
                         file mkdir ${test.dir}
                     }
                 }
-                if {[llength [info commands "porttest::*"]] > 0} {
-                    porttest::test_main
-                } else {
-                    test_main
-                }
+
+                porttest::test_main
+
                 test.dir ${test_dir_save}
             }
         }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100607/e7dd53c7/attachment.html>