[unifont]: alphabetize pkgnames and package_* functions

1 files changed, 30 insertions, 30 deletions

diff --git a/pcr/unifont/PKGBUILD b/pcr/unifont/PKGBUILD
index b056b05de..be0f497c7 100644
--- a/pcr/unifont/PKGBUILD
+++ b/pcr/unifont/PKGBUILD
@@ -36,12 +36,12 @@
 #         eg: librestage -A '.*'
 
 
-pkgname=('pcf-unifont'
-         'psf-unifont'
+pkgname=('bdf-unifont'
          'hex-unifont'
-         'bdf-unifont'
-#         'ttf-unifont' # v15.1.04 fails to build
          'otf-unifont'
+         'pcf-unifont'
+         'psf-unifont'
+#         'ttf-unifont' # v15.1.04 fails to build
          'unifont-utils')
 pkgbase=unifont
 pkgver=15.1.04
@@ -67,12 +67,13 @@ build() {
   make
 }
 
-package_pcf-unifont() {
-  pkgdesc="A free bitmap font with wide Unicode support (PCF version)"
+package_bdf-unifont () {
+  pkgdesc="A free bitmap font with wide Unicode support (BDF version)"
 
   # Install the font.
   cd "$srcdir/unifont-$pkgver/font/precompiled"
-  install -Dm644 "unifont-$pkgver.pcf.gz" "$pkgdir/usr/share/fonts/misc/unifont.pcf.gz"
+  gzip -d --force "unifont-$pkgver.bdf.gz"
+  install -Dm644 "unifont-$pkgver.bdf" "$pkgdir/usr/share/fonts/misc/unifont.bdf"
   # Install the license.
   cd "$srcdir/unifont-$pkgver"
   install -Dm644 OFL-1.1.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
@@ -81,12 +82,12 @@ package_pcf-unifont() {
   install -Dm644 doc/unifont.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
-package_psf-unifont() {
-  pkgdesc="A free bitmap font with wide Unicode support (PSF version)"
+package_hex-unifont() {
+  pkgdesc="A free bitmap font with wide Unicode support (hex version)"
 
   # Install the font.
   cd "$srcdir/unifont-$pkgver/font/precompiled"
-  install -Dm644 "Unifont-APL8x16-$pkgver.psf.gz" "$pkgdir/usr/share/kbd/consolefonts/Unifont-APL8x16.psf.gz"
+  install -Dm644 "unifont-$pkgver.hex" "$pkgdir/usr/share/unifont/unifont.hex"
   # Install the license.
   cd "$srcdir/unifont-$pkgver"
   install -Dm644 OFL-1.1.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
@@ -95,12 +96,16 @@ package_psf-unifont() {
   install -Dm644 doc/unifont.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
-package_hex-unifont() {
-  pkgdesc="A free bitmap font with wide Unicode support (hex version)"
+package_otf-unifont() {
+  pkgdesc="A free bitmap font with wide Unicode support (OTF version)"
 
   # Install the font.
   cd "$srcdir/unifont-$pkgver/font/precompiled"
-  install -Dm644 "unifont-$pkgver.hex" "$pkgdir/usr/share/unifont/unifont.hex"
+  install -d "$pkgdir/usr/share/fonts/Unifont/"
+  install -m644 "unifont-$pkgver.otf" "$pkgdir/usr/share/fonts/Unifont/Unifont.otf"
+  install -m644 "unifont_jp-$pkgver.otf" "$pkgdir/usr/share/fonts/Unifont/Unifont_jp.otf"
+  install -m644 "unifont_upper-$pkgver.otf" "$pkgdir/usr/share/fonts/Unifont/Unifont_Upper.otf"
+  install -m644 "unifont_csur-$pkgver.otf" "$pkgdir/usr/share/fonts/Unifont/Unifont_CSUR.otf"
   # Install the license.
   cd "$srcdir/unifont-$pkgver"
   install -Dm644 OFL-1.1.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
@@ -109,13 +114,12 @@ package_hex-unifont() {
   install -Dm644 doc/unifont.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
-package_bdf-unifont () {
-  pkgdesc="A free bitmap font with wide Unicode support (BDF version)"
+package_pcf-unifont() {
+  pkgdesc="A free bitmap font with wide Unicode support (PCF version)"
 
   # Install the font.
   cd "$srcdir/unifont-$pkgver/font/precompiled"
-  gzip -d --force "unifont-$pkgver.bdf.gz"
-  install -Dm644 "unifont-$pkgver.bdf" "$pkgdir/usr/share/fonts/misc/unifont.bdf"
+  install -Dm644 "unifont-$pkgver.pcf.gz" "$pkgdir/usr/share/fonts/misc/unifont.pcf.gz"
   # Install the license.
   cd "$srcdir/unifont-$pkgver"
   install -Dm644 OFL-1.1.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
@@ -124,16 +128,12 @@ package_bdf-unifont () {
   install -Dm644 doc/unifont.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
-package_ttf-unifont() {
-  pkgdesc="A free bitmap font with wide Unicode support (TTF version)"
+package_psf-unifont() {
+  pkgdesc="A free bitmap font with wide Unicode support (PSF version)"
 
   # Install the font.
   cd "$srcdir/unifont-$pkgver/font/precompiled"
-  install -d "$pkgdir/usr/share/fonts/Unifont/"
-  install -m644 "unifont-$pkgver.ttf" "$pkgdir/usr/share/fonts/Unifont/Unifont.ttf"
-  install -m644 "unifont_jp-$pkgver.ttf" "$pkgdir/usr/share/fonts/Unifont/Unifont_jp.ttf"
-  install -m644 "unifont_upper-$pkgver.ttf" "$pkgdir/usr/share/fonts/Unifont/Unifont_Upper.ttf"
-  install -m644 "unifont_csur-$pkgver.ttf" "$pkgdir/usr/share/fonts/Unifont/Unifont_CSUR.ttf"
+  install -Dm644 "Unifont-APL8x16-$pkgver.psf.gz" "$pkgdir/usr/share/kbd/consolefonts/Unifont-APL8x16.psf.gz"
   # Install the license.
   cd "$srcdir/unifont-$pkgver"
   install -Dm644 OFL-1.1.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
@@ -142,16 +142,16 @@ package_ttf-unifont() {
   install -Dm644 doc/unifont.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
-package_otf-unifont() {
-  pkgdesc="A free bitmap font with wide Unicode support (OTF version)"
+package_ttf-unifont() {
+  pkgdesc="A free bitmap font with wide Unicode support (TTF version)"
 
   # Install the font.
   cd "$srcdir/unifont-$pkgver/font/precompiled"
   install -d "$pkgdir/usr/share/fonts/Unifont/"
-  install -m644 "unifont-$pkgver.otf" "$pkgdir/usr/share/fonts/Unifont/Unifont.otf"
-  install -m644 "unifont_jp-$pkgver.otf" "$pkgdir/usr/share/fonts/Unifont/Unifont_jp.otf"
-  install -m644 "unifont_upper-$pkgver.otf" "$pkgdir/usr/share/fonts/Unifont/Unifont_Upper.otf"
-  install -m644 "unifont_csur-$pkgver.otf" "$pkgdir/usr/share/fonts/Unifont/Unifont_CSUR.otf"
+  install -m644 "unifont-$pkgver.ttf" "$pkgdir/usr/share/fonts/Unifont/Unifont.ttf"
+  install -m644 "unifont_jp-$pkgver.ttf" "$pkgdir/usr/share/fonts/Unifont/Unifont_jp.ttf"
+  install -m644 "unifont_upper-$pkgver.ttf" "$pkgdir/usr/share/fonts/Unifont/Unifont_Upper.ttf"
+  install -m644 "unifont_csur-$pkgver.ttf" "$pkgdir/usr/share/fonts/Unifont/Unifont_CSUR.ttf"
   # Install the license.
   cd "$srcdir/unifont-$pkgver"
   install -Dm644 OFL-1.1.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"