Tue Jan 10 23:14:59 UTC 2012

13 files changed, 98 insertions, 88 deletions

diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD
index a13c4cbb1..2d86f2cc1 100644
--- a/extra/evolution-data-server/PKGBUILD
+++ b/extra/evolution-data-server/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 142872 2011-11-17 18:34:28Z ibiru $
+# $Id: PKGBUILD 146371 2012-01-09 21:02:00Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evolution-data-server
-pkgver=3.2.2
+pkgver=3.2.3
 pkgrel=1
 pkgdesc="Centralized access to appointments and contacts"
 arch=('i686' 'x86_64')
@@ -11,11 +11,11 @@ makedepends=('intltool' 'gperf' 'gobject-introspection' 'vala')
 options=('!libtool')
 url="http://www.gnome.org"
 license=('GPL')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('2a129b4c9412b8b855ce28bd682e522b3af0309e407f9d900f1d48be649bc76a')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz)
+sha256sums=('8760814491fa1ecf8806b31231b30c5f20169790abdc6b78a2faa194fde3987c')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --with-openldap=yes \
       --libexecdir=/usr/lib/evolution-data-server \
@@ -26,6 +26,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
diff --git a/extra/evolution-ews/PKGBUILD b/extra/evolution-ews/PKGBUILD
index 29fa39fd2..28f1deac6 100644
--- a/extra/evolution-ews/PKGBUILD
+++ b/extra/evolution-ews/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 142874 2011-11-17 18:34:31Z ibiru $
+# $Id: PKGBUILD 146374 2012-01-09 21:40:58Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=evolution-ews
-pkgver=3.2.2
+pkgver=3.2.3
 pkgrel=1
 pkgdesc="MS Exchange integration through Exchange Web Services"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ depends=('evolution-data-server' 'gtkhtml4' 'gnome-desktop')
 makedepends=('intltool' 'evolution')
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('f6a557a93e632e19cde1501f6f0540f67e41c193120d7297268662ddc7927439')
+sha256sums=('0c26fb822ced5bca7c6888ade35f47821317fa45e33a93c8a2a81fcb06d6f483')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/evolution-groupwise/PKGBUILD b/extra/evolution-groupwise/PKGBUILD
index 786ecc16a..ff129c990 100644
--- a/extra/evolution-groupwise/PKGBUILD
+++ b/extra/evolution-groupwise/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 140867 2011-10-20 05:42:12Z ibiru $
+# $Id: PKGBUILD 146378 2012-01-09 22:04:09Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=evolution-groupwise
-pkgver=3.2.1
+pkgver=3.2.3
 pkgrel=1
 pkgdesc="GroupWise connector for evolution"
 arch=(i686 x86_64)
@@ -13,14 +13,14 @@ depends=('evolution-data-server' 'gtkhtml4')
 makedepends=(intltool evolution)
 optdepends=('evolution: evolution plugin')
 options=(!libtool)
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz)
-sha256sums=('3a5a1590b92144e465b09abc0fdaefc6d6bf9a5465d0b07e01171ddfef4aebbf')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('9972cf6ab05168e2364f7d7af1a5d9dd2bb994ab833fc2aaf926a4390e6b8062')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-static
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var  --disable-static
   make
 }
 
diff --git a/extra/evolution/PKGBUILD b/extra/evolution/PKGBUILD
index 7e6de90d0..168d89d71 100644
--- a/extra/evolution/PKGBUILD
+++ b/extra/evolution/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 142870 2011-11-17 18:34:24Z ibiru $
+# $Id: PKGBUILD 146376 2012-01-09 21:56:36Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evolution
-pkgver=3.2.2
-pkgrel=1
+pkgver=3.2.3
+pkgrel=2
 pkgdesc="Manage your email, contacts and schedule"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -15,11 +15,11 @@ groups=('gnome-extra')
 options=('!libtool' '!emptydirs')
 install=evolution.install
 url=http://www.gnome.org/projects/evolution/
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('03c68242bbf494dda3bf34f52ec843c282c9bb07f9415a69fe58237c7efbbe7d')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('a25d523e775c022ec9e68d7b989316e7252b687d70b9db2f60b72bb833099e9d')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var \
       --libexecdir=/usr/lib \
@@ -35,11 +35,11 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-  make -C plugins/tnef-attachments DESTDIR="${pkgdir}" install
+  cd "$srcdir/$pkgname-$pkgver"
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
+  make -C plugins/tnef-attachments DESTDIR="$pkgdir" install
 
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain evolution-3.2 ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
+  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain evolution-3.2 "$pkgdir"/etc/gconf/schemas/*.schemas
+  rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
 }
diff --git a/extra/gnome-color-manager/PKGBUILD b/extra/gnome-color-manager/PKGBUILD
index f84df799e..c436dc1f5 100644
--- a/extra/gnome-color-manager/PKGBUILD
+++ b/extra/gnome-color-manager/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 144389 2011-12-05 13:07:33Z ibiru $
+# $Id: PKGBUILD 146319 2012-01-09 17:51:25Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 
 pkgname=gnome-color-manager
-pkgver=3.2.1
-pkgrel=2
+pkgver=3.2.2
+pkgrel=1
 pkgdesc="Color profile manager for the GNOME desktop"
 arch=(i686 x86_64)
 url="http://projects.gnome.org/gnome-color-manager/"
@@ -14,7 +14,7 @@ install=gnome-color-manager.install
 options=('!libtool' '!emptydirs')
 groups=('gnome-extra')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('bc4651b58a4dc4b812803e8f81520488e6b452969028f04987cb463b8e218436')
+sha256sums=('4898fe8c29761d8dc0859c4a3a1bf725d3b80d552caab1225202f6030a118d9a')
 
 build(){
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/gtkhtml4/PKGBUILD b/extra/gtkhtml4/PKGBUILD
index 3145eb8af..09cd85827 100644
--- a/extra/gtkhtml4/PKGBUILD
+++ b/extra/gtkhtml4/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 142883 2011-11-17 18:34:43Z ibiru $
+# $Id: PKGBUILD 146306 2012-01-09 13:55:21Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtkhtml4
 _pkgbasename=gtkhtml
-pkgver=4.2.2
+pkgver=4.2.3
 pkgrel=1
 pkgdesc="A lightweight HTML renderer/editor widget for GTK3"
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@ makedepends=('intltool')
 url="http://www.gnome.org"
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.xz)
-sha256sums=('e20bb5d461e9ae9d3a8d4e13d544db1813707810ded7cbde9287485f2394dd2c')
+sha256sums=('e9867dafd5685a7887afe77f2eb584aeaf5f8e20df83100b8f24adcfc1e422d1')
 
 build() {
     cd "${srcdir}/${_pkgbasename}-${pkgver}"
diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD
index 94c51c177..866be38b3 100644
--- a/extra/libdrm/PKGBUILD
+++ b/extra/libdrm/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 145190 2011-12-19 12:35:11Z andyrtr $
+# $Id: PKGBUILD 146314 2012-01-09 15:57:26Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libdrm
-pkgver=2.4.29
+pkgver=2.4.30
 pkgrel=1
 pkgdesc="Userspace interface to kernel DRM services"
 arch=(i686 x86_64)
@@ -14,18 +14,18 @@ url="http://dri.freedesktop.org/"
 source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2
         no-pthread-stubs.patch
         COPYING
-	git_fixes.diff)
-md5sums=('96d5e3e9edd55f4b016fe3b5dd0a1953'
-         'c722c8406507b7e3a8da7a3030d1d9cf'
-         'ba65e71c481b94ef0fb6c23c7f21ffa1'
-         'aebd5336568090b8ec084fabcfb08071')
+#	git_fixes.diff
+)
+md5sums=('9f57a68b2c0836b55ebcbc241f6ca175'
+         'fb8a15bf4aff5646c517373e8277f440'
+         'ba65e71c481b94ef0fb6c23c7f21ffa1')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i "${srcdir}/no-pthread-stubs.patch"
 
   # git fixes - currently none
-  patch -Np1 -i ${srcdir}/git_fixes.diff
+#  patch -Np1 -i ${srcdir}/git_fixes.diff
   
   #libtoolize --force
   autoreconf --force --install
diff --git a/extra/libdrm/no-pthread-stubs.patch b/extra/libdrm/no-pthread-stubs.patch
index 348c2a795..03bb66953 100644
--- a/extra/libdrm/no-pthread-stubs.patch
+++ b/extra/libdrm/no-pthread-stubs.patch
@@ -14,7 +14,7 @@ diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac
  AC_SUBST(PCIACCESS_LIBS)
 --- libdrm-2.4.16/intel/Makefile.am	2009-11-20 23:54:36.000000000 +0000
 +++ libdrm-2.4.16/intel/Makefile.am.new	2009-12-07 08:11:32.235748069 +0000
-@@ -26,14 +26,13 @@
+@@ -26,7 +26,6 @@
  	$(WARN_CFLAGS) \
  	-I$(top_srcdir) \
  	-I$(top_srcdir)/intel \
@@ -22,14 +22,14 @@ diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac
  	$(PCIACCESS_CFLAGS) \
  	-I$(top_srcdir)/include/drm
  
- libdrm_intel_la_LTLIBRARIES = libdrm_intel.la
+@@ -34,7 +33,6 @@
  libdrm_intel_ladir = $(libdir)
  libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libdrm_intel_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @PCIACCESS_LIBS@ @CLOCK_LIB@
-+libdrm_intel_la_LIBADD = ../libdrm.la @PCIACCESS_LIBS@ @CLOCK_LIB@
+ libdrm_intel_la_LIBADD = ../libdrm.la \
+-	@PTHREADSTUBS_LIBS@ \
+ 	@PCIACCESS_LIBS@ \
+ 	@CLOCK_LIB@
  
- libdrm_intel_la_SOURCES = \
- 	intel_bufmgr.c \
 --- libdrm-2.4.16/radeon/Makefile.am	2009-11-20 23:54:36.000000000 +0000
 +++ libdrm-2.4.16/radeon/Makefile.am.new	2009-12-07 08:12:31.889075388 +0000
 @@ -26,13 +26,12 @@
diff --git a/extra/proftpd/PKGBUILD b/extra/proftpd/PKGBUILD
index e0cb62afd..86d1bce67 100644
--- a/extra/proftpd/PKGBUILD
+++ b/extra/proftpd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 142778 2011-11-15 04:26:53Z eric $
+# $Id: PKGBUILD 146388 2012-01-10 00:35:24Z eric $
 # Maintainer:
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=proftpd
 pkgver=1.3.4a
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="A high-performance, scalable FTP server"
 arch=('i686' 'x86_64')
diff --git a/extra/windowmaker-crm-git/PKGBUILD b/extra/windowmaker-crm-git/PKGBUILD
index b2b1b4f1e..4037626f8 100644
--- a/extra/windowmaker-crm-git/PKGBUILD
+++ b/extra/windowmaker-crm-git/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 137555 2011-09-09 11:26:39Z daniel $
+# $Id: PKGBUILD 146365 2012-01-09 19:01:56Z daniel $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 
 pkgname=windowmaker-crm-git
-pkgver=20110909
+pkgver=20120109
 pkgrel=1
 pkgdesc="An X11 window manager with a NEXTSTEP look and feel - git version from Carlos R. Mafra"
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@ options=('!libtool')
 provides=('windowmaker')
 conflicts=('windowmaker')
 source=(ftp://ftp.archlinux.org/other/windowmaker/windowmaker-$pkgver.tar.gz wmaker.desktop)
-md5sums=('594f66f40130fe49b6350579f4d54c2b'
+md5sums=('abe70f9cc7606c73a9bbe498cacf925a'
          '2fba97bebfd691836b92b8f0db79ff13')
 
 build() {
@@ -23,8 +23,14 @@ build() {
   ./configure --prefix=/usr --sysconfdir=/etc --enable-xinerama \
     --with-nlsdir=/usr/share/locale --with-gnustepdir=/usr/lib/GNUstep \
     --enable-usermenu --enable-modelock --enable-xrandr
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
+  make
+}
+
+package() {
+  cd $srcdir/windowmaker-$pkgver
+  
+  make DESTDIR=$pkgdir install
   install -D -m644 COPYING.WTFPL $pkgdir/usr/share/licenses/$pkgname/COPYING.WTFPL
   install -D -m644 $srcdir/wmaker.desktop $pkgdir/usr/share/xsessions/wmaker.desktop
+
 }
diff --git a/extra/windowmaker/PKGBUILD b/extra/windowmaker/PKGBUILD
index 85fdd5062..ecda30c8f 100644
--- a/extra/windowmaker/PKGBUILD
+++ b/extra/windowmaker/PKGBUILD
@@ -1,35 +1,34 @@
-# $Id: PKGBUILD 71460 2010-03-07 10:56:49Z daniel $
+# $Id: PKGBUILD 146321 2012-01-09 18:41:18Z daniel $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 pkgname=windowmaker
-pkgver=0.92.0
-pkgrel=8
+pkgver=0.95.0
+pkgrel=1
 pkgdesc="An X11 window manager with a NEXTSTEP look and feel"
 arch=(i686 x86_64)
-url="http://www.windowmaker.info/"
+url="http://www.windowmaker.org/"
 license=('GPL' 'custom')
-depends=('libxinerama' 'libpng' 'libxpm' 'libxft' 'libtiff' 'giflib')
+depends=('libxinerama' 'libxrandr' 'libxmu' 'libpng' 'libxpm' 'libxft' 'libtiff' 'giflib')
 options=('!libtool')
-source=(http://windowmaker.info/pub/source/release/WindowMaker-$pkgver.tar.bz2 windowmaker-gcc4.patch.tar.bz2 libpng-1.4.patch)
-md5sums=('aaac5421b686ed2d3e6ab65229c98097' 'd9fb6a9c255f5c03d0e0c83dc3cd2320'\
-         '409173062955f4a527d88cd7a007efa7')
-sha1sums=('4f7fea6f40b9ba9f870d2e2f0ce46274750edb2c' '764aa4883b289994177fd3735541d050fda5bcdb'\
-         '027e1d06360fa38fe95afab6e73b7e9f144da687')
+source=(ftp://ftp.archlinux.org/other/windowmaker/windowmaker-$pkgver.tar.gz wmaker.desktop)  
+md5sums=('2d89834b4019e0a08641709ea7235db2'
+         '2fba97bebfd691836b92b8f0db79ff13')
 
 build() {
-  cd $srcdir/WindowMaker-$pkgver
-  patch -p1 < ../libpng-1.4.patch || return 1
-  patch -Np1 -i ../windowmaker-gcc4.patch || return 1
-  libtoolize --force --copy || return 1
-  aclocal || return 1
-  autoconf || return 1
-  automake || return 1
+  cd $srcdir/windowmaker-$pkgver
   [ -z "$LINGUAS" ] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --with-gnustepdir=/usr/lib/GNUstep --with-nlsdir=/usr/share/locale \
-    --enable-xinerama  || return 1
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
+  ./autogen.sh
+  ./configure --prefix=/usr --sysconfdir=/etc --enable-xinerama \
+    --with-nlsdir=/usr/share/locale --with-gnustepdir=/usr/lib/GNUstep \
+    --enable-usermenu --enable-modelock --enable-xrandr
+  make
+}
+
+package() {
+  cd $srcdir/windowmaker-$pkgver
+  
+  make DESTDIR=$pkgdir install
   install -D -m644 COPYING.WTFPL $pkgdir/usr/share/licenses/$pkgname/COPYING.WTFPL
+  install -D -m644 $srcdir/wmaker.desktop $pkgdir/usr/share/xsessions/wmaker.desktop
 }
 
diff --git a/extra/windowmaker/wmaker.desktop b/extra/windowmaker/wmaker.desktop
new file mode 100644
index 000000000..f819c7577
--- /dev/null
+++ b/extra/windowmaker/wmaker.desktop
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=windowmaker
+Exec=/usr/bin/wmaker
+Type=Application
diff --git a/extra/xf86-video-nouveau/PKGBUILD b/extra/xf86-video-nouveau/PKGBUILD
index 2627c305c..f08fb5823 100644
--- a/extra/xf86-video-nouveau/PKGBUILD
+++ b/extra/xf86-video-nouveau/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 140320 2011-10-11 21:28:57Z jgc $
+# $Id: PKGBUILD 146316 2012-01-09 16:15:38Z ibiru $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: buddabrod <buddabrod@gmail.com>
 
 pkgname=xf86-video-nouveau
-_gitdate=20110829
+_gitdate=20120106
 pkgver=0.0.16_git${_gitdate} # see configure.ac
 pkgrel=1
 pkgdesc="Open Source 3D acceleration driver for nVidia cards (experimental)"
@@ -15,27 +15,27 @@ optdepends=('nouveau-dri:	experimental gallium3d features')
 makedepends=('xorg-server-devel' 'libdrm' 'xf86driproto')
 conflicts=('xorg-server<1.11.0')
 options=('!libtool')
-install=${pkgname}.install
+install=$pkgname.install
 source=(ftp://ftp.archlinux.org/other/$pkgname/xf86-video-nouveau-${_gitdate}.tar.bz2)
-md5sums=('8f484f6602a3711f4adfbce74fd886c1')
+md5sums=('4b0ee8643b3322ff3a0c5d70262a54af')
 
 # source PKGBUILD && mksource
 mksource() {
-	mkdir /tmp/${pkgname}-${_gitdate}
-	pushd /tmp/${pkgname}-${_gitdate}
+	mkdir /tmp/$pkgname-${_gitdate}
+	pushd /tmp/$pkgname-${_gitdate}
 	git clone -v --depth 1 git://anongit.freedesktop.org/nouveau/xf86-video-nouveau
 	cd xf86-video-nouveau
-	git archive --prefix=xf86-video-nouveau-${_gitdate}/ --format=tar HEAD | bzip2 > /tmp/${pkgname}-${_gitdate}/${pkgname}-${_gitdate}.tar.bz2
+	git archive --prefix=xf86-video-nouveau-${_gitdate}/ --format=tar HEAD | bzip2 > /tmp/$pkgname-${_gitdate}/$pkgname-${_gitdate}.tar.bz2
 	popd
 }
 
 build() {
-  cd ${srcdir}/xf86-video-nouveau-${_gitdate}
+  cd $srcdir/xf86-video-nouveau-${_gitdate}
   ./autogen.sh --prefix=/usr
   make
 }
 
 package() {
-  cd ${srcdir}/xf86-video-nouveau-${_gitdate}
-  make DESTDIR=${pkgdir} install
+  cd $srcdir/xf86-video-nouveau-${_gitdate}
+  make DESTDIR=$pkgdir install
 }