[26803] branches/release_1_5/base

[source_changes at macosforge.org]

Revision: 26803
          http://trac.macosforge.org/projects/macports/changeset/26803
Author:   jmpp at macports.org
Date:     2007-07-08 13:18:53 -0700 (Sun, 08 Jul 2007)

Log Message:
-----------
Merged revisions 26611-26638,26640-26642,26644-26654,26656-26681,26683-26692,26695-26708,26712-26718,26720,26724-26729,26732-26743,26745-26752,26754-26802 via svnmerge from 
http://svn.macports.org/repository/macports/trunk/base

........
  r26737 | afb at macports.org | 2007-07-05 14:53:40 -0400 (Thu, 05 Jul 2007) | 1 line
  
  hard wrap the rpm %description
........
  r26765 | afb at macports.org | 2007-07-06 05:04:23 -0400 (Fri, 06 Jul 2007) | 1 line
  
  typo: MacOS X -> Mac OS X
........

Modified Paths:
--------------
    branches/release_1_5/base/doc/portfile.7
    branches/release_1_5/base/doc/portgroup.7
    branches/release_1_5/base/src/package1.0/portrpm.tcl
    branches/release_1_5/base/src/package1.0/portsrpm.tcl

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


Property changes on: branches/release_1_5/base
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/base:1-26609,26611-26654,26656-26681,26683-26692,26695-26713,26719-26736,26738-26743,26745-26753
   + /trunk/base:1-26609,26611-26654,26656-26681,26683-26692,26695-26743,26745-26802

Modified: branches/release_1_5/base/doc/portfile.7
===================================================================
--- branches/release_1_5/base/doc/portfile.7	2007-07-08 19:40:17 UTC (rev 26802)
+++ branches/release_1_5/base/doc/portfile.7	2007-07-08 20:18:53 UTC (rev 26803)
@@ -1334,7 +1334,7 @@
 .Sy Example:
 .Dl default_variants +ssl +tcpd
 .It Ic universal_variant
-When using MacPorts on MacOS X, a universal variant is defined and
+When using MacPorts on Mac OS X, a universal variant is defined and
 the default behavior is to configure ports with universal flags
 (see the
 .Ic UNIVERSAL TARGET HOOKS

Modified: branches/release_1_5/base/doc/portgroup.7
===================================================================
--- branches/release_1_5/base/doc/portgroup.7	2007-07-08 19:40:17 UTC (rev 26802)
+++ branches/release_1_5/base/doc/portgroup.7	2007-07-08 20:18:53 UTC (rev 26803)
@@ -58,7 +58,7 @@
 Using
 .Nm PortGroup xcode
 is a way to make your port more robust to Xcode version updates as the PortGroup
-is tested against all supported MacOS X and Xcode versions.
+is tested against all supported Mac OS X and Xcode versions.
 .Sh XCODE PORTGROUP SUGAR
 Portfiles using xcode PortGroup do not need to define the following variables:
 .Bl -tag -width lc

Modified: branches/release_1_5/base/src/package1.0/portrpm.tcl
===================================================================
--- branches/release_1_5/base/src/package1.0/portrpm.tcl	2007-07-08 19:40:17 UTC (rev 26802)
+++ branches/release_1_5/base/src/package1.0/portrpm.tcl	2007-07-08 20:18:53 UTC (rev 26803)
@@ -156,6 +156,36 @@
     return $result
 }
 
+proc word_wrap {orig Length} {
+    set pos 0
+    set line ""
+    set text ""
+
+    set words [split $orig]
+    set numWords [llength $words]
+    for {set cnt 0} {$cnt < $numWords} {incr cnt} {
+	set w [lindex $words $cnt]
+	set wLen [string length $w]
+
+	if {($pos+$wLen < $Length)} {
+	    # append word to current line
+	    if {$pos} {append line " "; incr pos}
+	    append line $w
+	    incr pos $wLen
+	} else {
+	    # line full => write buffer and  begin a new line
+	    if {[string length $text]} {append text "\n"}
+	    append text $line
+	    set line $w
+	    set pos $wLen
+	}
+    }
+
+    if {[string length $text]} {append text "\n"}
+    if {[string length $line]} {append text $line}
+    return $text
+}
+
 proc write_spec {specfile destroot filelist portname portversion portrevision description long_description homepage category license maintainer dependencies epoch} {
     set specfd [open ${specfile} w+]
     set origportname ${portname}
@@ -188,9 +218,10 @@
 	    puts $specfd "Requires: [regsub -all -- "\-" $require "_"]"
 	}
     }
+    set wrap_description [word_wrap ${long_description} 72]
     puts $specfd "
 %description
-${long_description}
+$wrap_description
 
 %prep
 %build

Modified: branches/release_1_5/base/src/package1.0/portsrpm.tcl
===================================================================
--- branches/release_1_5/base/src/package1.0/portsrpm.tcl	2007-07-08 19:40:17 UTC (rev 26802)
+++ branches/release_1_5/base/src/package1.0/portsrpm.tcl	2007-07-08 20:18:53 UTC (rev 26803)
@@ -155,6 +155,36 @@
     return $result
 }
 
+proc word_wrap {orig Length} {
+    set pos 0
+    set line ""
+    set text ""
+
+    set words [split $orig]
+    set numWords [llength $words]
+    for {set cnt 0} {$cnt < $numWords} {incr cnt} {
+	set w [lindex $words $cnt]
+	set wLen [string length $w]
+
+	if {($pos+$wLen < $Length)} {
+	    # append word to current line
+	    if {$pos} {append line " "; incr pos}
+	    append line $w
+	    incr pos $wLen
+	} else {
+	    # line full => write buffer and  begin a new line
+	    if {[string length $text]} {append text "\n"}
+	    append text $line
+	    set line $w
+	    set pos $wLen
+	}
+    }
+
+    if {[string length $text]} {append text "\n"}
+    if {[string length $line]} {append text $line}
+    return $text
+}
+
 proc write_port_spec {specfile portname portversion portrevision description long_description homepage category license maintainer distfiles fetch_urls dependencies epoch src} {
     set specfd [open ${specfile} w+]
     set origportname ${portname}
@@ -206,9 +236,10 @@
 	    puts $specfd "BuildRequires: [regsub -all -- "\-" $require "_"]"
 	}
     }
+    set wrap_description [word_wrap ${long_description} 72]
     puts $specfd "
 %description
-${long_description}
+$wrap_description
 
 %prep
 %setup -c -a 1 -T

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