[30781] trunk/base/src/package1.0/portmpkg.tcl

[source_changes at macosforge.org]

Revision: 30781
          http://trac.macosforge.org/projects/macports/changeset/30781
Author:   afb at macports.org
Date:     2007-11-06 15:37:54 -0800 (Tue, 06 Nov 2007)

Log Message:
-----------
pass package.flat option on

Modified Paths:
--------------
    trunk/base/src/package1.0/portmpkg.tcl

Modified: trunk/base/src/package1.0/portmpkg.tcl
===================================================================
--- trunk/base/src/package1.0/portmpkg.tcl	2007-11-06 23:17:31 UTC (rev 30780)
+++ trunk/base/src/package1.0/portmpkg.tcl	2007-11-06 23:37:54 UTC (rev 30781)
@@ -39,12 +39,12 @@
 target_requires ${org.macports.mpkg} pkg
 
 # define options
-options package.destpath
+options package.destpath package.flat
 
 set_ui_prefix
 
 proc mpkg_main {args} {
-    global portname portversion portrevision package.destpath UI_PREFIX
+    global portname portversion portrevision package.destpath package.flat UI_PREFIX
 
     # Make sure the destination path exists.
     system "mkdir -p ${package.destpath}"
@@ -87,7 +87,7 @@
 }
 
 proc make_one_package {portname portversion destination} {
-	global prefix package.destpath 
+	global prefix package.destpath package.flat
 	if {[catch {set res [mport_search "^$portname\$"]} result]} {
 		global errorInfo
 		ui_debug "$errorInfo"
@@ -100,7 +100,7 @@
 		if {[info exists portinfo(porturl)] && [info exists portinfo(version)] && $portinfo(version) == $portversion} {
 			# only the prefix gets passed to the worker.
 			ui_debug "building dependency package: $portname"
-			set worker [mport_open $portinfo(porturl) [list prefix $prefix package.destpath ${destination}] {} yes]
+			set worker [mport_open $portinfo(porturl) [list prefix $prefix package.destpath ${destination} package.flat ${package.flat}] {} yes]
 			mport_exec $worker pkg
 			mport_close $worker
 		}
@@ -109,7 +109,7 @@
 }
 
 proc package_mpkg {portname portversion portrevision} {
-    global portdbpath destpath workpath prefix portresourcepath description package.destpath long_description homepage depends_run depends_lib
+    global portdbpath destpath workpath prefix portresourcepath description package.destpath package.flat long_description homepage depends_run depends_lib
 
 	set pkgpath ${package.destpath}/${portname}-${portversion}.pkg
 	set mpkgpath ${package.destpath}/${portname}-${portversion}.mpkg

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