Merge branch '3.0' into 3.1

Conflicts:
	nss/Pkgfile

harfbuzz/.footprint

@@ -25,8 +25,8 @@ drwxr-xr-x	root/root	usr/include/harfbuzz/
 -rw-r--r--	root/root	usr/include/harfbuzz/hb.h
 drwxr-xr-x	root/root	usr/lib/
 -rwxr-xr-x	root/root	usr/lib/libharfbuzz.la
-lrwxrwxrwx	root/root	usr/lib/libharfbuzz.so -> libharfbuzz.so.0.926.0
-lrwxrwxrwx	root/root	usr/lib/libharfbuzz.so.0 -> libharfbuzz.so.0.926.0
--rwxr-xr-x	root/root	usr/lib/libharfbuzz.so.0.926.0
+lrwxrwxrwx	root/root	usr/lib/libharfbuzz.so -> libharfbuzz.so.0.927.0
+lrwxrwxrwx	root/root	usr/lib/libharfbuzz.so.0 -> libharfbuzz.so.0.927.0
+-rwxr-xr-x	root/root	usr/lib/libharfbuzz.so.0.927.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/harfbuzz.pc

harfbuzz/.md5sum

@@ -1 +1 @@
-a2b6cbd437f22dd5dc93d377696c9204  harfbuzz-0.9.26.tar.bz2
+60e122288c0ea4d66505d4704e376a1c  harfbuzz-0.9.27.tar.bz2

harfbuzz/Pkgfile

@@ -4,7 +4,7 @@
 # Depends on:  cairo
 
 name=harfbuzz
-version=0.9.26
+version=0.9.27
 release=1
 source=(http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-$version.tar.bz2)
 

nss/Pkgfile

@@ -5,7 +5,7 @@
 
 name=nss
 version=3.16
-release=1
+release=2
 source=(ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_16_RTM/src/$name-$version.tar.gz \
         nss-config.in nss.pc.in)
 
@@ -49,7 +49,8 @@ build() {
 
     install -m 0755 $SRC/nss-config.in $PKG/usr/bin/nss-config
 
-    sed -i "s/@VERSION@/$version/" $PKG/usr/bin/nss-config
+    _version=$(printf "%i.%i.%i" ${version//./ })
+    sed -i "s/@VERSION@/$_version/" $PKG/usr/bin/nss-config
 
     NSS_LIBS=`$PKG/usr/bin/nss-config --libs`
     NSS_CFLAGS=`$PKG/usr/bin/nss-config --cflags`