major improvements and updates

- Update manuals to the 6.5 release
- Vefify sets using signify
- Move reformatting into a dedicated, multiprocess shell script.
- Other small improvements

3 files changed, 59 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 66ce7d88683c..9f8d1b634d1d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,24 @@
 pkgbase = openbsd-manpages
-	pkgdesc = The OpenBSD manual pages.
-	pkgver = 6.4
-	pkgrel = 2
+	pkgdesc = The OpenBSD manuals
+	pkgver = 6.5
+	pkgrel = 1
 	url = https://man.openbsd.org/
-	arch = x86_64
+	arch = any
 	license = BSD
-	source = https://cdn.openbsd.org/pub/OpenBSD/6.4/amd64/man64.tgz
-	source = https://cdn.openbsd.org/pub/OpenBSD/6.4/amd64/xshare64.tgz
-	sha256sums = 103c9d441b33fbb3b56ada9a0db8c443e51137a914ef953ff4c592c7c867208a
-	sha256sums = ef377b4810dcb110b138b94f3df8b6640b399eabd7678a76009eb85acb633ca0
+	makedepends = signify
+	options = !strip
+	source = https://ftp.openbsd.org/pub/OpenBSD/6.5/openbsd-65-base.pub
+	source = SHA256::https://ftp.openbsd.org/pub/OpenBSD/6.5/amd64/SHA256.sig
+	source = https://ftp.openbsd.org/pub/OpenBSD/6.5/amd64/man65.tgz
+	source = https://ftp.openbsd.org/pub/OpenBSD/6.5/amd64/comp65.tgz
+	source = https://ftp.openbsd.org/pub/OpenBSD/6.5/amd64/xshare65.tgz
+	source = manfmt
+	sha256sums = 7fcc2aec60009be208389b7f0dcff148232eb3fb3cd750b532942c7ec4dfb4fe
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = 335fa03d90fa0829327b8ba861fd5fda18d8da83a3d3e04ff21fde27037b62bb
 
 pkgname = openbsd-manpages
 
diff --git a/PKGBUILD b/PKGBUILD
index ff88ee1dfd4f..136a1a839268 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,41 @@
-# $Id$
-# Maintainer: Mohammadreza Abdollahzadeh <morealaz at gmail dot com>
+# Maintainer: Stephen Gregoratto <dev@sgregoratto.me>
+# Contributor: Mohammadreza Abdollahzadeh <morealaz@gmail.com>
+# Contributor: navigaid <navigaid@gmail.com>
 pkgname=openbsd-manpages
-pkgver=6.4
-pkgrel=2
-pkgdesc="The OpenBSD manual pages."
-arch=('x86_64')
+pkgver=6.5
+pkgrel=1
+pkgdesc="The OpenBSD manuals"
+arch=('any')
+options=('!strip')
 url="https://man.openbsd.org/"
+# Change this to your local mirror for faster downloads
+# See https://www.openbsd.org/ftp.html
+_mirrorurl="https://ftp.openbsd.org/pub/OpenBSD"
 license=('BSD')
-source=("https://cdn.openbsd.org/pub/OpenBSD/${pkgver}/amd64/man${pkgver//./}.tgz"
-        "https://cdn.openbsd.org/pub/OpenBSD/${pkgver}/amd64/xshare${pkgver//./}.tgz")
-sha256sums=('103c9d441b33fbb3b56ada9a0db8c443e51137a914ef953ff4c592c7c867208a'
-            'ef377b4810dcb110b138b94f3df8b6640b399eabd7678a76009eb85acb633ca0')
+makedepends=('signify')
+source=("${_mirrorurl}/${pkgver}/openbsd-${pkgver//./}-base.pub"
+        "SHA256::${_mirrorurl}/${pkgver}/amd64/SHA256.sig"
+        "${_mirrorurl}/${pkgver}/amd64/man${pkgver//./}.tgz"
+        "${_mirrorurl}/${pkgver}/amd64/comp${pkgver//./}.tgz"
+        "${_mirrorurl}/${pkgver}/amd64/xshare${pkgver//./}.tgz"
+        'manfmt')
+sha256sums=('7fcc2aec60009be208389b7f0dcff148232eb3fb3cd750b532942c7ec4dfb4fe'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            '335fa03d90fa0829327b8ba861fd5fda18d8da83a3d3e04ff21fde27037b62bb')
 
 prepare() {
-  # Renaming man pages for consistency with linux man pages.	
-  cd ${srcdir}/usr/share/man
-  find . -type f -exec mv '{}' '{}openbsd' \;
-  cd ${srcdir}/usr/X11R6/man
-  find . -type f -exec mv '{}' '{}openbsd' \;
+  signify -Cp "openbsd-65-base.pub" -x "SHA256" *.tgz
 }
 
 package() {
-  install -d ${pkgdir}/usr/share/man
-  cd ${srcdir}/usr/share/man
-  cp -a ./man* ${pkgdir}/usr/share/man/
-  cd ${srcdir}/usr/X11R6/man
-  cp -a ./man* ${pkgdir}/usr/share/man/
+  mkdir -p ${pkgdir}/usr/share/man/man{1,2,3,3p,4,5,7,8,9}
+
+  msg2 "Reformatting for consistency with the Linux manuals "\
+  "(this may take a while...)"
+  export srcdir pkgdir pkgver
+  find ${srcdir}/usr/{share,X11R6}/man/man*/* -maxdepth 0 -type f |
+    xargs -P "$(nproc)" -n 1 "$srcdir/manfmt"
 }
-# vim:set ts=2 sw=2 et:
diff --git a/manfmt b/manfmt
new file mode 100755
index 000000000000..875aa3b06701
--- /dev/null
+++ b/manfmt
@@ -0,0 +1,9 @@
+#!/bin/bash
+if [ -z "$1" ]; then
+	echo "usage: manfmt file" 1>&2
+	exit 1
+fi
+
+OUTFILE="$pkgdir/${1#$srcdir/}openbsd"
+OUTFILE="${OUTFILE/X11R6/share}"
+sed "0,/^.Os/s//\0 OpenBSD $pkgver/" "$1" > "$OUTFILE"