Reverting "netbsd port adjusts"
Revert "netbsd port adjusts"

This reverts commit f47553e8e33c6e8285430f3505d6934312b7c776.
Reverting "Reverting "netbsd port adjusts" Revert "netbsd port adjusts""
Revert "Reverting "netbsd port adjusts""

This reverts commit 03fe1c25bb6a60b9aca8cfc067605c8165fe7732.