From e31fbaa3fd27c30689fa341f9e8366022ed0ecd8 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Wed, 31 Aug 2022 12:43:36 +0200
Subject: [PATCH] build: list_ports/list_plugins are the same, use shared
 list_packages

---
 build/audit.sh     | 2 +-
 build/common.sh    | 9 +--------
 build/distfiles.sh | 2 +-
 build/options.sh   | 2 +-
 build/plugins.sh   | 2 +-
 build/ports.sh     | 4 ++--
 build/test.sh      | 2 +-
 7 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/build/audit.sh b/build/audit.sh
index 4a37314..9d1bf5e 100644
--- a/build/audit.sh
+++ b/build/audit.sh
@@ -31,7 +31,7 @@ SELF=audit
 
 . ./common.sh
 
-PORTSLIST=$(list_ports ${CONFIGDIR}/ports.conf)
+PORTSLIST=$(list_packages ${CONFIGDIR}/ports.conf)
 
 setup_stage ${STAGEDIR}
 setup_base ${STAGEDIR}
diff --git a/build/common.sh b/build/common.sh
index b86cb5b..a10159a 100644
--- a/build/common.sh
+++ b/build/common.sh
@@ -1229,14 +1229,7 @@ list_config()
 	done
 }
 
-list_ports()
-{
-	local LIST_MATCH=1
-
-	list_config ${@}
-}
-
-list_plugins()
+list_packages()
 {
 	local LIST_MATCH=1
 
diff --git a/build/distfiles.sh b/build/distfiles.sh
index caed2ae..ff0842b 100644
--- a/build/distfiles.sh
+++ b/build/distfiles.sh
@@ -31,7 +31,7 @@ SELF=distfiles
 
 . ./common.sh
 
-PORTSLIST=$(list_ports ${CONFIGDIR}/aux.conf ${CONFIGDIR}/ports.conf)
+PORTSLIST=$(list_packages ${CONFIGDIR}/aux.conf ${CONFIGDIR}/ports.conf)
 
 git_branch ${SRCDIR} ${SRCBRANCH} SRCBRANCH
 git_branch ${PORTSDIR} ${PORTSBRANCH} PORTSBRANCH
diff --git a/build/options.sh b/build/options.sh
index 4956cd5..729f7e1 100644
--- a/build/options.sh
+++ b/build/options.sh
@@ -31,7 +31,7 @@ SELF=options
 
 . ./common.sh
 
-PORTSLIST=$(list_ports ${CONFIGDIR}/aux.conf ${CONFIGDIR}/ports.conf)
+PORTSLIST=$(list_packages ${CONFIGDIR}/aux.conf ${CONFIGDIR}/ports.conf)
 
 git_branch ${SRCDIR} ${SRCBRANCH} SRCBRANCH
 git_branch ${PORTSDIR} ${PORTSBRANCH} PORTSBRANCH
diff --git a/build/plugins.sh b/build/plugins.sh
index 2a14580..f2d7d54 100644
--- a/build/plugins.sh
+++ b/build/plugins.sh
@@ -42,7 +42,7 @@ if [ -f ${PLUGINSCONF}.local ]; then
 	PLUGINSCONF="${PLUGINSCONF} ${PLUGINSCONF}.local"
 fi
 
-PLUGINSLIST=$(list_plugins ${PLUGINSCONF})
+PLUGINSLIST=$(list_packages ${PLUGINSCONF})
 
 git_branch ${PLUGINSDIR} ${PLUGINSBRANCH} PLUGINSBRANCH
 
diff --git a/build/ports.sh b/build/ports.sh
index e8b2bf1..064a6c4 100644
--- a/build/ports.sh
+++ b/build/ports.sh
@@ -56,8 +56,8 @@ if check_packages ${SELF} ${ARGS}; then
 	exit 0
 fi
 
-PORTSLIST=$(list_ports ${CONFIGDIR}/ports.conf)
-AUXLIST=$(list_ports ${CONFIGDIR}/aux.conf)
+PORTSLIST=$(list_packages ${CONFIGDIR}/ports.conf)
+AUXLIST=$(list_packages ${CONFIGDIR}/aux.conf)
 
 git_branch ${SRCDIR} ${SRCBRANCH} SRCBRANCH
 git_branch ${PORTSDIR} ${PORTSBRANCH} PORTSBRANCH
diff --git a/build/test.sh b/build/test.sh
index 9dc36cc..a097aa7 100644
--- a/build/test.sh
+++ b/build/test.sh
@@ -64,7 +64,7 @@ if [ -f ${PLUGINSCONF}.local ]; then
 	PLUGINSCONF="${PLUGINSCONF} ${PLUGINSCONF}.local"
 fi
 
-PLUGINSLIST=$(list_plugins ${PLUGINSCONF})
+PLUGINSLIST=$(list_packages ${PLUGINSCONF})
 
 for PLUGIN_ORIGIN in ${PLUGINSLIST}; do
 	VARIANT=${PLUGIN_ORIGIN##*@}