From 183dfd8d49d3b2bb1d80d55a97bb959a512fb7d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 26 Oct 2022 15:03:07 +0700
Subject: [PATCH] bdf2psf: merge ckbcomp

---
 srcpkgs/bdf2psf/template |  9 +++++++++
 srcpkgs/ckbcomp          |  1 +
 srcpkgs/ckbcomp/template | 17 -----------------
 srcpkgs/ckbcomp/update   |  1 -
 4 files changed, 10 insertions(+), 18 deletions(-)
 create mode 120000 srcpkgs/ckbcomp
 delete mode 100644 srcpkgs/ckbcomp/template
 delete mode 100644 srcpkgs/ckbcomp/update

diff --git a/srcpkgs/bdf2psf/template b/srcpkgs/bdf2psf/template
index db168dbda80..9463f77e478 100644
--- a/srcpkgs/bdf2psf/template
+++ b/srcpkgs/bdf2psf/template
@@ -3,6 +3,7 @@ pkgname=bdf2psf
 version=1.211
 revision=1
 wrksrc="console-setup"
+revision=2
 depends="perl"
 short_desc="Generate console fonts from BDF source fonts"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -24,3 +25,11 @@ do_install() {
 	done
 	vcopy fontsets usr/share/bdf2psf
 }
+
+ckbcomp_package() {
+	depends="perl"
+	short_desc="Compile a XKB keyboard description to a keymap for loadkeys"
+	pkg_install() {
+		vbin Keyboard/ckbcomp
+	}
+}
diff --git a/srcpkgs/ckbcomp b/srcpkgs/ckbcomp
new file mode 120000
index 00000000000..942762041d6
--- /dev/null
+++ b/srcpkgs/ckbcomp
@@ -0,0 +1 @@
+bdf2psf
\ No newline at end of file
diff --git a/srcpkgs/ckbcomp/template b/srcpkgs/ckbcomp/template
deleted file mode 100644
index d218d82c1d7..00000000000
--- a/srcpkgs/ckbcomp/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'ckbcomp'
-pkgname=ckbcomp
-version=1.198
-revision=1
-wrksrc="console-setup-${version}"
-depends="perl"
-short_desc="Compile a XKB keyboard description to a keymap suitable for loadkeys"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="https://salsa.debian.org/installer-team/console-setup"
-changelog="https://salsa.debian.org/installer-team/console-setup/-/raw/master/debian/changelog"
-distfiles="${DEBIAN_SITE}/main/c/console-setup/console-setup_${version}.tar.xz"
-checksum=f3aca4aeb76ecfe76e29435ce59d2c55756da70b03deb7f02cbee093000cb725
-
-do_install() {
-	vbin Keyboard/ckbcomp
-}
diff --git a/srcpkgs/ckbcomp/update b/srcpkgs/ckbcomp/update
deleted file mode 100644
index bf2f864ad87..00000000000
--- a/srcpkgs/ckbcomp/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=console-setup