From b053261a9cc342d34f3240c2e10286fa7e4ddf2e Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Sun, 13 Oct 2019 13:15:15 +0200
Subject: [PATCH] build: pkg should be picked up instantly nowadays

---
 build/ports.sh         | 3 ---
 config/19.7/ports.conf | 1 +
 config/19.7/skim.conf  | 1 -
 config/20.1/ports.conf | 1 +
 config/20.1/skim.conf  | 1 -
 5 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/build/ports.sh b/build/ports.sh
index e0b4391..532b322 100644
--- a/build/ports.sh
+++ b/build/ports.sh
@@ -79,8 +79,6 @@ if [ -f ${MAKE_CONF} ]; then
 	cp ${MAKE_CONF} ${STAGEDIR}/etc/make.conf
 fi
 
-PORTS_LIST=$(echo ports-mgmt/pkg; echo "${PORTS_LIST}")
-
 cat > ${STAGEDIR}/bin/echotime <<EOF
 #!/bin/sh
 echo "[\$(date '+%Y%m%d%H%M%S')]" \${*}
@@ -177,7 +175,6 @@ UNAME_r=\$(freebsd-version)
 	make -s -C ${PORTSDIR}/\${PORT} clean \${MAKE_ARGS}
 
 	pkg set -yaA1
-	pkg set -yA0 ports-mgmt/pkg
 	pkg autoremove -y
 done
 EOF
diff --git a/config/19.7/ports.conf b/config/19.7/ports.conf
index 60d14df..fc02666 100644
--- a/config/19.7/ports.conf
+++ b/config/19.7/ports.conf
@@ -159,6 +159,7 @@ opnsense/sshlockout_pf
 opnsense/suricata-devel
 opnsense/syslogd
 print/texinfo
+ports-mgmt/pkg
 security/acme.sh
 security/autossh				arm,arm64
 security/ca_root_nss
diff --git a/config/19.7/skim.conf b/config/19.7/skim.conf
index 3ce20fa..d3729fb 100644
--- a/config/19.7/skim.conf
+++ b/config/19.7/skim.conf
@@ -1,5 +1,4 @@
 net/dhcp6
-ports-mgmt/pkg
 security/krb5
 security/libressl
 security/openssl
diff --git a/config/20.1/ports.conf b/config/20.1/ports.conf
index b094282..c0ed854 100644
--- a/config/20.1/ports.conf
+++ b/config/20.1/ports.conf
@@ -149,6 +149,7 @@ opnsense/sshlockout_pf
 opnsense/suricata-devel
 opnsense/syslogd
 print/texinfo
+ports-mgmt/pkg
 security/acme.sh
 security/autossh				arm,arm64
 security/ca_root_nss
diff --git a/config/20.1/skim.conf b/config/20.1/skim.conf
index 3ce20fa..d3729fb 100644
--- a/config/20.1/skim.conf
+++ b/config/20.1/skim.conf
@@ -1,5 +1,4 @@
 net/dhcp6
-ports-mgmt/pkg
 security/krb5
 security/libressl
 security/openssl