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

[source_changes at macosforge.org]

Revision: 30778
          http://trac.macosforge.org/projects/macports/changeset/30778
Author:   afb at macports.org
Date:     2007-11-06 13:38:12 -0800 (Tue, 06 Nov 2007)

Log Message:
-----------
move sub-packages from Resources to Packages

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 21:36:24 UTC (rev 30777)
+++ trunk/base/src/package1.0/portmpkg.tcl	2007-11-06 21:38:12 UTC (rev 30778)
@@ -86,7 +86,7 @@
 	return $result
 }
 
-proc make_one_package {portname portversion mpkgpath} {
+proc make_one_package {portname portversion destination} {
 	global prefix package.destpath 
 	if {[catch {set res [mport_search "^$portname\$"]} result]} {
 		global 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 ${mpkgpath}/Contents/Resources] {} yes]
+			set worker [mport_open $portinfo(porturl) [list prefix $prefix package.destpath ${destination}] {} yes]
 			mport_exec $worker pkg
 			mport_close $worker
 		}
@@ -114,6 +114,7 @@
 	set pkgpath ${package.destpath}/${portname}-${portversion}.pkg
 	set mpkgpath ${package.destpath}/${portname}-${portversion}.mpkg
 	system "mkdir -p -m 0755 ${mpkgpath}/Contents/Resources"
+	system "mkdir -p -m 0755 ${mpkgpath}/Contents/Packages"
 
 	set dependencies {}
 	# get deplist
@@ -124,13 +125,13 @@
 		set vers [lindex [split $dep /] 1]
 		# don't re-package ourself
 		if {$name != $portname} {
-			make_one_package $name $vers $mpkgpath
+			make_one_package $name $vers $mpkgpath/Contents/Packages
 			lappend dependencies ${name}-${vers}.pkg
 		}
 	}
 	
 	# copy our own pkg into the mpkg
-	system "cp -PR ${pkgpath} ${mpkgpath}/Contents/Resources/"
+	system "cp -PR ${pkgpath} ${mpkgpath}/Contents/Packages/"
 	lappend dependencies ${portname}-${portversion}.pkg
 	
     write_PkgInfo ${mpkgpath}/Contents/PkgInfo
@@ -199,7 +200,7 @@
 	<key>IFMinorVersion</key>
 	<integer>0</integer>
 	<key>IFPkgFlagComponentDirectory</key>
-	<string>./Contents/Resources</string>
+	<string>./Contents/Packages</string>
 	<key>IFPkgFlagPackageList</key>
 	<array>
 		${depxml}</array>

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