Changeset 1006 for trunk/base

Timestamp:

Oct 9, 2002, 7:06:24 AM (22 years ago)

Author:

jkh

Message:

Changes to support long_description (long-description unfortunately turned
out to be a bad name choice) and an attempt to sprinkle it through enough
ports to at least give people the idea in hopes they'll start adding it to
their ports. Also add to the registry entry and clean up some package
installation hook stuff while I'm in there.

Location:

trunk/base/src/port1.0

Files:

• portinstall.tcl (modified) (1 diff)
• portregistry.tcl (modified) (4 diffs)

trunk/base/src/port1.0/portinstall.tcl

@@ -46 +46 @@
 
 proc install_main {args} {
-    global portname portversion portpath categories description depends_run contents pkg_install pkg_deinstall workdir worksrcdir prefix build.type build.cmd build.target.install UI_PREFIX build.target.current
+    global portname portversion portpath categories description depends_run contents workdir worksrcdir prefix build.type build.cmd build.target.install UI_PREFIX build.target.current
 
     if ![file exists $prefix] {

trunk/base/src/port1.0/portregistry.tcl

@@ -39 +39 @@
 
 # define options
-options contents long-description description registry.nochecksum registry.path registry.nobzip registry.contents_recurse
+options contents long_description description registry.nochecksum registry.path registry.nobzip registry.contents_recurse
 
 # Export options via PortInfo
-options_export description long-description
+options_export description long_description
 
 default registry.path {[file join ${portdbpath} receipts]}
@@ -201 +201 @@
 
 proc registry_main {args} {
-    global portname portversion portpath categories description depends_run contents pkg_install pkg_deinstall workdir worksrcdir prefix UI_PREFIX
+    global portname portversion portpath categories description long_description depends_run contents package-install uninstall workdir worksrcdir prefix UI_PREFIX
 
     # Package installed successfully, so now we must register it
     set rhandle [registry_new $portname $portversion]
     ui_msg "$UI_PREFIX Adding $portname to registry, this may take a moment..."
+
     registry_store $rhandle [list prefix $prefix]
     registry_store $rhandle [list categories $categories]
@@ -211 +212 @@
         registry_store $rhandle [concat description $description]
     }
+    if [info exists long_description] {
+        registry_store $rhandle [concat long_description ${long_description}]
+    }
     if [info exists depends_run] {
         registry_store $rhandle [list run_depends $depends_run]
+    }
+    if [info exists package-install] {
+        registry_store $rhandle [concat package-install ${package-install}]
     }
     if [info exists contents] {
@@ -223 +230 @@
         registry_store $rhandle $x
     }
-    if {[info proc pkg_install] == "pkg_install"} {
-        registry_store $rhandle [list pkg_install [proc_disasm pkg_install]]
-    }
-    if {[info proc pkg_uninstall] == "pkg_uninstall"} {
-        registry_store $rhandle [list pkg_uninstall [proc_disasm pkg_uninstall]]
+    if {[info proc uninstall] == "uninstall"} {
+        registry_store $rhandle [list uninstall [proc_disasm uninstall]]
     }
     registry_close $rhandle