[42626] branches/variant-descs-14482/base/src/package1.0

[raimue at macports.org]

Revision: 42626
          http://trac.macports.org/changeset/42626
Author:   raimue at macports.org
Date:     2008-11-26 17:21:15 -0800 (Wed, 26 Nov 2008)
Log Message:
-----------
Remove portresourcepath and use [getportresourcepath] instead

Modified Paths:
--------------
    branches/variant-descs-14482/base/src/package1.0/portmpkg.tcl
    branches/variant-descs-14482/base/src/package1.0/portpkg.tcl

Modified: branches/variant-descs-14482/base/src/package1.0/portmpkg.tcl
===================================================================
--- branches/variant-descs-14482/base/src/package1.0/portmpkg.tcl	2008-11-26 23:52:01 UTC (rev 42625)
+++ branches/variant-descs-14482/base/src/package1.0/portmpkg.tcl	2008-11-27 01:21:15 UTC (rev 42626)
@@ -109,7 +109,7 @@
 }
 
 proc package_mpkg {portname portversion portrevision} {
-    global portdbpath destpath workpath prefix portresourcepath description package.destpath package.flat long_description homepage depends_run depends_lib
+    global portdbpath destpath workpath prefix porturl 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
@@ -146,7 +146,7 @@
 	}
     }
     write_welcome_html ${mpkgpath}/Contents/Resources/Welcome.html $portname $portversion $pkg_long_description $pkg_description $pkg_homepage
-    file copy -force -- ${portresourcepath}/package/background.tiff ${mpkgpath}/Contents/Resources/background.tiff
+    file copy -force -- [getportresourcepath $porturl "port1.0/package/background.tiff"] ${mpkgpath}/Contents/Resources/background.tiff
 
 	return 0
 }

Modified: branches/variant-descs-14482/base/src/package1.0/portpkg.tcl
===================================================================
--- branches/variant-descs-14482/base/src/package1.0/portpkg.tcl	2008-11-26 23:52:01 UTC (rev 42625)
+++ branches/variant-descs-14482/base/src/package1.0/portpkg.tcl	2008-11-27 01:21:15 UTC (rev 42626)
@@ -60,7 +60,7 @@
 }
 
 proc package_pkg {portname portversion portrevision} {
-    global UI_PREFIX portdbpath destpath workpath prefix portresourcepath description package.destpath package.flat long_description homepage portpath
+    global UI_PREFIX portdbpath destpath workpath prefix description package.destpath package.flat long_description homepage portpath porturl
     global os.version os.major
 
     set pkgpath ${package.destpath}/${portname}-${portversion}.pkg
@@ -89,7 +89,7 @@
         }
     }
     write_welcome_html ${resourcepath}/${language}.lproj/Welcome.html $portname $portversion $pkg_long_description $pkg_description $pkg_homepage
-    file copy -force -- ${portresourcepath}/package/background.tiff ${resourcepath}/${language}.lproj/background.tiff
+    file copy -force -- [getportresourcepath $porturl "port1.0/package/background.tiff"] ${resourcepath}/${language}.lproj/background.tiff
 
     foreach dir {etc var tmp} {
         if ([file exists "${destpath}/$dir"]) {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081126/3f907c60/attachment.html>