[26714] branches/release_1_5/base

[source_changes at macosforge.org]

Revision: 26714
          http://trac.macosforge.org/projects/macports/changeset/26714
Author:   jmpp at macports.org
Date:     2007-07-04 15:18:52 -0700 (Wed, 04 Jul 2007)

Log Message:
-----------
Merged revisions 26609,26611-26654,26656-26681,26683-26692,26695-26708,26712-26713 via svnmerge from 
http://svn.macports.org/repository/macports/trunk/base

........
  r26639 | afb at macports.org | 2007-07-01 06:37:12 -0400 (Sun, 01 Jul 2007) | 1 line
  
  remove the org.macports.${os.arch} dependency, it breaks universal packages and is redundant with the rpm build arch anyway
........
  r26643 | afb at macports.org | 2007-07-01 09:29:11 -0400 (Sun, 01 Jul 2007) | 1 line
  
  compare RPM/SRPM with archive/portpkg
........

Modified Paths:
--------------
    branches/release_1_5/base/src/package1.0/portrpm.tcl
    branches/release_1_5/base/src/port/port.1

Property Changed:
----------------
    branches/release_1_5/base/


Property changes on: branches/release_1_5/base
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/base:1-26608
   + /trunk/base:1-26609,26611-26654,26656-26681,26683-26692,26695-26708,26712-26713

Modified: branches/release_1_5/base/src/package1.0/portrpm.tcl
===================================================================
--- branches/release_1_5/base/src/package1.0/portrpm.tcl	2007-07-04 22:17:05 UTC (rev 26713)
+++ branches/release_1_5/base/src/package1.0/portrpm.tcl	2007-07-04 22:18:52 UTC (rev 26714)
@@ -109,7 +109,6 @@
 
 	# depend on system (virtual packages for apple stuff)
 	regexp {[0-9]+} ${os.version} major
-	lappend dependencies "org.macports.${os.arch}"
 	lappend dependencies "org.macports.${os.platform}${major}"
     
     set listpath ${workpath}/${portname}.filelist

Modified: branches/release_1_5/base/src/port/port.1
===================================================================
--- branches/release_1_5/base/src/port/port.1	2007-07-04 22:17:05 UTC (rev 26713)
+++ branches/release_1_5/base/src/port/port.1	2007-07-04 22:18:52 UTC (rev 26714)
@@ -494,10 +494,12 @@
 .Ar portname .
 .Ss rpm
 Creates an RPM binary package of
-.Ar portname .
+.Ar portname ,
+similar to a tgz "archive".
 .Ss srpm
 Creates a SRPM source package of
-.Ar portname .
+.Ar portname ,
+similar to a xar "portpkg".
 .Ss dpkg
 Creates a DEB binary package of
 .Ar portname .

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