system/fonts-malayalam-extra: Updated for version 1.2.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 22 insertions, 10 deletions

diff --git a/system/fonts-malayalam-extra/README b/system/fonts-malayalam-extra/README
index 6b8e7e7391..1d57dd6e07 100644
--- a/system/fonts-malayalam-extra/README
+++ b/system/fonts-malayalam-extra/README
@@ -16,3 +16,9 @@ from source through FontForge.
 
 To install woff and woff2 fonts run the slackbuild as
 WEBFONTS=YES ./fonts-malayalam-extra.SlackBuild
+
+To install google fonts run the slackbuild as
+GOOGLEFONTS=YES ./fonts-malayalam-extra.SlackBuild
+
+NOTE: If you install google fonts that comes with
+this package it will conflict with google-fonts package.
diff --git a/system/fonts-malayalam-extra/doinst.sh b/system/fonts-malayalam-extra/doinst.sh
index b1446e3188..5f2bf63d11 100644
--- a/system/fonts-malayalam-extra/doinst.sh
+++ b/system/fonts-malayalam-extra/doinst.sh
@@ -16,7 +16,6 @@ if [ -x /usr/bin/mkfontdir ]; then
   )
 fi
 
-
 [ "$DISPLAY" != "" ] && xset fp rehash 2>/dev/null
 
 if [ -x /usr/bin/fc-cache ]; then
diff --git a/system/fonts-malayalam-extra/fonts-malayalam-extra.SlackBuild b/system/fonts-malayalam-extra/fonts-malayalam-extra.SlackBuild
index b6e33fd58d..0ac5be1924 100644
--- a/system/fonts-malayalam-extra/fonts-malayalam-extra.SlackBuild
+++ b/system/fonts-malayalam-extra/fonts-malayalam-extra.SlackBuild
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=fonts-malayalam-extra
-VERSION=${VERSION:-1.1}
+VERSION=${VERSION:-1.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -57,10 +57,7 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 mkdir -pv $PKG/usr/share/fonts/{TTF,OTF}
-
-find $TMP/$PRGNAM-$VERSION/OTF/ -name '*.otf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/OTF \;
-
-find $TMP/$PRGNAM-$VERSION/TTF/ -name '*.ttf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/TTF \;
+mkdir -pv $PKG/usr/doc/$PRGNAM-$VERSION
 
 if [ "$WEBFONTS" = "YES" ]; then
     mkdir -pv $PKG/usr/share/fonts/{WOFF,WOFF2}
@@ -68,12 +65,22 @@ if [ "$WEBFONTS" = "YES" ]; then
     find $TMP/$PRGNAM-$VERSION/WOFF2/ -name '*.woff2' -type f -exec install -D -m0644 -v {} -t  $PKG/usr/share/fonts/WOFF2 \;
 fi
 
+if [ "$GOOGLEFONTS" = "YES" ]; then
+    find $TMP/$PRGNAM-$VERSION/Googlefonts/TTF -name '*.ttf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/TTF \;
+    mkdir -pv $PKG/usr/doc/$PRGNAM-$VERSION/Googlefonts
+    cp -a $TMP/$PRGNAM-$VERSION/Googlefonts/license $PKG/usr/doc/$PRGNAM-$VERSION/Googlefonts
+fi
+
+find $TMP/$PRGNAM-$VERSION/OTF/ -name '*.otf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/OTF \;
+
+find $TMP/$PRGNAM-$VERSION/TTF/ -name '*.ttf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/TTF \;
+
 mkdir -pv $PKG/etc/fonts/conf.avail
 find . -name "*.conf" -exec cp -a {} $PKG/etc/fonts/conf.avail \;
 mkdir -pv $PKG/etc/fonts/conf.d
 ( cd $PKG/etc/fonts/conf.d && ln -sf ../conf.avail/* .)
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+
 cp -a $TMP/$PRGNAM-$VERSION/{licenses,FONTS.md,README.md,URL.md}  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 0644 {} \+
diff --git a/system/fonts-malayalam-extra/fonts-malayalam-extra.info b/system/fonts-malayalam-extra/fonts-malayalam-extra.info
index db4ecce5bf..d6b66d4d35 100644
--- a/system/fonts-malayalam-extra/fonts-malayalam-extra.info
+++ b/system/fonts-malayalam-extra/fonts-malayalam-extra.info
@@ -1,8 +1,8 @@
 PRGNAM="fonts-malayalam-extra"
-VERSION="1.1"
+VERSION="1.2"
 HOMEPAGE="https://github.com/lecramyajiv/fonts-malayalam-extra"
-DOWNLOAD="https://github.com/lecramyajiv/fonts-malayalam-extra/archive/1.1/fonts-malayalam-extra-1.1.tar.gz"
-MD5SUM="fe3e8c31db29f4a165e276f7f52244f7"
+DOWNLOAD="https://github.com/lecramyajiv/fonts-malayalam-extra/archive/1.2/fonts-malayalam-extra-1.2.tar.gz"
+MD5SUM="a6107cb0dda1a730d4d08d8d3ae4f048"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""