Ticket #777: info.diff

portdestroot.tcl

@@ -76 +76 @@
 }
 
 proc destroot_finish {args} {
-    global destroot
+    global destroot prefix
 
     # Prune empty directories in ${destroot}
     catch {system "find \"${destroot}\" -depth -type d -print | xargs rmdir 2>/dev/null"}
+    # Delete any info/dir file since we're going to run install-info
+    set dirfile "${destroot}/${prefix}/info/dir"
+    if {[file exists $dirfile]} {
+        ui_debug "removing $dirfile"
+        file delete -force $dirfile
+    }
     return 0
 }

portinstall.tcl

@@ -68 +68 @@
             exec touch -r $src_element $dst_element
         }
     }
+
+    # if it's an info file in an info directory, run install-info
+    if [regexp {(.*/info)/([^/]*\.info)$} $dst_element match path filename] {
+        system "install-info ${path}/${filename} ${path}/dir"
+    }
 }
 
 proc directory_dig {rootdir workdir {cwd ""}} {

portpackage.tcl

@@ -75 +75 @@
     file copy -force -- ${portresourcepath}/package/background.tiff ${pkgpath}/Contents/Resources/background.tiff
     system "mkbom ${destpath} ${pkgpath}/Contents/Archive.bom"
     system "cd ${destpath} && pax -x cpio -w -z . > ${pkgpath}/Contents/Archive.pax.gz"
+    write_postinstall_script ${pkgpath}/Contents/Resources/postinstall ${destpath}
 
     write_sizes_file ${pkgpath}/Contents/Resources/Archive.sizes ${portname} ${portversion} ${pkgpath} ${destpath}
 
@@ -243 +244 @@
 InstalledSize $installedSize
 CompressedSize $compressedSize"
     close $fd
+}
+
+proc write_postinstall_script {script destpath} {
+    set find [open "|find ${destpath} -name *.info" r]
+    # this never returns anything.
+    # why?  I dunno.  tcl is not my friend.
+    while {[gets $find fname] >= 0} {
+        if {![info exists scriptfile]} {
+            set scriptfile [open $script w]
+            puts $scriptfile "#!/bin/sh"
+        }
+        regexp "^${destpath}(/.*/info)/(\[^/]*\.info)$" $fname match path filename
+        puts $scriptfile "install-info ${path}/${filename} ${path}/dir"
+    }
+    if [info exists scriptfile] {
+        close $scriptfile
+        file attributes $script -permission +x
+    }
+    close $find
 }

portrpmpackage.tcl

@@ -159 +159 @@
 %build
 echo \"Go DarwinPorts\"
 %install
-%clean
-%files -f ${destroot}/../${portname}.filelist
-"
+%clean"
+    set filelist [open "${destroot}/../${portname}.filelist" r]
+    set post {}
+    set preun {}
+    while {[gets $filelist fname] >= 0} {
+        # if it's an info file in an info directory, run install-info
+        if [regexp {"(.*/info)/(.*\.info)"$} $fname match path filename] {
+            append post "install-info ${path}/${filename} ${path}/dir\n"
+            append preun "install-info --delete ${path}/${filename} ${path}/dir\n"
+        }
+    }
+    close $filelist
+    if {$post != {}} {
+        puts $specfd "%post
+${post}"
+    }
+    if {$preun != {}} {
+        puts $specfd "%preun
+${preun}"
+    }
+    puts $specfd "%files -f ${destroot}/../${portname}.filelist"
     close $specfd
 }

portuninstall.tcl

@@ -119 +119 @@
                         }
                     }
                 } else {
+                    # if it's an info file in an info directory, run install-info
+                    if [regexp {(.*/info)/([^/]*\.info)$} $fname match path filename] {
+                        system "install-info --delete ${path}/${filename} ${path}/dir"
+                    }
                     if [catch {file delete -- $fname}] {
                         ui_info "$UI_PREFIX  [format [msgcat::mc "Uninstall unable to remove file %s"] $fname]"
                         set uninst_err 1