Ticket #48680: port-lint-add-option-to-disable-parent-dirs-checks.diff

src/port/port.tcl

@@ -4412 +4412 @@
     variants    {index}
     clean       {all archive dist work logs}
     mirror      {new}
-    lint        {nitpick}
+    lint        {nitpick nodir}
     select      {list set show summary}
     log         {{phase 1} {level 1}}
     upgrade     {force enforce-variants no-replace no-rev-upgrade}

src/port1.0/portlint.tcl

@@ -123 +123 @@
 }
 
 proc portlint::lint_main {args} {
-    global UI_PREFIX name portpath porturl ports_lint_nitpick
+    global UI_PREFIX name portpath porturl ports_lint_nitpick ports_lint_nodir
     set portfile ${portpath}/Portfile
     set portdirs [split ${portpath} /]
     set last [llength $portdirs]
@@ -144 +144 @@
         set nitpick false
     }
 
+    if {[info exists ports_lint_nodir] && $ports_lint_nodir eq "yes"} {
+        set nodir true
+    } else {
+        set nodir false
+    }
+
     set topline_number 1
     set require_blank false
     set require_after ""
@@ -658 +664 @@
 
     }
 
-    # these checks are only valid for ports stored in the regular tree directories
-    if {[info exists category] && $portcatdir != $category} {
-        ui_error "Portfile parent directory $portcatdir does not match primary category $category"
-        incr errors
-    } else {
-        ui_info "OK: Portfile parent directory matches primary category"
+    if !{$nodir} {
+        # these checks are only valid for ports stored in the regular tree directories
+        if {[info exists category] && $portcatdir != $category} {
+            ui_error "Portfile parent directory $portcatdir does not match primary category $category"
+            incr errors
+        } else {
+            ui_info "OK: Portfile parent directory matches primary category"
+        }
+        if {$portdir != $name} {
+            ui_error "Portfile directory $portdir does not match port name $name"
+            incr errors
+        } else {
+            ui_info "OK: Portfile directory matches port name"
+        }
     }
-    if {$portdir != $name} {
-        ui_error "Portfile directory $portdir does not match port name $name"
-        incr errors
-    } else {
-        ui_info "OK: Portfile directory matches port name"
-    }
 
     if {$nitpick && [info exists patchfiles]} {
         foreach patchfile $patchfiles {