Skip to content
Permalink
Browse files

Fixed bug in name of .info, .sizes, .bom (symlink), and .pax.gz (syml…

…ink).

Names must match package name.

git-svn-id: https://svn.macports.org/repository/macports/trunk/base@2059 d073be05-634f-4543-b044-5fe20cf6d1d6
  • Loading branch information
Kevin Van Vechten
Kevin Van Vechten committed Feb 20, 2003
1 parent e6eb82e commit e3d9507ebfeaecaf3a59ef9caf042086dce9db3d
Showing with 7 additions and 7 deletions.
  1. +1 −1 src/port1.0/portmpkg.tcl
  2. +6 −6 src/port1.0/portpackage.tcl
@@ -137,7 +137,7 @@ proc package_mpkg {portname portversion} {
lappend dependencies ${portname}-${portversion}.pkg

write_PkgInfo ${mpkgpath}/Contents/PkgInfo
write_info_file ${mpkgpath}/Contents/Resources/${portname}.info $portname $portversion $description
write_info_file ${mpkgpath}/Contents/Resources/${portname}-${portversion}.info $portname $portversion $description
mpkg_write_info_plist ${mpkgpath}/Contents/Info.plist $portname $portversion $prefix $dependencies
write_description_plist ${mpkgpath}/Contents/Resources/Description.plist $portname $portversion $description
# long_description, description, or homepage may not exist
@@ -61,7 +61,7 @@ proc package_pkg {portname portversion} {
set pkgpath ${package.destpath}/${portname}-${portversion}.pkg
system "mkdir -p -m 0755 ${pkgpath}/Contents/Resources"
write_PkgInfo ${pkgpath}/Contents/PkgInfo
write_info_file ${pkgpath}/Contents/Resources/${portname}.info $portname $portversion $description
write_info_file ${pkgpath}/Contents/Resources/${portname}-${portversion}.info $portname $portversion $description
write_info_plist ${pkgpath}/Contents/Info.plist $portname $portversion
write_description_plist ${pkgpath}/Contents/Resources/Description.plist $portname $portversion $description
# long_description, description, or homepage may not exist
@@ -75,11 +75,11 @@ proc package_pkg {portname portversion} {
write_welcome_html ${pkgpath}/Contents/Resources/Welcome.html $portname $portversion $pkg_long_description $pkg_description $pkg_homepage
file copy -force -- ${portresourcepath}/package/background.tiff ${pkgpath}/Contents/Resources/background.tiff
system "mkbom ${destpath} ${pkgpath}/Contents/Archive.bom"
system "cd ${pkgpath}/Contents/Resources/ && ln -fs ../Archive.bom ${portname}.bom"
system "cd ${pkgpath}/Contents/Resources/ && ln -fs ../Archive.bom ${portname}-${portversion}.bom"
system "cd ${destpath} && pax -w -z . > ${pkgpath}/Contents/Archive.pax.gz"
system "cd ${pkgpath}/Contents/Resources/ && ln -fs ../Archive.pax.gz ${portname}.pax.gz"
system "cd ${pkgpath}/Contents/Resources/ && ln -fs ../Archive.pax.gz ${portname}-${portversion}.pax.gz"

write_sizes_file ${pkgpath}/Contents/Resources/${portname}.sizes ${portname} ${pkgpath} ${destpath}
write_sizes_file ${pkgpath}/Contents/Resources/${portname}-${portversion}.sizes ${portname} ${portversion} ${pkgpath} ${destpath}

return 0
}
@@ -225,7 +225,7 @@ puts $fd "
close $fd
}

proc write_sizes_file {sizesfile portname pkgpath destpath} {
proc write_sizes_file {sizesfile portname portversion pkgpath destpath} {

if {[catch {set numFiles [exec lsbom -s ${pkgpath}/Contents/Archive.bom | wc -l]} result]} {
return -code error [format [msgcat::mc "Reading package bom failed: %s"] $result]
@@ -236,7 +236,7 @@ proc write_sizes_file {sizesfile portname pkgpath destpath} {
if {[catch {set installedSize [expr [dirSize ${destpath}] / 1024]} result]} {
return -code error [format [msgcat::mc "Error determining installed size: %s"] $result]
}
if {[catch {set infoSize [file size ${pkgpath}/Contents/Resources/${portname}.info]} result]} {
if {[catch {set infoSize [file size ${pkgpath}/Contents/Resources/${portname}-${portversion}.info]} result]} {
return -code error [format [msgcat::mc "Error determining info file size: %s"] $result]
}
if {[catch {set bomSize [file size ${pkgpath}/Contents/Archive.bom]} result]} {

0 comments on commit e3d9507

Please sign in to comment.
You can’t perform that action at this time.