6 files changed, 66 insertions, 12 deletions
diff --git a/system/noto-fonts/66-noto-mono.conf b/system/noto-fonts/66-noto-mono.conf
new file mode 100644
index 000000000000..c0039739381b
--- /dev/null
+++ b/system/noto-fonts/66-noto-mono.conf
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <alias>
+    <family>monospace</family>
+    <prefer>
+      <family>Noto Mono</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>Noto Mono</family>
+    <default>
+      <family>monospace</family>
+    </default>
+  </alias>
+</fontconfig>
diff --git a/system/noto-fonts/66-noto-sans.conf b/system/noto-fonts/66-noto-sans.conf
new file mode 100644
index 000000000000..012aebedf8b3
--- /dev/null
+++ b/system/noto-fonts/66-noto-sans.conf
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <alias>
+    <family>sans-serif</family>
+    <prefer>
+      <family>Noto Sans</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>Noto Sans</family>
+    <default>
+      <family>sans-serif</family>
+    </default>
+  </alias>
+</fontconfig>
diff --git a/system/noto-fonts/66-noto-serif.conf b/system/noto-fonts/66-noto-serif.conf
new file mode 100644
index 000000000000..036baf776490
--- /dev/null
+++ b/system/noto-fonts/66-noto-serif.conf
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <alias>
+    <family>serif</family>
+    <prefer>
+      <family>Noto Serif</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>Noto Serif</family>
+    <default>
+      <family>serif</family>
+    </default>
+  </alias>
+</fontconfig>
diff --git a/system/noto-fonts/README b/system/noto-fonts/README
index 9b5f0bde11c4..91b48a4d6f6c 100644
--- a/system/noto-fonts/README
+++ b/system/noto-fonts/README
@@ -3,12 +3,12 @@ noto-fonts (Googles Noto fonts)
 Noto's goal is to provide a beautiful reading experience for all
 languages.
 
-It is a free, professionally-designed, open-source collection of fonts
-with a harmonious look and feel in multiple weights and styles. All 
-Noto fonts are published under the SIL Open Font License (OFL) v1.1,
-which allows you to copy, modify, and redistribute them if you need to.
+It is a free, professionally-designed, open-source collection of
+fonts with a harmonious look and feel in multiple weights and styles.
+Noto fonts are published under the SIL Open Font License (OFL) v1.1.
+which allows you to copy, modify, and redistribute them if you need.
 
-Currently, Noto covers all major languages of the world and many others,
-including European, African, Middle Eastern, Indic, South and Southeast
-Asian, Central Asian, American, and East Asian languages. Several
-minority and historical languages are also supported.
+Currently, Noto covers all major languages of the world and many
+others, including European, African, Middle Eastern, Indic, South and
+Southeast Asian, Central Asian, American, and East Asian languages.
+Several minority and historical languages are also supported.
diff --git a/system/noto-fonts/noto-fonts.SlackBuild b/system/noto-fonts/noto-fonts.SlackBuild
index 406965d9a2ea..f1f4f70a5492 100644
--- a/system/noto-fonts/noto-fonts.SlackBuild
+++ b/system/noto-fonts/noto-fonts.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for noto-fonts.
 #
-# Copyright 2016 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2016-2017  Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=noto-fonts
 VERSION=${VERSION:-20150929}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 ARCH=noarch
@@ -60,7 +60,13 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 install -d $PKG/usr/share/fonts/TTF/
-install -m644 hinted/Noto*.ttf $PKG/usr/share/fonts/TTF/
+install -m644 hinted/Noto*.tt[fc] $PKG/usr/share/fonts/TTF/
+install -m644 unhinted/Noto*.tt[fc] $PKG/usr/share/fonts/TTF/
+
+rm $PKG/usr/share/fonts/TTF/NotoSans{,UI}-*.ttf
+
+mkdir -p $PKG/etc/fonts/conf.avail
+install -m644 $CWD/*.conf $PKG/etc/fonts/conf.avail/
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a FAQ.md LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION/
diff --git a/system/noto-fonts/slack-desc b/system/noto-fonts/slack-desc
index 29f324aed378..2c34909d4f81 100644
--- a/system/noto-fonts/slack-desc
+++ b/system/noto-fonts/slack-desc
@@ -12,7 +12,7 @@ noto-fonts: Noto's goal is to provide a beautiful reading experience for all
 noto-fonts: languages.
 noto-fonts:
 noto-fonts: It is a free, professionally-designed, open-source collection of
-noto-fonts: fonts with a harmonious look and feel in multiple weights and styles. 
+noto-fonts: fonts with a harmonious look and feel in multiple weights and styles.
 noto-fonts: Noto fonts are published under the SIL Open Font License (OFL) v1.1.
 noto-fonts:
 noto-fonts: Home page: https://github.com/googlei18n/noto-fonts