Make closer to official terminus-font package

In particular:
- install to /usr/share/fonts/misc
- run mkfontscale and mkfontdir
- don't bother to run configure through sh

3 files changed, 10 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 47fe81699873..85074ea459e9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Sun Dec 20 22:30:49 UTC 2015
 pkgbase = terminus-font-ll2-td1
 	pkgdesc = A superb, monospace bitmap font (for X11 and console) with ll2 patch (pass the il1I test) and td1 patch (centered ascii tilde)
-	pkgver = 4.39
-	pkgrel = 1
+	pkgver = 4.40
+	pkgrel = 2
 	url = http://sourceforge.net/projects/terminus-font/
 	install = terminus-font.install
 	arch = any
@@ -13,8 +15,8 @@ pkgbase = terminus-font-ll2-td1
 	depends = fontconfig
 	provides = terminus-font
 	conflicts = terminus-font
-	source = http://downloads.sourceforge.net/project/terminus-font/terminus-font-4.39/terminus-font-4.39.tar.gz
-	md5sums = 1ec1bee67a1c017f349bc8558b2d4fa6
+	source = http://downloads.sourceforge.net/project/terminus-font/terminus-font-4.40/terminus-font-4.40.tar.gz
+	md5sums = 1e1df0d2c612c374ebe7966f90f04e0c
 
 pkgname = terminus-font-ll2-td1
 
diff --git a/PKGBUILD b/PKGBUILD
index 96760344d25f..df46fa20f739 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 _pkgname=terminus-font
 pkgname=${_pkgname}-ll2-td1
 pkgver=4.40
-pkgrel=1
+pkgrel=2
 pkgdesc='A superb, monospace bitmap font (for X11 and console) with ll2 patch (pass the il1I test) and td1 patch (centered ascii tilde)'
 arch=(any)
 url=http://sourceforge.net/projects/terminus-font/
@@ -21,7 +21,7 @@ build() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
   patch < alt/ll2.diff
   patch < alt/td1.diff
-  sh ./configure --prefix=/usr --x11dir=/usr/share/fonts/local --psfdir=/usr/share/kbd/consolefonts
+  ./configure --prefix=/usr --x11dir=/usr/share/fonts/misc --psfdir=/usr/share/kbd/consolefonts
   make
 }
 
diff --git a/terminus-font.install b/terminus-font.install
index 93fb3bfb3e0a..cda58b10f546 100644
--- a/terminus-font.install
+++ b/terminus-font.install
@@ -1,5 +1,7 @@
 post_install() {
   fc-cache -fs
+  mkfontscale usr/share/fonts/misc
+  mkfontdir usr/share/fonts/misc
 }
 
 post_upgrade() {