Ticket #806: pkg_detection.diff

src/darwinports1.0/darwinports.tcl

@@ -660 +660 @@
         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}]
     }
@@ -676 +682 @@
     }
     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/port1.0/portcontents.tcl

@@ -47 +47 @@
         if {[regexp .bz2$ $rfile]} {
             set fd [open "|bunzip2 -c $rfile" r]
         } else {
+                if {[regexp .pkg$ $rfile]} {
+                        ui_warn "Port registered with Installer.app, listing BOM instead"
+                ui_msg "[format [msgcat::mc "Contents of %s-%s BOM"] ${portname} ${portversion}]"
+                        if {![catch {exec lsbom -f -s [file join $rfile Contents/Archive.bom]} bom_output]} {
+                                foreach f [split $bom_output \n] {
+                                        ui_msg "\t$f"
+                                }
+                        } else {
+                                return -code error "[format [msgcat::mc "Could not list BOM for %s-%s"] ${portname} ${portversion}]"
+                        }
+                        return
+                } else {
             set fd [open $rfile r]
+                }
         }
         set entry [read $fd]
         close $fd

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 {