version 271-2

1 files changed, 12 insertions, 16 deletions

diff --git a/PKGBUILD b/PKGBUILD
index bb93fff6a6f0..1887b30a7e77 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=dzen2-xft-xpm-xinerama-svn
 pkgver=271
-pkgrel=3
+pkgrel=2
 pkgdesc="X notification utility with Xinerama, XPM, XFT and gadgets, svn version"
 arch=('i686' 'x86_64')
 url="http://gotmor.googlepages.com/dzen"
@@ -18,6 +18,8 @@ _svntrunk=http://dzen.googlecode.com/svn/trunk/
 _svnmod=dzen2
 
 build() {
+  cd $startdir/src
+
   if [ -d $_svnmod/.svn ]; then
     (cd $_svnmod && svn up -r $pkgver)
   else
@@ -33,28 +35,22 @@ build() {
 
   make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11 \
   CFLAGS=" -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA -DDZEN_XPM -DDZEN_XFT `pkg-config --cflags xft`" \
-  LIBS=" -L/usr/lib -lc -L${X11LIB} -lXss -lX11 -lXinerama -lXpm `pkg-config --libs xft`"
-  make PREFIX=/usr
-
-  cd gadgets
-  make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11
-}
-
-package() {
-  cd $_svnmod-build
-  make PREFIX=/usr DESTDIR="$pkgdir" install
+  LIBS=" -L/usr/lib -lc -L${X11LIB} -lXss -lX11 -lXinerama -lXpm `pkg-config --libs xft`" || return 1
+  make PREFIX=/usr DESTDIR=$startdir/pkg install || return 1
 
   #license
-  install -m644 -D LICENSE "$pkgdir/usr/share/licenses/$_svnmod/COPYING"
+  install -m644 -D LICENSE $startdir/pkg/usr/share/licenses/$_svnmod/COPYING
 
   #docs
-  mkdir -p "$pkgdir/usr/share/doc/$_svnmod"
-  cp README* "$pkgdir/usr/share/doc/$_svnmod"
+  mkdir -p $startdir/pkg/usr/share/doc/$_svnmod
+  cp README* $startdir/pkg/usr/share/doc/$_svnmod
 
   #gadgets
   cd gadgets
-  make PREFIX=/usr DESTDIR="$pkgdir" install
+  make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11 || return 1
+  make PREFIX=/usr DESTDIR=$startdir/pkg install || return 1
 
   #docs
-  cp README* "$pkgdir/usr/share/doc/$_svnmod"
+  cp README* $startdir/pkg/usr/share/doc/$_svnmod
+
 }