diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-02 10:47:02 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-02 10:47:02 -0300 |
| commit | 40e1222c1402c0d2aded73b95802f8197d0691a6 (patch) | |
| tree | e1bf1a01ae7443e4a9f460200dad9580565b27c7 /community/dzen2/PKGBUILD | |
| parent | 3e3dd870121c91097220248a601578b92d332f2b (diff) | |
| parent | 37a1064b8105764414f279ced442e6ba2f63bea1 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/camlp5/PKGBUILD
community/dzen2/PKGBUILD
extra/boost/PKGBUILD
extra/libxmi/PKGBUILD
extra/mesa/PKGBUILD
multilib/lib32-mesa/PKGBUILD
Diffstat (limited to 'community/dzen2/PKGBUILD')
| -rw-r--r-- | community/dzen2/PKGBUILD | 39 |
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 } |