From 8d5dfff05ce173cb5eff6aa68222d96b355a8708 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: Sun, 11 Dec 2022 21:46:08 +0700
Subject: [PATCH] console-setup: fix configuration files

---
 srcpkgs/console-setup/patches/config.patch | 54 ++++++++++++++++++++++
 srcpkgs/console-setup/template             |  9 ++--
 2 files changed, 57 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/console-setup/patches/config.patch

diff --git a/srcpkgs/console-setup/patches/config.patch b/srcpkgs/console-setup/patches/config.patch
new file mode 100644
index 00000000000..15adffda95f
--- /dev/null
+++ b/srcpkgs/console-setup/patches/config.patch
@@ -0,0 +1,54 @@
+Index: console-setup-1.211/Makefile
+===================================================================
+--- console-setup-1.211.orig/Makefile
++++ console-setup-1.211/Makefile
+@@ -28,9 +28,9 @@ build-common: gzipped-acmfiles
+ install-common: build-common
+ 	install -d  $(bootprefix)/bin/
+ 	install setupcon $(bootprefix)/bin/
+-	install -d $(etcdir)/default
+-	install -m 644 config/keyboard $(etcdir)/default/
+-	install -m 644 config/console-setup $(etcdir)/default/
++	install -d $(etcdir)/console-setup
++	install -m 644 config/keyboard $(etcdir)/console-setup/
++	install -m 644 config/console-setup $(etcdir)/console-setup/
+ 	install -d $(mandir)/man1/
+ 	install -m 644 man/setupcon.1 $(mandir)/man1/
+ 	install -d $(mandir)/man5/
+Index: console-setup-1.211/setupcon
+===================================================================
+--- console-setup-1.211.orig/setupcon
++++ console-setup-1.211/setupcon
+@@ -356,9 +356,9 @@ Sets up the font and the keyboard on Lin
+ 
+ If VARIANT is not specified setupcon looks for the configuration files
+ (in this order) ~/.console-setup and if this doesn't exist then the
+-combination /etc/default/keyboard + /etc/default/console-setup.  When
++combination /etc/console-setup/keyboard + /etc/console-setup/console-setup.  When
+ a VARIANT is specified then setupcon looks for the configuration files
+-~/.console-setup.VARIANT and /etc/default/console-setup.VARIANT.
++~/.console-setup.VARIANT and /etc/console-setup/console-setup.VARIANT.
+ EOF
+ 	    exit 0
+ 	    ;;
+@@ -407,14 +407,14 @@ fi
+ 
+ USER_CONFIG=${HOME}/.console-setup"$VARIANT"
+ USER_CONFIG2=${HOME}/.keyboard"$VARIANT"
+-MAIN_CONFIG=/etc/default/keyboard"$VARIANT"
++MAIN_CONFIG=/etc/console-setup/keyboard"$VARIANT"
+ [ -f "$MAIN_CONFIG" ] \
+-    || [ ! -f "$installdir"/etc/default/keyboard"$VARIANT" ] \
+-    || MAIN_CONFIG="$installdir"/etc/default/keyboard"$VARIANT"
+-MAIN_CONFIG2=/etc/default/console-setup"$VARIANT"
++    || [ ! -f "$installdir"/etc/console-setup/keyboard"$VARIANT" ] \
++    || MAIN_CONFIG="$installdir"/etc/console-setup/keyboard"$VARIANT"
++MAIN_CONFIG2=/etc/console-setup/console-setup"$VARIANT"
+ [ -f "$MAIN_CONFIG2" ] \
+-    || [ ! -f "$installdir"/etc/default/console-setup"$VARIANT" ] \
+-    || MAIN_CONFIG2="$installdir"/etc/default/console-setup"$VARIANT"
++    || [ ! -f "$installdir"/etc/console-setup/console-setup"$VARIANT" ] \
++    || MAIN_CONFIG2="$installdir"/etc/console-setup/console-setup"$VARIANT"
+ 
+ if [ -f "$USER_CONFIG" -o -f "$USER_CONFIG2" ]; then
+     CONFIG="$USER_CONFIG"
diff --git a/srcpkgs/console-setup/template b/srcpkgs/console-setup/template
index 1cd3289e790..851d421aa8d 100644
--- a/srcpkgs/console-setup/template
+++ b/srcpkgs/console-setup/template
@@ -1,7 +1,7 @@
 # Template file for 'console-setup'
 pkgname=console-setup
 version=1.211
-revision=3
+revision=4
 hostmakedepends="perl"
 depends="kbd ckbcomp"
 short_desc="Console font and keymap setup program"
@@ -10,6 +10,8 @@ license="GPL-2.0-or-later"
 homepage="https://packages.debian.org/sid/console-setup"
 distfiles="${DEBIAN_SITE}/main/c/console-setup/console-setup_${version}.tar.xz"
 checksum=298de99c8f135c461b0f72eca3376c090e5f86669b35c0b31377674854512125
+conf_files="/etc/console-setup/console-setup
+ /etc/console-setup/keyboard"
 
 post_extract() {
 	vsed -i -e '44s/if (/if (\$\#ARGV \< 0 \|\| /' Fonts/bdf2psf
@@ -19,11 +21,6 @@ do_install() {
 	make etcdir=${DESTDIR}/etc prefix=${DESTDIR}/usr \
 		bootprefix=${DESTDIR}/usr \
 		install-common
-	vmkdir usr/share/console-setup
-	mv ${DESTDIR}/etc/default/keyboard \
-		${DESTDIR}/usr/share/console-setup
-	mv ${DESTDIR}/etc/default/console-setup \
-		${DESTDIR}/usr/share/console-setup
 }
 
 bdf2psf_package() {