Update and misc improvements

5 files changed, 31 insertions, 45 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5bef8041e07f..da5089f80af9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,19 @@
 pkgbase = fontconfig-git
 	pkgdesc = Library for configuring and customizing font access (from git)
-	pkgver = 2.13.91+63+g9133e79
+	pkgver = 2.13.93+12+gd243bb3
 	pkgrel = 1
 	url = https://www.freedesktop.org/wiki/Software/fontconfig/
-	install = fontconfig-git.install
+	install = fontconfig.install
 	arch = x86_64
 	license = custom
-	makedepends = git
 	makedepends = autoconf-archive
+	makedepends = expat
+	makedepends = freetype2
+	makedepends = git
 	makedepends = gperf
+	makedepends = json-c
 	makedepends = python-lxml
 	makedepends = python-six
-	makedepends = json-c
-	makedepends = expat
-	makedepends = freetype2
 	depends = expat
 	depends = libfreetype.so
 	provides = fontconfig
@@ -21,7 +21,7 @@ pkgbase = fontconfig-git
 	conflicts = fontconfig
 	backup = etc/fonts/fonts.conf
 	source = git+https://anongit.freedesktop.org/git/fontconfig
-	source = fontconfig-git.hook
+	source = fontconfig.hook
 	sha256sums = SKIP
 	sha256sums = 8883f7e6e9d574ed52b89256507a6224507925715ddc85b3dfab9683df2f1e25
 
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index d4d9f6c48346..000000000000
--- a/.gitignore
+++ /dev/null
@@ -1,15 +0,0 @@
-*~
-pkg/
-src/
-*.gz
-*.bz2
-*.xz
-*.lzo
-*.xz4
-*.tgz
-*.tbz
-*.txz
-*.tar
-*.jar
-*.zip
-fontconfig-git
diff --git a/PKGBUILD b/PKGBUILD
index 212c312131d3..66eec98fd005 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,50 +5,51 @@
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=fontconfig-git
-pkgver=2.13.91+63+g9133e79
+pkgver=2.13.93+12+gd243bb3
 pkgrel=1
 pkgdesc="Library for configuring and customizing font access (from git)"
 url="https://www.freedesktop.org/wiki/Software/fontconfig/"
 arch=('x86_64')
 license=('custom')
 depends=('expat' 'libfreetype.so')
-makedepends=('git' 'autoconf-archive' 'gperf' 'python-lxml' 'python-six' 'json-c' 'expat' 'freetype2')
+makedepends=('autoconf-archive' 'expat' 'freetype2' 'git' 'gperf' 'json-c'
+             'python-lxml' 'python-six')
 provides=('fontconfig' 'libfontconfig.so')
 conflicts=('fontconfig')
-install=fontconfig-git.install
-backup=(etc/fonts/fonts.conf)
+install=fontconfig.install
+backup=('etc/fonts/fonts.conf')
 source=("git+https://anongit.freedesktop.org/git/fontconfig"
-         fontconfig-git.hook)
+        fontconfig.hook)
 sha256sums=('SKIP'
             '8883f7e6e9d574ed52b89256507a6224507925715ddc85b3dfab9683df2f1e25')
 
 pkgver() {
-	cd fontconfig
-	git describe --tags | sed 's/-/+/g'
+  cd fontconfig
+  git describe --tags | sed 's/-/+/g'
 }
 
 prepare() {
-	cd fontconfig
-	NOCONFIGURE=1 ./autogen.sh
+  cd fontconfig
+  NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-	cd fontconfig
-	./configure --prefix=/usr \
-	  --sysconfdir=/etc \
-	  --with-templatedir=/etc/fonts/conf.avail \
-	  --localstatedir=/var \
-	  --disable-static \
-	  --disable-docs \
-	  --with-default-fonts=/usr/share/fonts \
-	  --with-add-fonts=/usr/local/share/fonts
-	make
+  cd fontconfig
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --with-templatedir=/etc/fonts/conf.avail \
+    --localstatedir=/var \
+    --disable-static \
+    --disable-docs \
+    --with-default-fonts=/usr/share/fonts \
+    --with-add-fonts=/usr/local/share/fonts
+  make
 }
 
 package() {
-	cd fontconfig
-	make DESTDIR="$pkgdir" install
+  cd fontconfig
+  make DESTDIR="$pkgdir" install
 
-	install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 ../*.hook
-	install -Dt "$pkgdir/usr/share/licenses/fontconfig" -m644 COPYING
+  install -Dt "$pkgdir"/usr/share/libalpm/hooks -m644 ../*.hook
+  install -Dt "$pkgdir"/usr/share/licenses/fontconfig -m644 COPYING
 }
diff --git a/fontconfig-git.hook b/fontconfig.hook
index 63be791decaf..63be791decaf 100644
--- a/fontconfig-git.hook
+++ b/fontconfig.hook
diff --git a/fontconfig-git.install b/fontconfig.install
index 52bd289fa5ef..52bd289fa5ef 100644
--- a/fontconfig-git.install
+++ b/fontconfig.install