[22680] trunk/dports

[source_changes at macosforge.org]

Revision: 22680
          http://trac.macosforge.org/projects/macports/changeset/22680
Author:   pipping at macports.org
Date:     2007-03-10 13:40:26 -0800 (Sat, 10 Mar 2007)

Log Message:
-----------
 * keep variant with_default_names from overwriting the post-destroot

Modified Paths:
--------------
    trunk/dports/devel/m4/Portfile
    trunk/dports/sysutils/coreutils/Portfile
    trunk/dports/sysutils/diffutils/Portfile
    trunk/dports/sysutils/findutils/Portfile

Modified: trunk/dports/devel/m4/Portfile
===================================================================
--- trunk/dports/devel/m4/Portfile	2007-03-10 21:31:10 UTC (rev 22679)
+++ trunk/dports/devel/m4/Portfile	2007-03-10 21:40:26 UTC (rev 22680)
@@ -26,13 +26,7 @@
     cd ${destroot}${prefix}/share/info/
     file rename m4.info gm4.info
     delete ${destroot}${prefix}/lib/charset.alias
-}
-
-test.run        yes
-test.target     check
-
-variant with_default_names {
-    post-destroot {
+    if {[variant_isset with_default_names]} {
         foreach d {bin share/info share/man/man1} {
             cd ${destroot}${prefix}/$d
             foreach a [glob g*] {
@@ -42,3 +36,8 @@
         }
     }
 }
+
+test.run        yes
+test.target     check
+
+variant with_default_names {}

Modified: trunk/dports/sysutils/coreutils/Portfile
===================================================================
--- trunk/dports/sysutils/coreutils/Portfile	2007-03-10 21:31:10 UTC (rev 22679)
+++ trunk/dports/sysutils/coreutils/Portfile	2007-03-10 21:40:26 UTC (rev 22680)
@@ -30,19 +30,10 @@
                 --mandir=${prefix}/share/man \
                 --disable-nls
 
-# Set the RUN_EXPENSIVE_TESTS environmental variable to 'yes' to run
-# more expensive tests.  Set the RUN_VERY_EXPENSIVE_TESTS
-# environmental variable to 'yes' to run even more expensive tests.
-test.run        yes
-test.target     check
-
 post-destroot {
     delete ${destroot}${prefix}/share/info/dir \
       ${destroot}${prefix}/lib/charset.alias
-}
-
-variant with_default_names {
-    post-destroot {
+    if {[variant_isset with_default_names]} {
         foreach d {bin share/man/man1} {
             cd ${destroot}${prefix}/$d
             foreach a [glob g*] {
@@ -52,3 +43,11 @@
         }
     }
 }
+
+# Set the RUN_EXPENSIVE_TESTS environmental variable to 'yes' to run more
+# expensive tests.  Set the RUN_VERY_EXPENSIVE_TESTS environmental variable
+# to 'yes' to run even more expensive tests.
+test.run        yes
+test.target     check
+
+variant with_default_names {}

Modified: trunk/dports/sysutils/diffutils/Portfile
===================================================================
--- trunk/dports/sysutils/diffutils/Portfile	2007-03-10 21:31:10 UTC (rev 22679)
+++ trunk/dports/sysutils/diffutils/Portfile	2007-03-10 21:40:26 UTC (rev 22680)
@@ -23,13 +23,7 @@
 post-destroot {
     cd ${destroot}${prefix}/share/info
     file rename diff.info gdiff.info
-}
-
-test.run            yes
-test.target         check
-
-variant with_default_names {
-    post-destroot {
+    if {[variant_isset with_default_names]} {
         foreach d {bin share/info share/man/man1} {
             cd ${destroot}${prefix}/$d
             foreach a [glob g*] {
@@ -39,3 +33,8 @@
         }
     }
 }
+
+test.run            yes
+test.target         check
+
+variant with_default_names {}

Modified: trunk/dports/sysutils/findutils/Portfile
===================================================================
--- trunk/dports/sysutils/findutils/Portfile	2007-03-10 21:31:10 UTC (rev 22679)
+++ trunk/dports/sysutils/findutils/Portfile	2007-03-10 21:40:26 UTC (rev 22680)
@@ -26,13 +26,7 @@
 post-destroot {
     cd ${destroot}${prefix}/share/info
     file rename find.info gfind.info
-}
-
-test.run            yes
-test.target         check
-
-variant with_default_names {
-    post-destroot {
+    if {[variant_isset with_default_names]} {
         foreach d {bin libexec share/info share/man/man1 share/man/man5} {
             cd ${destroot}${prefix}/$d
             foreach a [glob g*] {
@@ -42,3 +36,8 @@
         }
     }
 }
+
+test.run            yes
+test.target         check
+
+variant with_default_names {}

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070310/06f872b8/attachment.html