Ticket #806: pkg_detection.2.diff

src/darwinports1.0/darwinports.tcl

@@ -669 +669 @@
         if {[string length $x]} {
             set matchfile [lindex $x 0]
         } else {
+                # check Installer.app receipts also ...
+                set x [glob -nocomplain [file join /Library/Receipts ${portname}-*]]
+                if {[string length $x]} {
+                        set matchfile [lindex $x 0]
+                } else {
             set matchfile ""
         }
+        }
     } else {
         set matchfile [file join ${darwinports::registry.path} ${portname}-${portversion}]
     }
@@ -685 +691 @@
     }
     if {[file exists ${matchfile}.bz2]} {
         return ${matchfile}.bz2
+    }
+        # check Installer.app receipts also ...
+        set matchfile [file join /Library/Receipts ${portname}-${portversion}]
+    if {[file exists ${matchfile}.pkg]} {
+                return ${matchfile}.pkg
     }
     return ""
 }

src/port/port.tcl

@@ -274 +274 @@
                 set shortname [file rootname [file tail $rfile]]
                 set fd [open "|bzcat -q $rfile" r]
             } else {
+                                if {[file extension $rfile] == ".pkg"} {
+                                        set shortname [file rootname [file tail $rfile]]
+                                        puts "Port registered with Installer.app, listing BOM instead"
+                                        puts "Contents of ${shortname} BOM"
+                                        if {![catch {exec lsbom -f -s [file join $rfile Contents/Archive.bom]} bom_output]} {
+                                                foreach f [split $bom_output \n] {
+                                                        puts "\t[string trimleft $f .]"
+                                                }
+                                        } else {
+                                                puts "Port failed: Could not list BOM for ${shortname}"
+                                                exit 1
+                                        }
+                                        return
+                                } else {
                 set shortname [file tail $rfile]
                 set fd [open $rfile r]
+                                }
             }
             set entry [read $fd]
             # kind of a corner case but I ran into it testing

src/port1.0/portuninstall.tcl

@@ -61 +61 @@
 
     set rfile [registry_exists $portname $portversion]
     if {[string length $rfile]} {
+                if {[regexp .pkg$ $rfile]} {
+                        return -code error [msgcat::mc "Uninstall failed: Port registered with Installer.app, must use Uninstaller.app to uninstall"]
+                }
         if {[regexp .bz2$ $rfile]} {
             set fd [open "|bunzip2 -c $rfile" r]
         } else {