Update to 7.200 release with all weights, match TTF package

3 files changed, 41 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0a1b6f5c4e6c..623563d2a2f4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
+# Generated by mksrcinfo v8
+# Fri Feb 16 08:33:51 UTC 2018
 pkgbase = otf-montserrat
-	pkgdesc = Often compared to Proxima Nova for it's charming utility, Montserrat is a useful typeface, loved by many web and UI designers. Designed by Julieta Ulanovsky.
-	pkgver = 0.1
-	pkgrel = 4
-	url = https://www.fontsquirrel.com/fonts/montserrat
+	pkgdesc = Geometric font in many weights with Cyrillic and extended Latin support (Regular, Alternates), original concept by Julieta Ulanovsky
+	pkgver = 7.200
+	pkgrel = 1
+	url = http://montserrat.zkysky.com.ar/en
+	install = ttf.install
 	arch = any
-	license = custom:SIL
-	provides = otf-montserrat
-	source = https://www.fontsquirrel.com/fonts/download/montserrat
-	source = sums
-	sha256sums = SKIP
-	sha256sums = f216eef10aafdc28fb3bfb1f7c5ac690f2b0b737e1c8515e2cbf206622fcc575
+	license = custom:OFL
+	source = https://github.com/JulietaUla/Montserrat/archive/v7.200.tar.gz
+	sha256sums = 340125df4700876c5adf4df98c885dbe9b96c8a6a0ee634a520934c77ee097dc
 
 pkgname = otf-montserrat
 
diff --git a/PKGBUILD b/PKGBUILD
index ee6ab18f5f4e..845bc63ff3e3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,24 @@
+# Maintainer: Caleb Maclennan <caleb@alerque.com>
 # Maintainer: chongli <kurto@mac.com>
+
 pkgname=otf-montserrat
-pkgver=0.1
-pkgrel=4
-pkgdesc="Often compared to Proxima Nova for it's charming utility, Montserrat is a useful typeface, loved by many web and UI designers. Designed by Julieta Ulanovsky."
+pkgver=7.200
+pkgrel=1
+_fontname=Montserrat
+pkgdesc='Geometric font in many weights with Cyrillic and extended Latin support (Regular, Alternates), original concept by Julieta Ulanovsky'
+url='http://montserrat.zkysky.com.ar/en'
 arch=('any')
-url="https://www.fontsquirrel.com/fonts/montserrat"
-license=('custom:SIL')
-provides=('otf-montserrat')
-source=('https://www.fontsquirrel.com/fonts/download/montserrat'
-        'sums')
-sha256sums=('SKIP'
-            'f216eef10aafdc28fb3bfb1f7c5ac690f2b0b737e1c8515e2cbf206622fcc575')
-
-prepare () {
-
-  sha256sum -c "${startdir}/sums"
-}
+license=('custom:OFL')
+install=ttf.install
+source=("https://github.com/JulietaUla/${_fontname}/archive/v${pkgver}.tar.gz")
+sha256sums=('340125df4700876c5adf4df98c885dbe9b96c8a6a0ee634a520934c77ee097dc')
 
 package() {
+  cd ${_fontname}-${pkgver}
 
-  install -D -m644 "SIL Open Font License.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE"
+  install -Dm644 OFL.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE"
 
-  install -d "${pkgdir}/usr/share/fonts/OTF/"
-  install -m644 Montserrat-*.otf "${pkgdir}/usr/share/fonts/OTF/"
-  install -m644 MontserratAlternates-*.otf "${pkgdir}/usr/share/fonts/OTF/"
+  dst=${pkgdir}/usr/share/fonts/OTF
+  mkdir -p ${dst}
+  find ./fonts/otf -name '*.otf' -execdir install -m644 {} ${dst}/{} \;
 }
-
diff --git a/ttf.install b/ttf.install
new file mode 100644
index 000000000000..8bfbeb661e33
--- /dev/null
+++ b/ttf.install
@@ -0,0 +1,15 @@
+post_install() {
+  echo -n "Updating font cache... "
+  fc-cache -sf > /dev/null
+  mkfontscale usr/share/fonts/TTF
+  mkfontdir usr/share/fonts/TTF
+  echo "done."
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}