Adopt and Refactored PKGBUILD

4 files changed, 21 insertions, 51 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 676ef540313d..deb1cf501944 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,14 @@
 pkgbase = ttf-humor-sans
-	pkgdesc = A sanserif typeface in the style of xkcd.
+	pkgdesc = xkcd styled sans-serif typeface
 	pkgver = 1.0
 	pkgrel = 4
 	url = http://xkcdsucks.blogspot.com.au/2009/03/xkcdsucks-is-proud-to-present-humor.html
-	install = ttf.install
 	arch = any
 	license = custom
-	depends = fontconfig
-	depends = xorg-mkfontscale
 	source = https://antiyawn.com/uploads/Humor-Sans-1.0.ttf
-	source = https://antiyawn.com/uploads/Humor-SansOFL-1.0.txt
-	source = ttf.install
-	sha512sums = f0ed2f61f5cedb93ff955d9d5562fd110db750b6d4d91a74346ff94c16c87cac294c061e6ded97ffea372970912f51ee0792a611a6224cd3a38585812971b3dd
-	sha512sums = e0e4cd5ba46e59dfac962a3943ccc8b694b8226e43aca8f0140d6c5bd5ddf92f51f89b4876b8d7cc25b1c71d8476c23ade3c6f711d1b676fb1623d73223d5f8e
-	sha512sums = f9db8af3a86d9b95c7e22b130225f45d6a60f2fe99634d55a7b2b7b0948c8871700e46a16a883a77efddeff177b008c3ac4f63887a3fedeb23df66367dabc9e9
+	source = Humor-Sans-1.0-license::https://antiyawn.com/uploads/Humor-SansOFL-1.0.txt
+	sha256sums = 2ded6a27448c9ed30aaff177744e2bcf1e52e0aab018b2a8be64565df633318f
+	sha256sums = 94aadc8f2a4dcfbe296e7dffb165c557b8a10d9b6b9e0542f06f9fe0ef79ca83
 
 pkgname = ttf-humor-sans
 
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 243e852793a2..000000000000
--- a/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-Humor-Sans*.ttf
-Humor-SansOFL*.txt
-ttf-humor-sans-*.tar.*
-*.swp
-src/
-pkg/
diff --git a/PKGBUILD b/PKGBUILD
index 6917e549b6ce..2cd451db6651 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,25 @@
-# Maintainer: Felix Golatofski <contact@xdfr.de>
+# Maintainer: Caltlgin Stsodaat <contact@fossdaily.xyz>
+# Contributor: Felix Golatofski <contact@xdfr.de>
 # Contributor: "devzero" (Tim Rice) <t dot rice at ms dot unimelb dot edu dot au>
 
-pkgname=ttf-humor-sans
-_realname=Humor-Sans
+# otfinfo --info *.ttf
+
+_pkgname='Humor-Sans'
+pkgname="ttf-${_pkgname,,}"
 pkgver=1.0
-_licence_name=${_realname}OFL-$pkgver.txt
 pkgrel=4
-pkgdesc="A sanserif typeface in the style of xkcd."
-arch=(any)
-url="http://xkcdsucks.blogspot.com.au/2009/03/xkcdsucks-is-proud-to-present-humor.html"
+pkgdesc='xkcd styled sans-serif typeface'
+arch=('any')
+url='http://xkcdsucks.blogspot.com.au/2009/03/xkcdsucks-is-proud-to-present-humor.html'
 license=('custom')
-depends=('fontconfig' 'xorg-mkfontscale')
-install=ttf.install
-source=("https://antiyawn.com/uploads/$_realname-$pkgver.ttf"
-	"https://antiyawn.com/uploads/$_licence_name"
-	"ttf.install")
-sha512sums=('f0ed2f61f5cedb93ff955d9d5562fd110db750b6d4d91a74346ff94c16c87cac294c061e6ded97ffea372970912f51ee0792a611a6224cd3a38585812971b3dd'
-            'e0e4cd5ba46e59dfac962a3943ccc8b694b8226e43aca8f0140d6c5bd5ddf92f51f89b4876b8d7cc25b1c71d8476c23ade3c6f711d1b676fb1623d73223d5f8e'
-            'f9db8af3a86d9b95c7e22b130225f45d6a60f2fe99634d55a7b2b7b0948c8871700e46a16a883a77efddeff177b008c3ac4f63887a3fedeb23df66367dabc9e9')
+source=("https://antiyawn.com/uploads/${_pkgname}-${pkgver}.ttf"
+        "${_pkgname}-${pkgver}-license::https://antiyawn.com/uploads/${_pkgname}OFL-${pkgver}.txt")
+sha256sums=('2ded6a27448c9ed30aaff177744e2bcf1e52e0aab018b2a8be64565df633318f'
+            '94aadc8f2a4dcfbe296e7dffb165c557b8a10d9b6b9e0542f06f9fe0ef79ca83')
 
-build() { :
-}
 package() {
-  cd "$srcdir"
-  install -dm755 "$pkgdir/usr/share/fonts/TTF"
-  install -Dm644 *.ttf "$pkgdir/usr/share/fonts/TTF"
-  install -D -m644 "$_licence_name" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dvm644 "${_pkgname}-${pkgver}.ttf" "${pkgdir}/usr/share/fonts/TTF/${_pkgname}.ttf"
+  install -Dvm644 "${_pkgname}-${pkgver}-license" "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
 }
+
+# vim: ts=2 sw=2 et:
diff --git a/ttf.install b/ttf.install
deleted file mode 100644
index 33b7d65490db..000000000000
--- a/ttf.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-  echo -n "==> Rebuilding font cache... "
-  fc-cache -f &> /dev/null
-  mkfontscale /usr/share/fonts/TTF
-  mkfontdir /usr/share/fonts/TTF
-  echo "done"
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}