Fix build...

4 files changed, 25 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6fd7122cd11e..933bc4fbd326 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Sat Oct 23 08:48:32 UTC 2021
 pkgbase = fbpad-git
 	pkgdesc = A small linux framebuffer virtual terminal.
-	pkgver = r296.1d8d9f6
+	pkgver = r315.e9e9cb0
 	pkgrel = 1
 	url = http://repo.or.cz/w/fbpad.git
 	install = fbpad-git.install
@@ -10,7 +8,7 @@ pkgbase = fbpad-git
 	arch = x86_64
 	license = ISC
 	makedepends = git
-	makedepends = ft2tf
+	makedepends = fbpad-mkfn
 	makedepends = ttf-dejavu
 	provides = fbpad
 	conflicts = fbpad
@@ -18,14 +16,13 @@ pkgbase = fbpad-git
 	source = conf.h
 	source = fbpad-256.info
 	md5sums = SKIP
-	md5sums = 27b6253c85f2febfa3cf13fe973f4544
+	md5sums = eb4f82a8aebf615b673669253511663b
 	md5sums = 185b9d6ec1c539213226a3e2509c7ccd
 	sha1sums = SKIP
-	sha1sums = dc4a15129d0e13cdd3994fc81da3c470383a6079
+	sha1sums = 021e9087ab62362b640424695f0b21db0c1bac1f
 	sha1sums = dbb816fe37faf0acb4e1a916d7493787c2b647fc
 	sha256sums = SKIP
-	sha256sums = 2df7b23d2cbcb907d0a895541f5f3d3d5e0d5f4ec652a2b13b0da693a9762af0
+	sha256sums = deb59b3405c3b24842d77b824d0dac157cf5675e6fc4c876711e2b2fbc710ad6
 	sha256sums = fb8ae049aa7d41fb285cbf7aa4487b28014273ebcfceefb4d58fb07018312e9c
 
 pkgname = fbpad-git
-
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index e90e615c0aca..000000000000
--- a/LICENSE
+++ /dev/null
@@ -1,25 +0,0 @@
-Copyright (c) 2009-2012, Ali Gholami Rudi
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimer in the documentation
-      and/or other materials provided with the distribution.
-    * The names of its contributors may not be used to endorse or promote
-      products derived from this software without specific prior written
-      permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/PKGBUILD b/PKGBUILD
index 9427291e3f2d..1ab64b13745b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,13 @@
 # Contributor: Sara <sara at archlinux dot us>
 # Maintainer: aksr <aksr at t-com dot me>
 pkgname=fbpad-git
-pkgver=r296.1d8d9f6
+pkgver=r315.e9e9cb0
 pkgrel=1
 pkgdesc="A small linux framebuffer virtual terminal."
 arch=('i686' 'x86_64')
 url="http://repo.or.cz/w/fbpad.git"
 license=('ISC')
-makedepends=('git' 'ft2tf' 'ttf-dejavu')
+makedepends=('git' 'fbpad-mkfn' 'ttf-dejavu')
 provides=("${pkgname%-*}")
 conflicts=("${pkgname%-*}")
 install=${pkgname}.install
@@ -15,13 +15,13 @@ source=("$pkgname::git+git://repo.or.cz/fbpad.git"
 	'conf.h' 'fbpad-256.info')
 noextract=()
 md5sums=('SKIP'
-         '27b6253c85f2febfa3cf13fe973f4544'
+         'eb4f82a8aebf615b673669253511663b'
          '185b9d6ec1c539213226a3e2509c7ccd')
 sha1sums=('SKIP'
-          'dc4a15129d0e13cdd3994fc81da3c470383a6079'
+          '021e9087ab62362b640424695f0b21db0c1bac1f'
           'dbb816fe37faf0acb4e1a916d7493787c2b647fc')
 sha256sums=('SKIP'
-            '2df7b23d2cbcb907d0a895541f5f3d3d5e0d5f4ec652a2b13b0da693a9762af0'
+            'deb59b3405c3b24842d77b824d0dac157cf5675e6fc4c876711e2b2fbc710ad6'
             'fb8ae049aa7d41fb285cbf7aa4487b28014273ebcfceefb4d58fb07018312e9c')
 
 pkgver() {
@@ -44,16 +44,25 @@ package() {
 	cd $srcdir/$pkgname
 	install -Dm755 ../$pkgname/fbpad $pkgdir/usr/bin/fbpad
 	install -Dm644 ../$pkgname/README $pkgdir/usr/share/doc/${pkgname%-*}/README
-	install -Dm644 ../LICENSE $pkgdir/usr/share/licenses/${pkgname%-*}/LICENSE
+
 	## Compile terminfo
 	mkdir -p $pkgdir/usr/share/terminfo
 	tic -x -o $pkgdir/usr/share/terminfo $srcdir/fbpad-256.info
 
 	## Setup fonts
-	if [ -x /usr/bin/fbpad-mkfn ]; then FT2TF="fbpad-mkfn -h20 -w10"; SZ="17h120v100b0a1"; else FT2TF=ft2tf; SZ=6; fi
-	$FT2TF /usr/share/fonts/TTF/DejaVuSansMono.ttf:$SZ > $srcdir/font-r.tf
-	$FT2TF /usr/share/fonts/TTF/DejaVuSansMono-Oblique.ttf:$SZ > $srcdir/font-i.tf
-	$FT2TF /usr/share/fonts/TTF/DejaVuSansMono-Bold.ttf:$SZ > $srcdir/font-b.tf
+	if [ -x /usr/bin/fbpad-mkfn-ft ]; then
+		FT2TF="fbpad-mkfn-ft -h20 -w10"
+		SZ="17h120v100b0a1"
+		$FT2TF /usr/share/fonts/TTF/DejaVuSansMono.ttf:$SZ > $srcdir/font-r.tf
+		$FT2TF /usr/share/fonts/TTF/DejaVuSansMono-Oblique.ttf:$SZ > $srcdir/font-i.tf
+		$FT2TF /usr/share/fonts/TTF/DejaVuSansMono-Bold.ttf:$SZ > $srcdir/font-b.tf
+	else
+		FT2TF="fbpad-mkfn-stb -h20 -w10"
+		SZ="17h120v100b0a1"
+		$FT2TF /usr/share/fonts/TTF/DejaVuSansMono.ttf:$SZ > $srcdir/font-r.tf
+		$FT2TF /usr/share/fonts/TTF/DejaVuSansMono-Oblique.ttf:$SZ > $srcdir/font-i.tf
+		$FT2TF /usr/share/fonts/TTF/DejaVuSansMono-Bold.ttf:$SZ > $srcdir/font-b.tf
+	fi
 
 	## Install fonts
 	install -Dm644 ../font-r.tf $pkgdir/usr/share/${pkgname%-*}/font-r.tf
diff --git a/conf.h b/conf.h
index f91d7f3789c6..194049c84a55 100644
--- a/conf.h
+++ b/conf.h
@@ -8,7 +8,7 @@
 #define MAIL		{"mutt"}
 
 /* TERM variable for launched programs */
-#define TERM        "linux"
+#define TERM		"linux"
 
 /* tinyfont files for regular, italic, and bold fonts */
 #define FR		"/usr/share/fbpad/font-r.tf"