[77891] trunk/base/src/port1.0

[afb at macports.org]

Revision: 77891
          http://trac.macports.org/changeset/77891
Author:   afb at macports.org
Date:     2011-04-16 02:40:28 -0700 (Sat, 16 Apr 2011)
Log Message:
-----------
fix build/destroot on freebsd, where make is bsdmake

Modified Paths:
--------------
    trunk/base/src/port1.0/portbuild.tcl
    trunk/base/src/port1.0/portdestroot.tcl

Modified: trunk/base/src/port1.0/portbuild.tcl
===================================================================
--- trunk/base/src/port1.0/portbuild.tcl	2011-04-16 09:02:16 UTC (rev 77890)
+++ trunk/base/src/port1.0/portbuild.tcl	2011-04-16 09:40:28 UTC (rev 77891)
@@ -123,7 +123,7 @@
 }
 
 proc portbuild::build_getargs {args} {
-    if {(![exists build.type] || [option build.type] == "gnu") \
+    if {((![exists build.type] && [option os.platform] != "freebsd") || ([exists build.type] && [option build.type] == "gnu")) \
         && [regexp "^(/\\S+/|)(g|gnu|)make(\\s+.*|)$" [option build.cmd]]} {
         # Print "Entering directory" lines for better log debugging
         return "-w [option build.target]"

Modified: trunk/base/src/port1.0/portdestroot.tcl
===================================================================
--- trunk/base/src/port1.0/portdestroot.tcl	2011-04-16 09:02:16 UTC (rev 77890)
+++ trunk/base/src/port1.0/portdestroot.tcl	2011-04-16 09:40:28 UTC (rev 77891)
@@ -88,7 +88,7 @@
 set_ui_prefix
 
 proc portdestroot::destroot_getargs {args} {
-    if {(![exists build.type] || [option build.type] == "gnu") \
+    if {((![exists build.type] && [option os.platform] != "freebsd") || ([exists build.type] && [option build.type] == "gnu")) \
         && [regexp "^(/\\S+/|)(g|gnu|)make(\\s+.*|)$" [option destroot.cmd]]} {
         # Print "Entering directory" lines for better log debugging
         return "-w [option destroot.target]"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110416/53910d56/attachment.html>