bdf2psf: upgpkg 1.215; update packaging

4 files changed, 55 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 712ab55dc522..7f9a3393d2c3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,14 @@
 pkgbase = bdf2psf
-	pkgdesc = Debian utility to convert BDF font files to PSF format.
-	pkgver = 1.205
+	pkgdesc = Debian utility to convert BDF font files to PSF format
+	pkgver = 1.215
 	pkgrel = 1
-	epoch = 1
-	url = https://packages.debian.org/stable/bdf2psf
+	url = https://packages.debian.org/unstable/bdf2psf
 	arch = any
-	license = GPL2+
+	license = GPL2
 	depends = perl
-	source = http://deb.debian.org/debian/pool/main/c/console-setup/bdf2psf_1.205_all.deb
-	sha512sums = SKIP
+	source = https://deb.debian.org/debian/pool/main/c/console-setup/bdf2psf_1.215_all.deb
+	source = 0001-print-help-when-no-args-provided.patch
+	b2sums = 746743d77d6609f551ef298a5a6c7ee6eb96c4586c85d30fa705b72c28e16580430e9481303c76bc21823583bf2bb154f7c69668b5c5c5edf4815be4b8a72505
+	b2sums = 332248177ed0f2caf12fe4d2ccc44d973b52ba9c6c47735976e281e5a05cf43ff375e7a68ec7fe07f0d7c7a7c363e0bd68f7b3a723ed1287063443ce456fe071
 
 pkgname = bdf2psf
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..135344f59a73
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+*
+!.gitignore
+!.SRCINFO
+!PKGBUILD
+!0001-print-help-when-no-args-provided.patch
diff --git a/0001-print-help-when-no-args-provided.patch b/0001-print-help-when-no-args-provided.patch
new file mode 100644
index 000000000000..11960eba3a2f
--- /dev/null
+++ b/0001-print-help-when-no-args-provided.patch
@@ -0,0 +1,26 @@
+From aa9d7e1cac4261ccfd062ef675f7f276c0a3a08e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=A9clairevoyant?=
+ <848000+eclairevoyant@users.noreply.github.com>
+Date: Thu, 2 Feb 2023 07:26:42 -0500
+Subject: [PATCH] print help when no args provided
+
+---
+ usr/bin/bdf2psf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/usr/bin/bdf2psf b/usr/bin/bdf2psf
+index 414c268..e08cb94 100755
+--- a/usr/bin/bdf2psf
++++ b/usr/bin/bdf2psf
+@@ -41,7 +41,7 @@ sub debug {
+ 
+ ########### ARGUMENTS ###############################################
+ 
+-if ($ARGV[0] eq "--help" || $ARGV[0] eq "-h") {
++if ($#ARGV < 0 || $ARGV[0] eq "--help" || $ARGV[0] eq "-h") {
+     print STDERR <<EOT;
+ Usage:
+ bdf2psf [--fb|--raw][--log LOG] BDF{+BDF} EQUIV{+EQUIV} SYMB{+[:]SYMB} SIZE PSF [SFM]
+-- 
+2.39.1
+
diff --git a/PKGBUILD b/PKGBUILD
index dff32a8fabdb..8e0e0fddbcd5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,26 @@
-# Maintainer: Daniel Mario <github.com/limadm>
+# Maintainer: éclairevoyant
+# Contributor: Daniel Mario <github.com/limadm>
+# Contributor: Fredrick Brennan <copypaste at kittens dot ph>
 
 pkgname=bdf2psf
-pkgdesc='Debian utility to convert BDF font files to PSF format.'
-pkgver=1.205
+pkgver=1.215
 pkgrel=1
-epoch=1
+pkgdesc='Debian utility to convert BDF font files to PSF format'
 arch=('any')
-license=('GPL2+')
-url='https://packages.debian.org/stable/bdf2psf'
-source=("http://deb.debian.org/debian/pool/main/c/console-setup/bdf2psf_${pkgver}_all.deb")
+url="https://packages.debian.org/unstable/$pkgname"
 depends=('perl')
-sha512sums=('SKIP')
+license=('GPL2')
+source=("https://deb.debian.org/debian/pool/main/c/console-setup/${pkgname}_${pkgver}_all.deb"
+       "0001-print-help-when-no-args-provided.patch")
+b2sums=('746743d77d6609f551ef298a5a6c7ee6eb96c4586c85d30fa705b72c28e16580430e9481303c76bc21823583bf2bb154f7c69668b5c5c5edf4815be4b8a72505'
+        '332248177ed0f2caf12fe4d2ccc44d973b52ba9c6c47735976e281e5a05cf43ff375e7a68ec7fe07f0d7c7a7c363e0bd68f7b3a723ed1287063443ce456fe071')
 
-pkgver() {
-	curl https://packages.debian.org/stable/bdf2psf | grep 'Package: bdf2psf (' | sed -e 's/.*(//' -e 's/).*//'
+prepare() {
+	tar -xvf data.tar.xz "./usr/bin/$pkgname"
+	patch -Np1 -i 0001-print-help-when-no-args-provided.patch
 }
 
 package() {
-	tar -xf data.tar.xz
-	mv $srcdir/usr $pkgdir
-	sed -i '44s/if (/if (\$\#ARGV \< 0 \|\| /' $pkgdir/usr/bin/bdf2psf
+	tar -xvf data.tar.xz -C "$pkgdir" --exclude './usr/bin'
+	install -Dm755 usr/bin/$pkgname -t "$pkgdir/usr/bin/"
 }