From bbb460f85242e6ac03f47b74b9d0be66ff089ac4 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 9 May 2011 22:34:00 +0000 Subject: Mon May 9 22:34:00 UTC 2011 --- extra/fluxter/PKGBUILD | 32 +++++++++++++--------- extra/fluxter/fluxter-0.1.0-asneeded.patch | 43 ++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 12 deletions(-) create mode 100644 extra/fluxter/fluxter-0.1.0-asneeded.patch (limited to 'extra/fluxter') diff --git a/extra/fluxter/PKGBUILD b/extra/fluxter/PKGBUILD index 5b0dffc02..723543918 100644 --- a/extra/fluxter/PKGBUILD +++ b/extra/fluxter/PKGBUILD @@ -1,22 +1,30 @@ -# $Id: PKGBUILD 30062 2009-03-16 01:14:26Z eric $ -# Maintainer: Eric Belanger -# Contributor: Ben +# $Id: PKGBUILD 123175 2011-05-09 02:48:19Z eric $ +# Maintainer: Eric BĂ©langer pkgname=fluxter pkgver=0.1.0 -pkgrel=4 +pkgrel=5 pkgdesc="A workspace pager for fluxbox" arch=('i686' 'x86_64') url="http://benedict.isomedia.com/homes/stevencooper/projects/fluxter.html" license=('GPL') -depends=('gcc-libs' 'libx11' 'libsm') -source=(http://benedict.isomedia.com/homes/stevencooper/files/${pkgname}-${pkgver}.tar.gz) -md5sums=('6d18553220e8fc33c54762d2e7d31528') -sha1sums=('d0da4759a21fdadc8a6457195c87b6648b5d69bc') +depends=('gcc-libs' 'libx11') +source=(http://benedict.isomedia.com/homes/stevencooper/files/${pkgname}-${pkgver}.tar.gz \ + fluxter-0.1.0-asneeded.patch) +md5sums=('6d18553220e8fc33c54762d2e7d31528' + '3deb4e816d12a262455bc8281fa82577') +sha1sums=('d0da4759a21fdadc8a6457195c87b6648b5d69bc' + '2fc912d40233577b34cb6c641e066863e487fab0') build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR=${pkgdir} install || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p0 -i ../fluxter-0.1.0-asneeded.patch + autoreconf + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/fluxter/fluxter-0.1.0-asneeded.patch b/extra/fluxter/fluxter-0.1.0-asneeded.patch new file mode 100644 index 000000000..8b6826074 --- /dev/null +++ b/extra/fluxter/fluxter-0.1.0-asneeded.patch @@ -0,0 +1,43 @@ +--- Makefile.am ++++ Makefile.am +@@ -17,4 +17,4 @@ + NETInterface.cc NETInterface.hh \ + blackboxstyle.hh + EXTRA_DIST = BUGS TODO +-fluxter_LDADD = @X_LIBS@ ++fluxter_LDADD = @LIBS@ +--- configure.in ++++ configure.in +@@ -18,14 +18,12 @@ + [ + test "$CFLAGS" = "" && CFLAGS="-g -Wall -DDEBUG" + test "$CXXFLAGS" = "" && CXXFLAGS="-g -Wall -DDEBUG" +- test "$LDFLAGS" = "" && LDFLAGS="" + ]) + + AC_DEFUN(AC_SET_NODEBUG, + [ +- test "$CFLAGS" = "" && CFLAGS="-O2 -Wall" +- test "$CXXFLAGS" = "" && CXXFLAGS="-O2 -Wall" +- test "$LDFLAGS" = "" && LDFLAGS="-s" ++ test "$CFLAGS" = "" && CFLAGS="-Wall" ++ test "$CXXFLAGS" = "" && CXXFLAGS="-Wall" + ]) + + +@@ -71,12 +69,12 @@ + + CFLAGS="$CFLAGS $X_CFLAGS" + CXXFLAGS="$CXXFLAGS $X_CFLAGS" +-LDFLAGS="$LDFLAGS $X_LIBS $X_PRE_LIBS" ++LIBS="$LIBS $X_LIBS $X_PRE_LIBS" + dnl Checks for X libraries. +-AC_CHECK_LIB(X11, XOpenDisplay, LDFLAGS="$LDFLAGS -lX11", ++AC_CHECK_LIB(X11, XOpenDisplay, LIBS="$LIBS -lX11", + AC_MSG_ERROR(XOpenDisplay not found in -lX11)) + +-LDFLAGS="$LDFLAGS $X_EXTRA_LIBS" ++LIBS="$LIBS $X_EXTRA_LIBS" + + dnl Checks for header files. + AC_HEADER_STDC -- cgit v1.2.3-54-g00ecf