Merge and solve conflicts

README.md

@@ -4,7 +4,7 @@ CRUX-ARM aarch64 ports overlay for RaspberryPi 3
 
 To use these ports, download the `raspberrypi3-arm64.httpup` file to `/etc/ports`:
 ```
-$ sudo wget -P /etc/ports https://raw.githubusercontent.com/crux-arm/crux-ports-raspberrypi3-arm64/3.6/raspberrypi3-arm64.httpup
+$ sudo wget -P /etc/ports https://raw.githubusercontent.com/crux-arm/crux-ports-raspberrypi3-arm64/3.7/raspberrypi3-arm64.httpup
 $ sudo ports -u raspberrypi3-arm64
 ```
 
@@ -23,4 +23,3 @@ prtdir /usr/ports/core
 prtdir /usr/ports/opt
 prtdir /usr/ports/xorg
 ```
-

prt-get/.signature

@@ -1,7 +1,7 @@
-untrusted comment: verify with /etc/ports/raspberrypi3-arm.pub
-RWROOThsoDo5hN1NdM+oU6ZvbdgdlsITlpRDjosTkLzUQ0VkGqHSFM2dz3JAnZDGgL2atXFO6rAkinH9MfZDJg7m+gfyBRpy1AQ=
+untrusted comment: verify with /etc/ports/raspberrypi3-arm64.pub
+RWROOThsoDo5hLeshIURW3UEG6wjeRdRTwtnIUzi84s+CJuXTBQwB3P2XIGphsUPT5tnwg0ugS4IaLlpNh0/6ifFfsLoHt5vcwM=
 SHA256 (Pkgfile) = ade6ded9ff960ea4ab6301beb05a102cc78ac9f948bc2e5360724c11b067736f
 SHA256 (.footprint) = 26802764ae3ae1e1a73ea56c859b3415e250a72ea444af410381df8c8f5d3ac8
 SHA256 (prt-get-5.19.6.tar.xz) = 6ea89df308e19a6239f260c91036805cd2063d0cd24a7427235849634dd49f0d
-SHA256 (prt-get.conf) = 273016a04c7412ea01023285a46451b74d58335a7879549c81e846dbe1e5024e
+SHA256 (prt-get.conf) = a7b8a85134ef1d0993679398e1ae24dbc1d3f027e4cd7b01b5537b55bc9cdc22
 SHA256 (prt-get.aliases) = df473d38e59d1d6cd859d986a5d6586fdc54bfd51663313c63a939e941984b7b

prt-get/prt-get.conf

@@ -5,7 +5,7 @@
 ## configure directories prt-get will source ports from
 ## note: the order matters: the package found first is used
 
-prtdir /usr/ports/raspberrypi3-arm
+prtdir /usr/ports/raspberrypi3-arm64
 prtdir /usr/ports/core-arm64
 prtdir /usr/ports/opt-arm64
 prtdir /usr/ports/xorg-arm64