Xorg update part1

3 files changed, 20 insertions, 45 deletions

diff --git a/abs/core/ttf-dejavu/ChangeLog b/abs/core/ttf-dejavu/ChangeLog
deleted file mode 100644
index c5c8c4a..0000000
--- a/abs/core/ttf-dejavu/ChangeLog
+++ /dev/null
@@ -1,24 +0,0 @@
-2009-03-12  Alexander Fehr  <pizzapunk gmail com>
-
-  * ttf-dejavu-2.29-1:
-  New upstream release.
-
-2008-12-22  Alexander Fehr  <pizzapunk gmail com>
-
-  * ttf-dejavu-2.28-1:
-  New upstream release.
-
-2008-11-26  Alexander Fehr  <pizzapunk gmail com>
-
-  * ttf-dejavu-2.27-1:
-  New upstream release.
-
-2008-07-29  Alexander Fehr  <pizzapunk gmail com>
-
-  * ttf-dejavu-2.26-1:
-  New upstream release.
-  New maintainer.
-  Renamed ttf.install to ttf-dejavu.install.
-  Added -s option to fc-cache in install file.
-  Removed install message.
-  Added ChangeLog.
diff --git a/abs/core/ttf-dejavu/PKGBUILD b/abs/core/ttf-dejavu/PKGBUILD
index a5fd988..0c2fca0 100644
--- a/abs/core/ttf-dejavu/PKGBUILD
+++ b/abs/core/ttf-dejavu/PKGBUILD
@@ -1,29 +1,27 @@
-# $Id: PKGBUILD 71355 2010-03-06 19:39:30Z jgc $
-# Maintainer: Alexander Fehr <pizzapunk gmail com>
+# $Id: PKGBUILD 157781 2012-04-29 11:06:40Z allan $
+# Maintainer:
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Michal Krenek <mikos@sg1.cz>
 
 pkgname=ttf-dejavu
-pkgver=2.30
-pkgrel=2
+pkgver=2.33
+pkgrel=3
 pkgdesc="Font family based on the Bitstream Vera Fonts with a wider range of characters"
 arch=('any')
-url="http://dejavu.sourceforge.net/"
+url="http://dejavu-fonts.org/wiki/Main_Page"
 license=('custom')
-depends=('fontconfig' 'xorg-fonts-encodings')
+depends=('fontconfig' 'xorg-fonts-encodings' 'xorg-mkfontscale' 'xorg-mkfontdir')
 install=ttf-dejavu.install
 source=(http://downloads.sourceforge.net/project/dejavu/dejavu/${pkgver}/dejavu-fonts-ttf-${pkgver}.tar.bz2)
-md5sums=('545b3bfc69893075a90a7c6e6f4a7e67')
+md5sums=('8b601e91725b6d69141b0fcf527948c0')
 
-build() {
-  cd "${srcdir}/dejavu-fonts-ttf-${pkgver}"
+package() {
+  install -dm755 "${pkgdir}"/etc/fonts/conf.avail
+  install -dm755 "${pkgdir}"/usr/share/fonts/TTF
 
-  install -m755 -d "${pkgdir}/usr/share/fonts/TTF"
-  install -m644 ttf/*.ttf "${pkgdir}/usr/share/fonts/TTF/" || return 1
+  cd "${srcdir}"/dejavu-fonts-ttf-${pkgver}
+  install -m644 ttf/*.ttf "${pkgdir}"/usr/share/fonts/TTF/
+  install -m644 fontconfig/*.conf "${pkgdir}"/etc/fonts/conf.avail/
 
-  install -m755 -d "${pkgdir}/etc/fonts/conf.avail"
-  install -m644 fontconfig/*.conf "${pkgdir}/etc/fonts/conf.avail/" || return 1
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -D -m644 LICENSE "$pkgdir/usr/share/licenses/${pkgname}/" || return 1
+  install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }
diff --git a/abs/core/ttf-dejavu/ttf-dejavu.install b/abs/core/ttf-dejavu/ttf-dejavu.install
index f831cb1..47ecf87 100644
--- a/abs/core/ttf-dejavu/ttf-dejavu.install
+++ b/abs/core/ttf-dejavu/ttf-dejavu.install
@@ -4,8 +4,9 @@ configs=(20-unhint-small-dejavu-sans-mono.conf
          57-dejavu-sans-mono.conf
          57-dejavu-sans.conf
          57-dejavu-serif.conf)
+
 post_install() {
-  pushd /etc/fonts/conf.d > /dev/null
+  pushd etc/fonts/conf.d > /dev/null
   for config in "${configs[@]}"; do
     ln -sf ../conf.avail/${config} .
   done
@@ -17,13 +18,13 @@ post_install() {
 
 post_upgrade() {
   if [ `vercmp 2.30-2 $2` -gt 0 ]; then 
-    pushd /etc/fonts/conf.d > /dev/null
+    pushd etc/fonts/conf.d > /dev/null
     for config in "${configs[@]}"; do
       ln -sf ../conf.avail/${config} .
     done
     popd > /dev/null
   fi
-  for config in /etc/fonts/conf.d/*; do
+  for config in etc/fonts/conf.d/*; do
     if [ ! -f ${config} ]; then
       rm -f ${config}
     fi
@@ -35,7 +36,7 @@ post_upgrade() {
 
 pre_upgrade() {
   # Link new config files not present on system yet
-  pushd /etc/fonts/conf.d > /dev/null
+  pushd etc/fonts/conf.d > /dev/null
   for config in "${configs[@]}"; do
     if [ ! -f ../conf.avail/${config} ]; then
       ln -sf ../conf.avail/${config} .
@@ -45,7 +46,7 @@ pre_upgrade() {
 }
 
 post_remove() {
-  pushd /etc/fonts/conf.d > /dev/null
+  pushd etc/fonts/conf.d > /dev/null
   for config in "${configs[@]}"; do
     rm -f ${config}
   done