5 files changed, 31 insertions, 59 deletions
diff --git a/system/bsd-compat-headers/APKBUILD b/system/bsd-compat-headers/APKBUILD
new file mode 100644
index 000000000..f7f5036c0
--- /dev/null
+++ b/system/bsd-compat-headers/APKBUILD
@@ -0,0 +1,31 @@
+# Maintainer: Adelie Platform Group <adelie-devel@lists.adelielinux.org>
+pkgname=bsd-compat-headers
+pkgver=0.7.1
+pkgrel=1
+pkgdesc="Compatibility files for building BSD software"
+url=" "
+arch="noarch"
+options="!check"  # Just header files.
+license="BSD-2-Clause AND BSD-3-Clause"
+depends=""
+makedepends=""
+subpackages=""
+source="sys-cdefs.h
+	sys-queue.h
+	sys-tree.h
+	"
+
+package() {
+	mkdir -p "$pkgdir"
+	case "$CLIBC" in
+	musl)
+		install -D "$srcdir"/sys-cdefs.h "$pkgdir"/usr/include/sys/cdefs.h
+		install -D "$srcdir"/sys-queue.h "$pkgdir"/usr/include/sys/queue.h
+		install -D "$srcdir"/sys-tree.h "$pkgdir"/usr/include/sys/tree.h
+		;;
+	esac
+}
+
+sha512sums="8c3fddd73b696a38e633953715c79c47703739be27ee085fc6c960a57b6746ca05bf6406f7e6126cc1a13204254fd5830afb566624e1f298f4d6b58216013c28  sys-cdefs.h
+2f0d5e6e4dc3350285cf17009265dddcbe12431c111868eea39bc8cb038ab7c1f2acacbb21735c4e9d4a1fd106a8fc0f8611ea33987d4faba37dde5ce6da0750  sys-queue.h
+07cb70f2f0ddb31e23dd913c6f561fc9885667c5803fdf3a559676c99d08834b4104589bacb5d17b4a0b379c68c81a1cf3173832b3da33a7b936fa7b93706844  sys-tree.h"
diff --git a/system/libc-dev/sys-cdefs.h b/system/bsd-compat-headers/sys-cdefs.h
index 209a623c0..209a623c0 100644
--- a/system/libc-dev/sys-cdefs.h
+++ b/system/bsd-compat-headers/sys-cdefs.h
diff --git a/system/libc-dev/sys-queue.h b/system/bsd-compat-headers/sys-queue.h
index a38499a26..a38499a26 100644
--- a/system/libc-dev/sys-queue.h
+++ b/system/bsd-compat-headers/sys-queue.h
diff --git a/system/libc-dev/sys-tree.h b/system/bsd-compat-headers/sys-tree.h
index eaea56aae..eaea56aae 100644
--- a/system/libc-dev/sys-tree.h
+++ b/system/bsd-compat-headers/sys-tree.h
diff --git a/system/libc-dev/APKBUILD b/system/libc-dev/APKBUILD
deleted file mode 100644
index 4ead3c13b..000000000
--- a/system/libc-dev/APKBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: William Pitcock <nenolod@dereferenced.org>
-pkgname=libc-dev
-pkgver=0.7.1
-pkgrel=0
-pkgdesc="Meta package to pull in correct libc"
-url="http://alpinelinux.org"
-arch="noarch"
-license="BSD-2-Clause AND BSD-3-Clause"
-makedepends_build=" "
-makedepends_host=" "
-makedepends="$makedepends_build $makedepends_host"
-depends="$CLIBC-dev"
-subpackages="libc-utils:utils bsd-compat-headers:bsdcompat"
-source="sys-cdefs.h
-	sys-queue.h
-	sys-tree.h
-	"
-
-prepare() {
-	mkdir -p "$builddir"
-	cd "$builddir"
-}
-
-build() {
-	return 0
-}
-
-check() {
-	return 0
-}
-
-package() {
-	mkdir -p "$pkgdir"
-}
-
-utils() {
-	depends="$CLIBC-utils"
-
-	mkdir -p "$subpkgdir"
-}
-
-bsdcompat() {
-	pkgdesc="BSD compatibility headers (cdefs, queue, tree)"
-	depends=""
-
-	mkdir -p "$subpkgdir"
-	case "$CLIBC" in
-	musl)
-		install -D "$srcdir"/sys-cdefs.h "$subpkgdir"/usr/include/sys/cdefs.h
-		install -D "$srcdir"/sys-queue.h "$subpkgdir"/usr/include/sys/queue.h
-		install -D "$srcdir"/sys-tree.h "$subpkgdir"/usr/include/sys/tree.h
-		;;
-	esac
-}
-
-sha512sums="8c3fddd73b696a38e633953715c79c47703739be27ee085fc6c960a57b6746ca05bf6406f7e6126cc1a13204254fd5830afb566624e1f298f4d6b58216013c28  sys-cdefs.h
-2f0d5e6e4dc3350285cf17009265dddcbe12431c111868eea39bc8cb038ab7c1f2acacbb21735c4e9d4a1fd106a8fc0f8611ea33987d4faba37dde5ce6da0750  sys-queue.h
-07cb70f2f0ddb31e23dd913c6f561fc9885667c5803fdf3a559676c99d08834b4104589bacb5d17b4a0b379c68c81a1cf3173832b3da33a7b936fa7b93706844  sys-tree.h"