From a3d92298ff9dd14c98b01c76d7e374499fd27ae7 Mon Sep 17 00:00:00 2001
From: Peter Stephenson
Date: Wed, 13 Dec 2017 18:08:18 +0000
Subject: 42113: BSD complation updates.
Remove use of pkg_* for FreeBSD.
Add BSD architecture utilities.
---
ChangeLog | 8 +
Completion/BSD/Command/_bsd_pkg | 250 ++++++++++++++++++--------------
Completion/BSD/Type/_fbsd_architectures | 6 +
Completion/BSD/Type/_nbsd_architectures | 11 ++
Completion/BSD/Type/_obsd_architectures | 6 +
5 files changed, 172 insertions(+), 109 deletions(-)
create mode 100644 Completion/BSD/Type/_fbsd_architectures
create mode 100644 Completion/BSD/Type/_nbsd_architectures
create mode 100644 Completion/BSD/Type/_obsd_architectures
diff --git a/ChangeLog b/ChangeLog
index 16fcd3f61..e46c5228f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2017-12-13 Peter Stephenson
+
+ * Matthew Martin: 42113: Completion/BSD/Command/_bsd_pkg,
+ Completion/BSD/Type/_fbsd_architectures,
+ Completion/BSD/Type/_nbsd_architectures,
+ Completion/BSD/Type/_obsd_architectures: Remove FreeBSD use of
+ pkg_* tools and add BSD architecture utilities.
+
2017-12-12 Peter Stephenson
* 42110: Src/parse.c, Test/A04redirect.ztst: fix redirection in
diff --git a/Completion/BSD/Command/_bsd_pkg b/Completion/BSD/Command/_bsd_pkg
index 9f4b0f11a..d8928afaf 100644
--- a/Completion/BSD/Command/_bsd_pkg
+++ b/Completion/BSD/Command/_bsd_pkg
@@ -7,14 +7,20 @@ _bsd_pkg_pkgfiles() {
case $OSTYPE in
netbsd*)
portsdir=/usr/pkgsrc
+ pkgsdir=${PACKAGES:-$portsdir/packages}/All
+ ;;
+ openbsd*)
+ portsdir=${${(M)${(f)"$(