--- lib/pkgtools/pkgtools.rb.orig	2015-05-28 01:10:15.000000000 +1000
+++ lib/pkgtools/pkgtools.rb	2020-10-06 23:49:05.315354000 +1100
@@ -1177,10 +1177,10 @@
 end
 
 module PkgConfig
-  uname = `uname -rm`.chomp
+  uname = `uname -rms`.chomp
 
-  if m = /^(((\d+)(?:\.\d+[^.\-]*?)+)-(\w+)(-\S+)?) (\w+)$/.match(uname)
-    OS_RELEASE, OS_REVISION, OS_MAJOR,
+  if m = /^(\w+) (((\d+)(?:\.\d+[^.\-]*?)+)-(\w+)(-\S+)?) (\w+)$/.match(uname)
+    OS_NAME, OS_RELEASE, OS_REVISION, OS_MAJOR,
       OS_BRANCH, os_patchlevel, OS_PLATFORM = m[1..-1]
     OS_PATCHLEVEL = os_patchlevel || ""
 
@@ -1198,8 +1198,8 @@
   end
 
   def pkg_site_mirror(root = ENV['PACKAGEROOT'] || 'ftp://ftp.FreeBSD.org/')
-    sprintf('%s/pub/FreeBSD/ports/%s/packages-%s/',
-	    root, OS_PLATFORM, OS_PKGBRANCH)
+    sprintf('%s/pub/%s/ports/%s/packages-%s/',
+	    root, OS_NAME, OS_PLATFORM, OS_PKGBRANCH)
   end
 
   def pkg_site_primary()