[119620] trunk/base/src/package1.0

[snc at macports.org]

Revision: 119620
          https://trac.macports.org/changeset/119620
Author:   snc at macports.org
Date:     2014-05-02 08:57:54 -0700 (Fri, 02 May 2014)
Log Message:
-----------
base: replace eval with expand

Modified Paths:
--------------
    trunk/base/src/package1.0/portdpkg.tcl
    trunk/base/src/package1.0/portmpkg.tcl
    trunk/base/src/package1.0/portpkg.tcl
    trunk/base/src/package1.0/portrpm.tcl
    trunk/base/src/package1.0/portsrpm.tcl
    trunk/base/src/package1.0/tests/Portfile

Modified: trunk/base/src/package1.0/portdpkg.tcl
===================================================================
--- trunk/base/src/package1.0/portdpkg.tcl	2014-05-02 15:45:12 UTC (rev 119619)
+++ trunk/base/src/package1.0/portdpkg.tcl	2014-05-02 15:57:54 UTC (rev 119620)
@@ -196,7 +196,7 @@
 
 			foreach depspec $depends {
 				set dep [lindex [split $depspec :] end]
-				eval "lappend result [make_dependency_list $dep]"
+				lappend result {*}[make_dependency_list $dep]
 			}
 		}
 				lappend result $portinfo(name)/$portinfo(version)

Modified: trunk/base/src/package1.0/portmpkg.tcl
===================================================================
--- trunk/base/src/package1.0/portmpkg.tcl	2014-05-02 15:45:12 UTC (rev 119619)
+++ trunk/base/src/package1.0/portmpkg.tcl	2014-05-02 15:57:54 UTC (rev 119620)
@@ -92,7 +92,7 @@
     foreach depspec $depends {
         set dep [_get_dep_port $depspec]
         if {$dep ne ""} {
-            eval "lappend result [make_dependency_list $dep $destination]"
+            lappend result {*}[make_dependency_list $dep $destination]
         }
     }
 

Modified: trunk/base/src/package1.0/portpkg.tcl
===================================================================
--- trunk/base/src/package1.0/portpkg.tcl	2014-05-02 15:45:12 UTC (rev 119619)
+++ trunk/base/src/package1.0/portpkg.tcl	2014-05-02 15:57:54 UTC (rev 119620)
@@ -134,7 +134,7 @@
         if ([file exists "${destpath}/$dir"]) {
             # certain toplevel directories really are symlinks. leaving them as directories make pax lose the symlinks. that's bad.
             file mkdir "${destpath}/private/${dir}"
-            eval file rename [glob ${destpath}/${dir}/*] "${destpath}/private/${dir}"
+            file rename {*}[glob ${destpath}/${dir}/*] "${destpath}/private/${dir}"
             delete "${destpath}/${dir}"
         }
     }

Modified: trunk/base/src/package1.0/portrpm.tcl
===================================================================
--- trunk/base/src/package1.0/portrpm.tcl	2014-05-02 15:45:12 UTC (rev 119619)
+++ trunk/base/src/package1.0/portrpm.tcl	2014-05-02 15:57:54 UTC (rev 119620)
@@ -162,7 +162,7 @@
 
                 # xxx: nasty hack
                 if {$dep != "XFree86"} {
-                    eval "lappend result [make_dependency_list $dep]"
+                    lappend result {*}[make_dependency_list $dep]
                 }
             }
         }

Modified: trunk/base/src/package1.0/portsrpm.tcl
===================================================================
--- trunk/base/src/package1.0/portsrpm.tcl	2014-05-02 15:45:12 UTC (rev 119619)
+++ trunk/base/src/package1.0/portsrpm.tcl	2014-05-02 15:57:54 UTC (rev 119620)
@@ -164,7 +164,7 @@
 
                 # xxx: nasty hack
                 if {$dep != "XFree86"} {
-                    eval "lappend result [make_dependency_list $dep]"
+                    lappend result {*}[make_dependency_list $dep]
                 }
             }
         }

Modified: trunk/base/src/package1.0/tests/Portfile
===================================================================
--- trunk/base/src/package1.0/tests/Portfile	2014-05-02 15:45:12 UTC (rev 119619)
+++ trunk/base/src/package1.0/tests/Portfile	2014-05-02 15:57:54 UTC (rev 119620)
@@ -34,7 +34,7 @@
                         --mandir=${prefix}/share/man
 
 post-destroot {
-    eval xinstall -m 644 [glob ${worksrcpath}/*.1] ${destroot}${prefix}/share/man/man1/
+    xinstall -m 644 {*}[glob ${worksrcpath}/*.1] ${destroot}${prefix}/share/man/man1/
 }
 
 test.run		yes
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140502/261fec95/attachment.html>