bdf2psf: merge ckbcomp

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
+	}
+}

srcpkgs/ckbcomp

@@ -0,0 +1 @@
+bdf2psf

srcpkgs/ckbcomp/template

@@ -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
-}

srcpkgs/ckbcomp/update

@@ -1 +0,0 @@
-pkgname=console-setup