3 files changed, 51 insertions, 20 deletions
diff --git a/extra/fltk/PKGBUILD b/extra/fltk/PKGBUILD
index 2ce310cdd..5c63fd095 100644
--- a/extra/fltk/PKGBUILD
+++ b/extra/fltk/PKGBUILD
@@ -1,19 +1,22 @@
-# $Id: PKGBUILD 130308 2011-07-04 21:56:54Z eric $
+# $Id: PKGBUILD 142179 2011-11-05 20:03:57Z eric $
+# Maintainer:
 
 pkgbase=fltk
-pkgname=('fltk' 'fltk-docs')
+pkgname=('fltk' 'fltk-docs' 'fltk-games')
 pkgver=1.3.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('custom:LGPL')
 url="http://www.fltk.org/"
-depends=('sh' 'libjpeg' 'libpng' 'libxft' 'libxinerama' 'alsa-lib' 'hicolor-icon-theme' 'desktop-file-utils' 'xdg-utils')
-makedepends=('mesa' 'doxygen')
+makedepends=('mesa' 'doxygen' 'libjpeg' 'libpng' 'libxft' 'libxinerama' \
+             'alsa-lib' 'desktop-file-utils')
 source=(http://ftp.easysw.com/pub/$pkgbase/$pkgver/$pkgbase-$pkgver-source.tar.gz)
 md5sums=('44d5d7ba06afdd36ea17da6b4b703ca3')
 
 build() {
   cd "$srcdir/$pkgbase-$pkgver"
+  sed -i -e 's/$(LINKFLTK)/$(LINKSHARED)/' \
+         -e 's/$(LINKFLTKIMG)/$(LINKSHARED)/' test/Makefile
   ./configure --prefix=/usr --enable-threads --enable-xft --enable-shared
   make
   cd documentation
@@ -22,18 +25,20 @@ build() {
 
 package_fltk() {
   pkgdesc="Graphical user interface toolkit for X"
+  depends=('libjpeg' 'libpng' 'libxft' 'libxinerama' 'hicolor-icon-theme' \
+           'desktop-file-utils' 'xdg-utils')
   options=('!docs')
   install=fltk.install
 
   cd "$srcdir/$pkgbase-$pkgver"
-  make DESTDIR="$pkgdir" install install-desktop
+  make DESTDIR="$pkgdir" install
+  (cd fluid; make DESTDIR="$pkgdir" install install-linux)
   chmod 644 "$pkgdir"/usr/lib/*.a
   install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
 package_fltk-docs() {
   pkgdesc="Graphical user interface toolkit for X (documentation)"
-  depends=('')
 
   cd "$srcdir/$pkgbase-$pkgver/documentation"
   install -d "$pkgdir"/usr/share/doc/fltk/
@@ -44,3 +49,14 @@ package_fltk-docs() {
   make DESTDIR="$pkgdir" install
   install -D -m644 ../COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
+
+package_fltk-games() {
+  pkgdesc="Example games that accompany FLTK: blocks, checkers and sudoku"
+  depends=('alsa-lib' 'fltk')
+  install=fltk-games.install
+
+  cd "$srcdir/$pkgbase-$pkgver/test"
+  make DESTDIR="$pkgdir" install-linux
+  (cd ../documentation;  make DESTDIR="$pkgdir" install-linux)
+  install -D -m644 ../COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/extra/fltk/fltk-games.install b/extra/fltk/fltk-games.install
new file mode 100644
index 000000000..f3fe2b08b
--- /dev/null
+++ b/extra/fltk/fltk-games.install
@@ -0,0 +1,11 @@
+post_install() {
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install 
+}
diff --git a/extra/wv2/PKGBUILD b/extra/wv2/PKGBUILD
index 72ebab120..a30b0f9c4 100644
--- a/extra/wv2/PKGBUILD
+++ b/extra/wv2/PKGBUILD
@@ -1,30 +1,34 @@
-# $Id: PKGBUILD 57827 2009-11-02 14:26:13Z ronald $
+# $Id: PKGBUILD 142173 2011-11-05 11:56:53Z pierre $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=wv2
 pkgver=0.4.2
-pkgrel=1
+pkgrel=2
 pkgdesc="MSWord 9,8,7,6 formats parser"
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/wvware/"
 depends=('libgsf')
 makedepends=('cmake')
-options=(!libtool)
-source=(http://downloads.sourceforge.net/sourceforge/wvware/${pkgname}-${pkgver}.tar.bz2)
+options=('!libtool')
+source=("http://downloads.sourceforge.net/sourceforge/wvware/${pkgname}-${pkgver}.tar.bz2")
 license=('GPL2')
 md5sums=('850ed8e44a84e7bf0610747827018cbc')
 
 build() {
- cd ${srcdir}
- mkdir build
- cd build
+  cd ${srcdir}
+  mkdir build
+  cd build
 
- cmake ../${pkgname}-${pkgver} \
-	-DCMAKE_BUILD_TYPE=Release \
-	-DCMAKE_SKIP_RPATH=ON \
-	-DCMAKE_INSTALL_PREFIX=/usr
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_SKIP_RPATH=ON \
+    -DCMAKE_INSTALL_PREFIX=/usr
 
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  make
+}
+
+package() {
+  cd ${srcdir}/build
+  make DESTDIR=${pkgdir} install
 }