[100434] trunk/base/src/package1.0

blair at macports.org blair at macports.org
Tue Dec 11 21:42:07 PST 2012


Revision: 100434
          https://trac.macports.org/changeset/100434
Author:   blair at macports.org
Date:     2012-12-11 21:42:07 -0800 (Tue, 11 Dec 2012)
Log Message:
-----------
src/package1.0/*.tcl: trim trailing whitespace.

Modified Paths:
--------------
    trunk/base/src/package1.0/package.tcl
    trunk/base/src/package1.0/portdmg.tcl
    trunk/base/src/package1.0/portdpkg.tcl
    trunk/base/src/package1.0/portmdmg.tcl
    trunk/base/src/package1.0/portmpkg.tcl
    trunk/base/src/package1.0/portpkg.tcl
    trunk/base/src/package1.0/portportpkg.tcl
    trunk/base/src/package1.0/portrpm.tcl
    trunk/base/src/package1.0/portsrpm.tcl
    trunk/base/src/package1.0/portunarchive.tcl

Modified: trunk/base/src/package1.0/package.tcl
===================================================================
--- trunk/base/src/package1.0/package.tcl	2012-12-11 22:23:11 UTC (rev 100433)
+++ trunk/base/src/package1.0/package.tcl	2012-12-12 05:42:07 UTC (rev 100434)
@@ -17,7 +17,7 @@
 # 3. Neither the name of Apple Inc. nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
-# 
+#
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

Modified: trunk/base/src/package1.0/portdmg.tcl
===================================================================
--- trunk/base/src/package1.0/portdmg.tcl	2012-12-11 22:23:11 UTC (rev 100433)
+++ trunk/base/src/package1.0/portdmg.tcl	2012-12-12 05:42:07 UTC (rev 100434)
@@ -17,7 +17,7 @@
 # 3. Neither the name of Apple Inc. nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
-# 
+#
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -36,7 +36,7 @@
 
 set org.macports.dmg [target_new org.macports.dmg portdmg::dmg_main]
 target_runtype ${org.macports.dmg} always
-target_provides ${org.macports.dmg} dmg 
+target_provides ${org.macports.dmg} dmg
 target_requires ${org.macports.dmg} pkg
 
 namespace eval portdmg {
@@ -59,17 +59,17 @@
 proc portdmg::package_dmg {portname portversion portrevision} {
     global UI_PREFIX package.destpath portpath
     global os.platform os.arch os.version os.major
-    
+
     if {[expr (${portrevision} > 0)]} {
         set imagename "${portname}-${portversion}-${portrevision}"
     } else {
         set imagename "${portname}-${portversion}"
     }
-    
+
     set tmp_image ${package.destpath}/${imagename}.tmp.dmg
     set final_image ${package.destpath}/${imagename}.dmg
     set pkgpath ${package.destpath}/${portname}-${portversion}.pkg
-    
+
     if {[file readable $final_image] && ([file mtime ${final_image}] >= [file mtime ${portpath}/Portfile])} {
         ui_msg "$UI_PREFIX [format [msgcat::mc "Disk Image for %s-%s is up-to-date"] ${portname} ${portversion}]"
         return 0
@@ -101,6 +101,6 @@
         return -code error [format [msgcat::mc "Failed to internet-enable: %s"] ${final_image}]
     }
     file delete -force "${tmp_image}"
-    
+
     return 0
 }

Modified: trunk/base/src/package1.0/portdpkg.tcl
===================================================================
--- trunk/base/src/package1.0/portdpkg.tcl	2012-12-11 22:23:11 UTC (rev 100433)
+++ trunk/base/src/package1.0/portdpkg.tcl	2012-12-12 05:42:07 UTC (rev 100434)
@@ -18,7 +18,7 @@
 # 3. Neither the name of Apple Inc. nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
-# 
+#
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -54,7 +54,7 @@
 
 proc portdpkg::main {args} {
 	global UI_PREFIX destpath os.arch os.platform supported_archs configure.build_arch
-    
+
 	ui_msg "$UI_PREFIX [format [msgcat::mc "Creating dpkg for %s-%s"] [option subport] [option version]]"
 
 	# get deplist
@@ -95,7 +95,7 @@
 			set pkg_depends [join ${dependencies} ", "]
 		}
 	}
-	
+
 	# Create dpkg version number
 	if {[expr [option epoch] != 0]} {
 		set pkg_version "[option epoch]:[option version]"
@@ -125,11 +125,11 @@
 
 	# Discern correct architecture
 	# From http://www.debian.org/doc/debian-policy/ch-customized-programs.html#fr55:
-	# The following architectures and operating systems are currently recognised   
-	# by dpkg-archictecture. The architecture, arch, is one of the following:      
-	# alpha, arm, hppa, i386, ia64, m68k, mips, mipsel, powerpc, s390, sh, sheb,   
-	# sparc and sparc64. The operating system, os, is one of: linux, gnu,          
-	# freebsd and openbsd. Use of gnu in this string is reserved for the           
+	# The following architectures and operating systems are currently recognised
+	# by dpkg-archictecture. The architecture, arch, is one of the following:
+	# alpha, arm, hppa, i386, ia64, m68k, mips, mipsel, powerpc, s390, sh, sheb,
+	# sparc and sparc64. The operating system, os, is one of: linux, gnu,
+	# freebsd and openbsd. Use of gnu in this string is reserved for the
 	# GNU/Hurd operating system.
 	switch -regex ${configure.build_arch} {
 		i[3-9]86 { set pkg_arch "i386" }
@@ -144,7 +144,7 @@
 	} elseif {${pkg_arch} == "x86_64"} {
 		set pkg_arch "amd64"
 	}
-	
+
 	# An architecture-independent package
 	if {$supported_archs == "noarch"} {
 		set pkg_arch "all"
@@ -182,7 +182,7 @@
 	}
 	foreach {name array} $res {
 		array set portinfo $array
-	
+
 		if {[info exists portinfo(depends_run)] || [info exists portinfo(depends_lib)]} {
 			# get the union of depends_run and depends_lib
 			# xxx: only examines the portfile component of the depspec

Modified: trunk/base/src/package1.0/portmdmg.tcl
===================================================================
--- trunk/base/src/package1.0/portmdmg.tcl	2012-12-11 22:23:11 UTC (rev 100433)
+++ trunk/base/src/package1.0/portmdmg.tcl	2012-12-12 05:42:07 UTC (rev 100434)
@@ -17,7 +17,7 @@
 # 3. Neither the name of Apple Inc. nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
-# 
+#
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -36,7 +36,7 @@
 
 set org.macports.mdmg [target_new org.macports.mdmg portmdmg::mdmg_main]
 target_runtype ${org.macports.mdmg} always
-target_provides ${org.macports.mdmg} mdmg 
+target_provides ${org.macports.mdmg} mdmg
 target_requires ${org.macports.mdmg} mpkg
 
 namespace eval portmdmg {
@@ -59,17 +59,17 @@
 proc portmdmg::package_mdmg {portname portversion portrevision} {
     global UI_PREFIX package.destpath portpath
     global os.platform os.arch os.version os.major
-    
+
     if {[expr (${portrevision} > 0)]} {
         set imagename "${portname}-${portversion}-${portrevision}"
     } else {
         set imagename "${portname}-${portversion}"
     }
-    
+
     set tmp_image ${package.destpath}/${imagename}.tmp.dmg
     set final_image ${package.destpath}/${imagename}.dmg
     set mpkgpath ${package.destpath}/${portname}-${portversion}.mpkg
-    
+
     if {[file readable $final_image] && ([file mtime ${final_image}] >= [file mtime ${portpath}/Portfile])} {
         ui_msg "$UI_PREFIX [format [msgcat::mc "Disk Image for %s-%s is up-to-date"] ${portname} ${portversion}]"
         return 0
@@ -101,6 +101,6 @@
         return -code error [format [msgcat::mc "Failed to internet-enable: %s"] ${final_image}]
     }
     file delete -force "${tmp_image}"
-    
+
     return 0
 }

Modified: trunk/base/src/package1.0/portmpkg.tcl
===================================================================
--- trunk/base/src/package1.0/portmpkg.tcl	2012-12-11 22:23:11 UTC (rev 100433)
+++ trunk/base/src/package1.0/portmpkg.tcl	2012-12-12 05:42:07 UTC (rev 100434)
@@ -17,7 +17,7 @@
 # 3. Neither the name of Apple Inc. nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
-# 
+#
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -234,11 +234,11 @@
 
 proc portmpkg::mpkg_write_info_plist {infofile portname portversion portrevision destination dependencies} {
 	set vers [split $portversion "."]
-	
+
 	if {[string index $destination end] != "/"} {
 		append destination /
 	}
-	
+
 	set depxml ""
 	foreach dep $dependencies {
 		set dep [xml_escape $dep]

Modified: trunk/base/src/package1.0/portpkg.tcl
===================================================================
--- trunk/base/src/package1.0/portpkg.tcl	2012-12-11 22:23:11 UTC (rev 100433)
+++ trunk/base/src/package1.0/portpkg.tcl	2012-12-12 05:42:07 UTC (rev 100434)
@@ -17,7 +17,7 @@
 # 3. Neither the name of Apple Inc. nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
-# 
+#
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -300,7 +300,7 @@
     set long_description [xml_escape $long_description]
     set description [xml_escape $description]
     set homepage [xml_escape $homepage]
-	
+
     puts $fd "
 <html lang=\"en\">
 <head>
@@ -325,7 +325,7 @@
 }
 
 proc portpkg::write_sizes_file {sizesfile portname portversion pkgpath destpath} {
-    
+
     if {[catch {set numFiles [llength [split [exec [findBinary lsbom $portutil::autoconf::lsbom_path] -s ${pkgpath}/Contents/Archive.bom] "\n"]]} result]} {
         return -code error [format [msgcat::mc "Reading package bom failed: %s"] $result]
     }
@@ -343,7 +343,7 @@
     }
     incr installedSize $infoSize
     incr installedSize $bomSize
-	
+
     set fd [open ${sizesfile} w+]
     puts $fd "NumFiles $numFiles
 InstalledSize $installedSize

Modified: trunk/base/src/package1.0/portportpkg.tcl
===================================================================
--- trunk/base/src/package1.0/portportpkg.tcl	2012-12-11 22:23:11 UTC (rev 100433)
+++ trunk/base/src/package1.0/portportpkg.tcl	2012-12-12 05:42:07 UTC (rev 100434)
@@ -16,7 +16,7 @@
 # 3. Neither the name of Apple Inc. nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
-# 
+#
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -35,7 +35,7 @@
 
 set org.macports.portpkg [target_new org.macports.portpkg portportpkg::portpkg_main]
 target_runtype ${org.macports.portpkg} always
-target_provides ${org.macports.portpkg} portpkg 
+target_provides ${org.macports.portpkg} portpkg
 target_requires ${org.macports.portpkg} main
 
 namespace eval portportpkg {
@@ -58,7 +58,7 @@
     	ui_error "Please install the xar port before proceeding."
 		return -code error [msgcat::mc "Portpkg failed"]
     }
-    
+
     return $xar
 }
 
@@ -93,13 +93,13 @@
     global name prefix UI_PREFIX workpath portpath
 
 	set xar [xar_path]
-	
+
     set dirname "portpkg"
     set dirpath "${workpath}/${dirname}"
     set pkgpath "${workpath}/${name}.portpkg"
     set metaname "portpkg_meta.xml"
     set metapath "${workpath}/${metaname}"
-    
+
     # Expose and default some global variables
     set vars " maintainers categories description \
     	long_description master_sites homepage epoch version revision \
@@ -110,49 +110,49 @@
 	foreach var $vars {
 		if {![info exists $var]} { set $var {} }
 	}
-	
+
 	# Unobscure the maintainer addresses
 	set maintainers [unobscure_maintainers $maintainers]
 
     # Make sure our workpath is clean
     file delete -force $dirpath $metapath $pkgpath
-    
+
     # Create the portpkg directory
     file mkdir $dirpath
 
     # Move in the Portfile
     file copy Portfile ${dirpath}
-    
-    # Move in files    
+
+    # Move in files
     if {[file isdirectory "files"]} {
         file copy files ${dirpath}
     }
-    
+
     # Create the metadata subdoc
     set sd [open ${metapath} w]
     puts $sd "<portpkg version='1'>"
-    
+
 		puts $sd "<submitter>"
 			putel $sd name $submitter_name
 			putel $sd email $submitter_email
-			
+
 			# TODO provide means to set notes?
 			putel $sd notes ""
 		puts $sd "</submitter>"
-		
+
 		puts $sd "<package>"
 			putel $sd name $name
 			putel $sd homepage $homepage
 			putlist $sd categories category $categories
 			putlist $sd maintainers maintainer $maintainers
-			
+
 			putel $sd epoch $epoch
 			putel $sd version $version
 			putel $sd revision $revision
-			
+
 			putel $sd description [join $description]
 			putel $sd long_description [join $long_description]
-		
+
 			# TODO: variants has platforms in it
 			if {[info exists PortInfo(variants)]} {
 				if {[info exists PortInfo(variant_desc)]} {
@@ -160,7 +160,7 @@
 				} else {
 					array set descs ""
 				}
-	
+
 				puts $sd "<variants>"
 				foreach v $PortInfo(variants) {
 					puts $sd "<variant>"
@@ -174,36 +174,36 @@
 			} else {
 				putel $sd variants ""
 			}
-			
+
 			# TODO: Dependencies and platforms
 			#putel $sd dependencies ""
 			#putel $sd platforms ""
-			
+
 		puts $sd "</package>"
-		
+
     puts $sd "</portpkg>"
     close $sd
-    
+
     # Create portpkg.xar, including the metadata and the portpkg directory contents
     set cmd "cd ${workpath}; ${xar} -cf ${pkgpath} --exclude \\.DSStore --exclude \\.svn ${dirname} -s ${metapath} -n ${metaname}"
     if {[system $cmd] != ""} {
 		return -code error [format [msgcat::mc "Failed to create portpkg for port : %s"] $name]
     }
-    
+
     return ${pkgpath}
 }
 
 
 proc portportpkg::portpkg_main {args} {
     global name version portverbose prefix UI_PREFIX workpath portpath
-    
+
     ui_msg "$UI_PREFIX [format [msgcat::mc "Creating portpkg for %s-%s"] ${name} ${version}]"
 
     # Make sure we have a work directory
     file mkdir ${workpath}
-  
+
     # Create portpkg.xar in the work directory
     set pkgpath [create_portpkg]
- 
+
     return 0
 }

Modified: trunk/base/src/package1.0/portrpm.tcl
===================================================================
--- trunk/base/src/package1.0/portrpm.tcl	2012-12-11 22:23:11 UTC (rev 100433)
+++ trunk/base/src/package1.0/portrpm.tcl	2012-12-12 05:42:07 UTC (rev 100434)
@@ -17,7 +17,7 @@
 # 3. Neither the name of Apple Inc. nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
-# 
+#
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -53,16 +53,16 @@
 
 proc portrpm::rpm_main {args} {
     global subport version revision UI_PREFIX
-    
+
     ui_msg "$UI_PREFIX [format [msgcat::mc "Creating RPM package for %s-%s"] ${subport} ${version}]"
-    
+
     return [rpm_pkg $subport $version $revision]
 }
 
 proc portrpm::rpm_pkg {portname portversion portrevision} {
     global UI_PREFIX rpm.asroot package.destpath portdbpath destpath workpath prefix categories maintainers description long_description homepage epoch portpath
 	global os.platform os.arch os.version os.major supported_archs configure.build_arch license
-    
+
     set rpmdestpath ""
     if {![string equal ${package.destpath} ${workpath}] && ![string equal ${package.destpath} ""]} {
         set rpm.asroot no
@@ -83,7 +83,7 @@
     } elseif {${configure.build_arch} != ""} {
         set rpmbuildarch "--target ${configure.build_arch}"
     }
-    
+
     foreach dir [list "${prefix}/src/macports/RPMS" "${prefix}/src/apple/RPMS" "/usr/src/apple/RPMS" "/macports/rpms/RPMS"] {
         foreach arch [list ${configure.build_arch} ${os.arch} "fat" "noarch"] {
             set rpmpath "$dir/${arch}/${portname}-${portversion}-${portrevision}.${arch}.rpm"
@@ -94,7 +94,7 @@
             }
         }
     }
-    
+
     set specpath ${workpath}/${portname}.spec
     # long_description, description, or homepage may not exist
     foreach variable {long_description description homepage categories maintainers} {
@@ -106,7 +106,7 @@
     }
     set category   [lindex [split $categories " "] 0]
     set maintainer $maintainers
-    
+
     set dependencies {}
     # get deplist
     set deps [make_dependency_list $portname]
@@ -122,7 +122,7 @@
 
 	# depend on system (virtual packages for apple stuff)
 	lappend dependencies "org.macports.${os.platform}${os.major}"
-    
+
     set listpath ${workpath}/${portname}.filelist
     system "rm -f '${workpath}/${portname}.filelist' && touch '${workpath}/${portname}.filelist'"
     #system "cd '${destpath}' && find . -type d | grep -v -E '^.$' | sed -e 's/\"/\\\"/g' -e 's/^./%dir \"/' -e 's/$/\"/' > '${workpath}/${portname}.filelist'"
@@ -130,7 +130,7 @@
     system "cd '${destpath}' && find . ! -type d | grep /etc/ | sed -e 's/\"/\\\"/g' -e 's/^./%config \"/' -e 's/$/\"/' >> '${workpath}/${portname}.filelist'"
     write_spec ${specpath} ${destpath} ${listpath} $portname $portversion $portrevision $pkg_description $pkg_long_description $pkg_homepage $category $license $maintainer $dependencies $epoch
     system "MP_USERECEIPTS='${portdbpath}/receipts' rpmbuild -bb -v ${rpmbuildarch} ${rpmdestpath} ${specpath}"
-    
+
     return 0
 }
 
@@ -144,17 +144,17 @@
     }
     foreach {name array} $res {
         array set portinfo $array
-	
+
         if {[info exists portinfo(depends_run)] || [info exists portinfo(depends_lib)]} {
             # get the union of depends_run and depends_lib
             # xxx: only examines the portfile component of the depspec
             set depends {}
             if {[info exists portinfo(depends_run)]} { eval "lappend depends $portinfo(depends_run)" }
             if {[info exists portinfo(depends_lib)]} { eval "lappend depends $portinfo(depends_lib)" }
-	    
+
             foreach depspec $depends {
                 set dep [lindex [split $depspec :] end]
-		
+
                 # xxx: nasty hack
                 if {$dep != "XFree86"} {
                     eval "lappend result [make_dependency_list $dep]"

Modified: trunk/base/src/package1.0/portsrpm.tcl
===================================================================
--- trunk/base/src/package1.0/portsrpm.tcl	2012-12-11 22:23:11 UTC (rev 100433)
+++ trunk/base/src/package1.0/portsrpm.tcl	2012-12-12 05:42:07 UTC (rev 100434)
@@ -17,7 +17,7 @@
 # 3. Neither the name of Apple Inc. nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
-# 
+#
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,16 +49,16 @@
 
 proc portsrpm::srpm_main {args} {
     global subport version revision UI_PREFIX
-    
+
     ui_msg "$UI_PREFIX [format [msgcat::mc "Creating SRPM package for %s-%s"] ${subport} ${version}]"
-    
+
     return [srpm_pkg $subport $version $revision]
 }
 
 proc portsrpm::srpm_pkg {portname portversion portrevision} {
     global UI_PREFIX package.destpath portdbpath destpath workpath distpath prefix categories maintainers description long_description homepage epoch portpath distfiles fetch_urls
 	global os.platform os.arch os.version os.major
-    
+
     set rpmdestpath ""
     if {![string equal ${package.destpath} ${workpath}] && ![string equal ${package.destpath} ""]} {
         set pkgpath ${package.destpath}
@@ -69,7 +69,7 @@
                    ${pkgpath}/SRPMS
         set rpmdestpath "--define '_topdir ${pkgpath}'"
     }
-    
+
     foreach dir [list "${prefix}/src/macports/SRPMS" "${prefix}/src/apple/SRPMS" "/usr/src/apple/SRPMS" "/macports/rpms/SRPMS"] {
         foreach arch {"src" "nosrc"} {
             set rpmpath "$dir/${portname}-${portversion}-${portrevision}.${arch}.rpm"
@@ -80,7 +80,7 @@
             }
         }
     }
-    
+
     set specpath ${workpath}/${portname}-port.spec
     # long_description, description, or homepage may not exist
     foreach variable {long_description description homepage categories maintainers} {
@@ -93,7 +93,7 @@
     set category   [lindex [split $categories " "] 0]
     set license    "Unknown"
     set maintainer $maintainers
-    
+
     set dependencies {}
     # get deplist
     set deps [make_dependency_list $portname]
@@ -118,10 +118,10 @@
     foreach dist $distfiles {
         system "cp -p ${distpath}/${dist} ${sourcespath}/${dist}"
     }
-    
+
     write_port_spec ${specpath} $portname $portversion $portrevision $pkg_description $pkg_long_description $pkg_homepage $category $license $maintainer $distfiles $fetch_urls $dependencies $epoch $src
     system "rpmbuild -bs -v --nodeps ${rpmdestpath} ${specpath}"
-    
+
     return 0
 }
 
@@ -135,7 +135,7 @@
     }
     foreach {name array} $res {
         array set portinfo $array
-	
+
         if {[info exists portinfo(depends_fetch)] || [info exists portinfo(depends_extract)]
             || [info exists portinfo(depends_build)] || [info exists portinfo(depends_lib)]} {
             # get the union of depends_fetch, depends_extract, depends_build and depends_lib
@@ -145,10 +145,10 @@
             if {[info exists portinfo(depends_extract)]} { eval "lappend depends $portinfo(depends_extract)" }
             if {[info exists portinfo(depends_build)]} { eval "lappend depends $portinfo(depends_build)" }
             if {[info exists portinfo(depends_lib)]} { eval "lappend depends $portinfo(depends_lib)" }
-	    
+
             foreach depspec $depends {
                 set dep [lindex [split $depspec :] end]
-		
+
                 # xxx: nasty hack
                 if {$dep != "XFree86"} {
                     eval "lappend result [make_dependency_list $dep]"
@@ -219,7 +219,7 @@
     set count $first
     puts $specfd "#distfiles"
     foreach file ${distfiles} {
-    
+
         puts -nonewline $specfd "Source${count}: "
         if {![info exists $fetch_urls]} {
         foreach {url_var distfile}  ${fetch_urls} {

Modified: trunk/base/src/package1.0/portunarchive.tcl
===================================================================
--- trunk/base/src/package1.0/portunarchive.tcl	2012-12-11 22:23:11 UTC (rev 100433)
+++ trunk/base/src/package1.0/portunarchive.tcl	2012-12-12 05:42:07 UTC (rev 100434)
@@ -18,7 +18,7 @@
 # 3. Neither the name of Apple Inc. nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
-# 
+#
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121211/d1d98c0c/attachment-0001.html>


More information about the macports-changes mailing list