[arch-commits] Commit in terminus-font-otb/trunk (PKGBUILD otbconvert.pe)

[Christian Hesse]

    Date: Saturday, December 26, 2020 @ 19:40:18
  Author: eworm
Revision: 793025

upgpkg: terminus-font-otb 4.49-2: use upstream otb support

Modified:
  terminus-font-otb/trunk/PKGBUILD
Deleted:
  terminus-font-otb/trunk/otbconvert.pe

---------------+
 PKGBUILD      |   24 ++++++++++++------------
 otbconvert.pe |    7 -------
 2 files changed, 12 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-12-26 19:19:11 UTC (rev 793024)
+++ PKGBUILD	2020-12-26 19:40:18 UTC (rev 793025)
@@ -4,26 +4,26 @@
 
 pkgname=terminus-font-otb
 pkgver=4.49
-pkgrel=1
+pkgrel=2
 pkgdesc='Monospace bitmap font (OTB version)'
 url='http://terminus-font.sourceforge.net/'
 arch=('any')
 license=('GPL2' 'custom:OFL')
 makedepends=('fontforge')
-source=("https://downloads.sourceforge.net/project/terminus-font/terminus-font-$pkgver/terminus-font-$pkgver.tar.gz"
-        'otbconvert.pe')
-sha256sums=('db0a74551a23d2229db6ffea469ca8e390625ace4069dd1c1a3d05a16ed2634d'
-            '431999be6be2630a9e8b4bcc5631b6bc727b795978b75cb4c874d9ce143e9703')
+source=("https://downloads.sourceforge.net/project/terminus-font/terminus-font-$pkgver/terminus-font-$pkgver.tar.gz")
+sha256sums=('db0a74551a23d2229db6ffea469ca8e390625ace4069dd1c1a3d05a16ed2634d')
 
 build() {
-    cd "terminus-font-$pkgver"
-    ../otbconvert.pe *.bdf
+  cd "terminus-font-$pkgver"
+
+  ./configure \
+    --x11dir=/usr/share/fonts/misc/
+  make otb
 }
 
 package() {
-    cd "terminus-font-$pkgver"
-    for i in *.otb; do
-        install -D -m0644 $i "$pkgdir/usr/share/fonts/misc/$i"
-    done
-    install -D -m0644 'OFL.TXT' "$pkgdir/usr/share/licenses/terminus-font-otb/LICENSE"
+  make -C "terminus-font-$pkgver" DESTDIR="$pkgdir" install-otb
+
+  install -Dm644 "$srcdir/terminus-font-$pkgver/OFL.TXT" \
+    "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
 }

Deleted: otbconvert.pe
===================================================================
--- otbconvert.pe	2020-12-26 19:19:11 UTC (rev 793024)
+++ otbconvert.pe	2020-12-26 19:40:18 UTC (rev 793025)
@@ -1,7 +0,0 @@
-#!/usr/bin/fontforge
-i=1
-while ( i<$argc )
-  Open($argv[i])
-  Generate($argv[i]:r + ".otb")
-  i = i+1
-endloop