Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/libraw/PKGBUILD
	community-testing/virtualbox-modules/PKGBUILD
	community-testing/virtualbox-modules/virtualbox-modules.install
	community-testing/virtualbox/PKGBUILD
	community-testing/virtualbox/vboxdrv-reference.patch
	community-testing/virtualbox/virtualbox.install
	community-testing/vtk/PKGBUILD
	community/audex/PKGBUILD
	community/critter/PKGBUILD
	community/egoboo/PKGBUILD
	community/fcgiwrap/PKGBUILD
	community/hping/PKGBUILD
	community/libesmtp/PKGBUILD
	community/lockdev/PKGBUILD
	community/pidgin-musictracker/PKGBUILD
	community/pidgin-otr/PKGBUILD
	community/pylibacl/PKGBUILD
	community/pypanel/PKGBUILD
	community/rdiff-backup/PKGBUILD
	community/steghide/PKGBUILD
	community/tabbed/PKGBUILD
	community/transset-df/PKGBUILD
	community/wyrd/PKGBUILD
	core/openldap/PKGBUILD
	core/sqlite3/PKGBUILD
	extra/fltk/PKGBUILD
	extra/thunar/PKGBUILD
	extra/xfce4-clipman-plugin/PKGBUILD
	multilib/lib32-acl/PKGBUILD
	multilib/lib32-alsa-oss/PKGBUILD
	multilib/lib32-glib2/PKGBUILD
	multilib/lib32-libffi/PKGBUILD
	multilib/lib32-libmng/PKGBUILD
	multilib/lib32-libpciaccess/PKGBUILD
	multilib/lib32-libusb-compat/PKGBUILD
	multilib/lib32-libusb/PKGBUILD
	multilib/wine/PKGBUILD

1 files changed, 23 insertions, 7 deletions

diff --git a/extra/fltk/PKGBUILD b/extra/fltk/PKGBUILD
index ed71922ad..a77c78bbf 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' 'mips64el')
 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"
+}