1 files changed, 15 insertions, 24 deletions
diff --git a/community/dzen2/PKGBUILD b/community/dzen2/PKGBUILD
index 22216ae9c..841626991 100644
--- a/community/dzen2/PKGBUILD
+++ b/community/dzen2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 27711 2010-09-27 09:27:49Z spupykin $
+# $Id: PKGBUILD 57590 2011-10-31 07:59:11Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Mark Taylor <skymt0@gmail.com>
 
 pkgname=dzen2
 pkgver=0.8.5
-pkgrel=6
+pkgrel=7
 arch=(i686 x86_64 'mips64el')
 pkgdesc="X notification utility"
 url="http://gotmor.googlepages.com/dzen"
@@ -18,29 +18,20 @@ build()
 {
   cd $srcdir/dzen2-$pkgver
 
-  patch -p0 config.mk <<EOF
-22,23c22,23
-< LIBS = -L/usr/lib -lc -L\${X11LIB} -lX11
-< CFLAGS = -Os \${INCS} -DVERSION=\\"\${VERSION}\\"
----
-> #LIBS = -L/usr/lib -lc -L\${X11LIB} -lX11
-> #CFLAGS = -Os \${INCS} -DVERSION=\\"\${VERSION}\\"
-34,35c34,35
-< #LIBS = -L/usr/lib -lc -L\${X11LIB} -lX11 -lXinerama -lXpm
-< #CFLAGS = -Os \${INCS} -DVERSION=\\"\${VERSION}\\" -DDZEN_XINERAMA -DDZEN_XPM
----
-> LIBS = -L/usr/lib -lc -L\${X11LIB} -lX11 -lXinerama -lXpm `pkg-config --libs xft`
-> CFLAGS = -Os \${INCS} -DVERSION=\\"\${VERSION}\\" -DDZEN_XINERAMA -DDZEN_XPM -DDZEN_XFT `pkg-config --cflags xft`
-EOF
+  CFLAGS=" -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA -DDZEN_XPM -DDZEN_XFT `pkg-config --cflags xft`"
+  LIBS=" -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama -lXpm `pkg-config --libs xft`"
 
-  sed -i "s/CFLAGS = /CFLAGS = ${CFLAGS} /" config.mk
+  echo "CFLAGS=$CFLAGS" >>config.mk
+  echo "LIBS=$LIBS" >>config.mk
+  echo "LDFLAGS=$LIBS" >>config.mk
 
-  make X11INC=/usr/include X11LIB=/usr/lib || return 1
-  make PREFIX=/usr MANPREFIX=/usr/man DESTDIR=$pkgdir install || return 1
-  install -m644 -D LICENSE $pkgdir/usr/share/licenses/dzen2/COPYING
+  make X11INC=/usr/include X11LIB=/usr/lib
+  (cd $srcdir/dzen2-$pkgver/gadgets && make X11INC=/usr/include X11LIB=/usr/lib)
+}
 
-  cd $srcdir/dzen2-$pkgver/gadgets
-  sed -i "s/CFLAGS = /CFLAGS = ${CFLAGS} /" config.mk
-  make X11INC=/usr/include X11LIB=/usr/lib || return 1
-  make PREFIX=/usr MANPREFIX=/usr/man DESTDIR=$pkgdir install || return 1
+package() {
+  cd $srcdir/dzen2-$pkgver
+  make PREFIX=/usr MANPREFIX=/usr/man DESTDIR=$pkgdir install
+  (cd $srcdir/dzen2-$pkgver/gadgets && make PREFIX=/usr MANPREFIX=/usr/man DESTDIR=$pkgdir install)
+  install -m644 -D LICENSE $pkgdir/usr/share/licenses/dzen2/COPYING
 }