From f9dad14c330a38018ec59e0f9904ddd07f770c94 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 8 Oct 2022 11:05:51 -0400
Subject: [PATCH] base-{minimal,voidstrap,system}: unify base packages

---
 srcpkgs/base-minimal/template   | 32 +++++++++++++++++++++++++-------
 srcpkgs/base-system             |  1 +
 srcpkgs/base-system/template    | 26 --------------------------
 srcpkgs/base-voidstrap          |  1 +
 srcpkgs/base-voidstrap/template | 21 ---------------------
 5 files changed, 27 insertions(+), 54 deletions(-)
 create mode 120000 srcpkgs/base-system
 delete mode 100644 srcpkgs/base-system/template
 create mode 120000 srcpkgs/base-voidstrap
 delete mode 100644 srcpkgs/base-voidstrap/template

diff --git a/srcpkgs/base-minimal/template b/srcpkgs/base-minimal/template
index f43f0c3ccc35..2eb7f26d5d38 100644
--- a/srcpkgs/base-minimal/template
+++ b/srcpkgs/base-minimal/template
@@ -1,19 +1,37 @@
 # Template file for 'base-minimal'
 pkgname=base-minimal
-version=0.3
+version=0.115
 revision=1
 build_style=meta
-short_desc="Void Linux base system meta with minimal tools"
+depends="base-files>=0.77 coreutils findutils diffutils dash grep gzip sed
+ gawk util-linux which tar shadow procps-ng iana-etc xbps nvi tzdata
+ runit-void removed-packages"
+short_desc="Void Linux base system meta package with core tools"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Public Domain"
 homepage="https://www.voidlinux.org/"
 
-depends="
- base-files coreutils findutils diffutils dash grep gzip sed gawk
- util-linux which tar shadow procps-ng iana-etc xbps nvi tzdata
- runit-void removed-packages"
-
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) depends+=" musl";;
 	*) depends+=" glibc-locales";;
 esac
+
+base-voidstrap_package() {
+	build_style=meta
+	short_desc="Void Linux base system meta package for containers/chroots"
+	depends="bash btrfs-progs dhcpcd dosfstools e2fsprogs eudev f2fs-tools
+	 file iproute2 iputils iw kbd kmod less man-pages mdocml>=1.13.3
+	 ncurses openssh pciutils sudo traceroute xfsprogs
+	 base-minimal>=${version}_${revision}"
+}
+
+base-system_package() {
+	build_style=meta
+	short_desc="Void Linux base system meta package"
+	depends="acpid ethtool libgcc usbutils void-artwork wifi-firmware
+	 wpa_supplicant base-voidstrap>=${version}_${revision}"
+
+	 case "$XBPS_TARGET_MACHINE" in
+	 	i686*|x86_64*|ppc*) depends+=" linux" ;;
+	esac
+}
diff --git a/srcpkgs/base-system b/srcpkgs/base-system
new file mode 120000
index 000000000000..b515008202f4
--- /dev/null
+++ b/srcpkgs/base-system
@@ -0,0 +1 @@
+base-minimal
\ No newline at end of file
diff --git a/srcpkgs/base-system/template b/srcpkgs/base-system/template
deleted file mode 100644
index cf3982622059..000000000000
--- a/srcpkgs/base-system/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'base-system'
-pkgname=base-system
-version=0.114
-revision=1
-build_style=meta
-short_desc="Void Linux base system meta package"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="Public Domain"
-homepage="https://www.voidlinux.org"
-
-depends="
- base-files>=0.77 ncurses coreutils findutils diffutils libgcc
- dash bash grep gzip file sed gawk less util-linux which tar man-pages
- mdocml>=1.13.3 shadow e2fsprogs btrfs-progs xfsprogs f2fs-tools dosfstools
- procps-ng tzdata pciutils usbutils iana-etc openssh dhcpcd
- kbd iproute2 iputils iw wpa_supplicant xbps nvi sudo wifi-firmware
- void-artwork traceroute ethtool kmod acpid eudev runit-void removed-packages"
-
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) depends+=" musl";;
-	*) depends+=" glibc-locales";;
-esac
-
-case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*|ppc*) depends+=" linux";;
-esac
diff --git a/srcpkgs/base-voidstrap b/srcpkgs/base-voidstrap
new file mode 120000
index 000000000000..b515008202f4
--- /dev/null
+++ b/srcpkgs/base-voidstrap
@@ -0,0 +1 @@
+base-minimal
\ No newline at end of file
diff --git a/srcpkgs/base-voidstrap/template b/srcpkgs/base-voidstrap/template
deleted file mode 100644
index 563f950d5d7d..000000000000
--- a/srcpkgs/base-voidstrap/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'base-voidstrap'
-pkgname=base-voidstrap
-version=0.11
-revision=1
-build_style=meta
-short_desc="Void Linux base system meta package for containers/chroots"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="Public Domain"
-homepage="https://www.voidlinux.org/"
-
-depends="
- base-files ncurses coreutils findutils diffutils
- dash bash grep gzip file sed gawk less util-linux which tar man-pages
- mdocml>=1.13.3 shadow e2fsprogs btrfs-progs xfsprogs f2fs-tools dosfstools kbd
- procps-ng tzdata pciutils iana-etc eudev runit-void openssh dhcpcd
- iproute2 iputils iw xbps nvi sudo traceroute kmod removed-packages"
-
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) depends+=" musl";;
-	*) depends+=" glibc-locales";;
-esac