[50801] trunk/base/src

[jmr at macports.org]

Revision: 50801
          http://trac.macports.org/changeset/50801
Author:   jmr at macports.org
Date:     2009-05-09 14:38:45 -0700 (Sat, 09 May 2009)
Log Message:
-----------
Add a license field to PortInfo (#7493)

Modified Paths:
--------------
    trunk/base/src/port/port.tcl
    trunk/base/src/port1.0/portinstall.tcl
    trunk/base/src/port1.0/portmain.tcl

Modified: trunk/base/src/port/port.tcl
===================================================================
--- trunk/base/src/port/port.tcl	2009-05-09 20:53:18 UTC (rev 50800)
+++ trunk/base/src/port/port.tcl	2009-05-09 21:38:45 UTC (rev 50801)
@@ -1468,6 +1468,7 @@
             homepage    Homepage
             platforms   Platforms
             maintainers Maintainers
+            license     License
         }
 
         # Wrap-length map for pretty printing
@@ -1481,6 +1482,7 @@
             long_description 22
             homepage 22
             platforms 22
+            license 22
             maintainers 22
         }
 
@@ -1535,7 +1537,8 @@
                 ports_info_long_description ports_info_homepage 
                 ports_info_skip_line ports_info_depends_build
                 ports_info_depends_lib ports_info_depends_run
-                ports_info_platforms ports_info_maintainers
+                ports_info_platforms ports_info_license
+                ports_info_maintainers
             }
         }
         foreach { option } $opts_todo {
@@ -3068,8 +3071,8 @@
     edit        {{editor 1}}
     ed          {{editor 1}}
     info        {category categories depends_build depends_lib depends_run
-                 depends description epoch fullname heading homepage index line
-                 long_description
+                 depends description epoch fullname heading homepage index license
+                 line long_description
                  maintainer maintainers name platform platforms portdir pretty
                  revision variant variants version}
     search      {case-sensitive category categories depends_build depends_lib depends_run

Modified: trunk/base/src/port1.0/portinstall.tcl
===================================================================
--- trunk/base/src/port1.0/portinstall.tcl	2009-05-09 20:53:18 UTC (rev 50800)
+++ trunk/base/src/port1.0/portinstall.tcl	2009-05-09 21:38:45 UTC (rev 50801)
@@ -155,6 +155,9 @@
     if {[info exists long_description]} {
         registry_prop_store $regref long_description [string map {\n \\n} ${long_description}]
     }
+    if {[info exists license]} {
+        registry_prop_store $regref license ${license}
+    }
     if {[info exists homepage]} {
         registry_prop_store $regref homepage ${homepage}
     }

Modified: trunk/base/src/port1.0/portmain.tcl
===================================================================
--- trunk/base/src/port1.0/portmain.tcl	2009-05-09 20:53:18 UTC (rev 50800)
+++ trunk/base/src/port1.0/portmain.tcl	2009-05-09 21:38:45 UTC (rev 50801)
@@ -45,12 +45,12 @@
 
 # define options
 options prefix macportsuser name version revision epoch categories maintainers
-options long_description description homepage
+options long_description description homepage license
 options worksrcdir filesdir distname portdbpath libpath distpath sources_conf os.platform os.version os.major os.arch os.endian platforms default_variants install.user install.group macosx_deployment_target
 options universal_variant os.universal_supported
 
 # Export options via PortInfo
-options_export name version revision epoch categories maintainers platforms description long_description homepage
+options_export name version revision epoch categories maintainers platforms description long_description homepage license
 
 # Assign option procedure to default_variants
 option_proc default_variants handle_default_variants
@@ -68,6 +68,7 @@
 default filesdir files
 default revision 0
 default epoch 0
+default license unknown
 default distname {${portname}-${portversion}}
 default worksrcdir {$distname}
 default filespath {[file join $portpath $filesdir]}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090509/6362b774/attachment.html>