tamzen-font-git: split packages; fix pkgver; move X11 fonts into /usr/share/fonts/X11/misc/

4 files changed, 84 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 02fe723fcb1e..44aa916e52cf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,26 @@
-# Generated by mksrcinfo v8
-# Fri Nov  6 22:21:05 UTC 2020
 pkgbase = tamzen-font-git
-	pkgdesc = A monospaced bitmap font for the console and X11 (tamsyn-font fork)
-	pkgver = 93.7ea70cc
+	pkgdesc = Monospaced bitmap font for console and X11 (tamsyn-font fork)
+	pkgver = 1.11.6.r1.3255e82
 	pkgrel = 1
+	epoch = 1
 	url = https://github.com/sunaku/tamzen-font
-	install = tamzen-font.install
 	arch = any
 	license = custom
 	makedepends = git
-	source = git://github.com/sunaku/tamzen-font.git
-	md5sums = SKIP
+	source = git+https://github.com/sunaku/tamzen-font.git
+	b2sums = SKIP
 
-pkgname = tamzen-font-git
+pkgname = bdf-tamzen-font-git
+	pkgdesc = Monospaced bitmap font for console and X11 (tamsyn-font fork)(BDF font)
 
+pkgname = otb-tamzen-font-git
+	pkgdesc = Monospaced bitmap font for console and X11 (tamsyn-font fork)(OTB font)
+
+pkgname = pcf-tamzen-font-git
+	pkgdesc = Monospaced bitmap font for console and X11 (tamsyn-font fork)(PCF font)
+
+pkgname = psf-tamzen-font-git
+	pkgdesc = Monospaced bitmap font for console and X11 (tamsyn-font fork)(PSF font)
+
+pkgname = ttf-tamzen-font-git
+	pkgdesc = Monospaced bitmap font for console and X11 (tamsyn-font fork)(TTF font)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..713f6f80aff8
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+/*
+!/.gitignore
+!/.SRCINFO
+!/PKGBUILD
diff --git a/PKGBUILD b/PKGBUILD
index af1315a2d36b..7e8359c6d903 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,74 @@
-# Contributor: Peter Bui <pnutzh4x0r@gmail.com>
+# Maintainer: éclairevoyant
 
 _pkgname=tamzen-font
-pkgname=$_pkgname-git
-pkgver=93.7ea70cc
+pkgbase="$_pkgname-git"
+pkgname=({bdf,otb,pcf,psf,ttf}-$pkgbase)
+pkgver=1.11.6.r1.3255e82
 pkgrel=1
-pkgdesc="A monospaced bitmap font for the console and X11 (tamsyn-font fork)"
-arch=('any')
-url="https://github.com/sunaku/tamzen-font"
+epoch=1
+pkgdesc="Monospaced bitmap font for console and X11 (tamsyn-font fork)"
+arch=(any)
+url="https://github.com/sunaku/$_pkgname"
 license=('custom')
-depends=()
-makedepends=('git')
-install=tamzen-font.install
-source=("git://github.com/sunaku/$_pkgname.git")
-md5sums=('SKIP')
+makedepends=(git)
+source=("git+$url.git")
+b2sums=('SKIP')
 
 pkgver() {
-  cd $_pkgname
-  echo $(git rev-list --count master).$(git rev-parse --short master)
+	cd $_pkgname
+	git describe --long --tags | sed 's/^Tamzen-//;s/\([^-]*-\)g/r\1/;s/-/./g'
 }
 
-package () {
-  cd "$srcdir/$_pkgname"
+package_bdf-tamzen-font-git() {
+	pkgdesc+='(BDF font)'
 
-  install -d "$pkgdir/usr/share/fonts/local"
-  install -m644 bdf/*.bdf "$pkgdir/usr/share/fonts/local/"
+	cd $_pkgname
+	install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
+	install -Dm644 README.md -t "$pkgdir/usr/share/doc/$pkgname/"
 
-  install -d "$pkgdir/usr/share/kbd/consolefonts"
-  gzip psf/*.psf
-  install -m644 psf/*.psf.gz "$pkgdir/usr/share/kbd/consolefonts/"
+	install -Dm644 bdf/*.bdf -t "$pkgdir/usr/share/fonts/X11/misc/"
+}
+
+package_otb-tamzen-font-git() {
+	pkgdesc+='(OTB font)'
+
+	cd $_pkgname
+	install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
+	install -Dm644 README.md -t "$pkgdir/usr/share/doc/$pkgname/"
+
+	install -Dm644 otb/*.otb -t "$pkgdir/usr/share/fonts/X11/misc/"
+}
+
+package_pcf-tamzen-font-git() {
+	pkgdesc+='(PCF font)'
+
+	cd $_pkgname
+	install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
+	install -Dm644 README.md -t "$pkgdir/usr/share/doc/$pkgname/"
+
+	install -Dm644 pcf/*.pcf -t "$pkgdir/usr/share/fonts/X11/misc/"
+}
+
+package_psf-tamzen-font-git() {
+	pkgdesc+='(PSF font)'
+
+	cd $_pkgname
+	install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
+	install -Dm644 README.md -t "$pkgdir/usr/share/doc/$pkgname/"
+
+	cd psf
+	install -dm755 "$pkgdir/usr/share/kbd/consolefonts/"
+	for i in *.psf; do
+		gzip -c $i > "$pkgdir/usr/share/kbd/consolefonts/$i.gz"
+	done
+}
+
+package_ttf-tamzen-font-git() {
+	pkgdesc+='(TTF font)'
+
+	cd $_pkgname
+	install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
+	install -Dm644 README.md -t "$pkgdir/usr/share/doc/$pkgname/"
 
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$_pkgname/LICENSE"
-  install -Dm644 README.md "$pkgdir/usr/share/doc/$_pkgname/README"
+	install -Dm644 ttf/*.ttf -t "$pkgdir/usr/share/fonts/TTF/"
 }
diff --git a/tamzen-font.install b/tamzen-font.install
deleted file mode 100644
index 00778d0e021c..000000000000
--- a/tamzen-font.install
+++ /dev/null
@@ -1,13 +0,0 @@
-# arg 1: the new package version
-post_install() {
-  echo "Make sure that you add /usr/share/fonts/local/ to xorg.conf under the"
-  echo "\"Files\" section."
-  echo "See the README in /usr/share/doc/tamzen-font for more info."
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
-  post_install $1
-}
-