Mon Oct 28 01:14:27 PDT 2013

1 files changed, 13 insertions, 16 deletions

diff --git a/extra/fltk/PKGBUILD b/extra/fltk/PKGBUILD
index 5fd6d3901..138bbad57 100644
--- a/extra/fltk/PKGBUILD
+++ b/extra/fltk/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 194347 2013-09-14 08:19:54Z bpiotrowski $
+# $Id: PKGBUILD 197654 2013-10-27 19:10:51Z eric $
 # Maintainer:
 
 pkgbase=fltk
 pkgname=('fltk' 'fltk-docs' 'fltk-games')
 pkgver=1.3.2
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 license=('custom:LGPL')
 url="http://www.fltk.org/"
-makedepends=('mesa' 'glu' 'doxygen' 'libjpeg' 'libpng' 'libxft' 'libxinerama' \
+makedepends=('mesa' 'glu' 'doxygen' 'libjpeg' 'libxft' 'libxinerama' \
              'alsa-lib' 'desktop-file-utils' 'libxcursor')
 source=(http://fltk.org/pub/fltk/$pkgver/fltk-$pkgver-source.tar.gz
         tigervnc.patch)
@@ -16,44 +16,41 @@ md5sums=('9f7e707d4fb7a5a76f0f9b73ff70623d'
          '9efdf03a449d7639b6da493cb0972bba')
 
 prepare() {
-  cd "$srcdir/$pkgbase-$pkgver"
+  cd $pkgbase-$pkgver
   patch -Np1 -i ../tigervnc.patch
 }
 
 build() {
-  cd "$srcdir/$pkgbase-$pkgver"
+  cd $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
-  make html
+  make -C documentation html
 }
 
 package_fltk() {
   pkgdesc="Graphical user interface toolkit for X"
-  depends=('libjpeg' 'libpng' 'libxft' 'libxinerama' 'hicolor-icon-theme' \
+  depends=('libjpeg' 'libxft' 'libxinerama' 'hicolor-icon-theme' \
            'desktop-file-utils' 'xdg-utils' 'libxcursor')
   options=('!docs')
   install=fltk.install
 
-  cd "$srcdir/$pkgbase-$pkgver"
+  cd $pkgbase-$pkgver
   make DESTDIR="$pkgdir" install
-  (cd fluid; make DESTDIR="$pkgdir" install install-linux)
-  chmod 644 "$pkgdir"/usr/lib/*.a
+  make DESTDIR="$pkgdir" -C fluid install install-linux
   install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
 package_fltk-docs() {
   pkgdesc="Graphical user interface toolkit for X (documentation)"
 
-  cd "$srcdir/$pkgbase-$pkgver/documentation"
+  cd $pkgbase-$pkgver/documentation
   install -d "$pkgdir"/usr/share/doc/fltk/
   for _file in html/* ; do
     install -m644 $_file "$pkgdir"/usr/share/doc/fltk/
   done
-  cd ../test
-  make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" -C ../test install
   install -D -m644 ../COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
@@ -62,8 +59,8 @@ package_fltk-games() {
   depends=('alsa-lib' 'fltk')
   install=fltk-games.install
 
-  cd "$srcdir/$pkgbase-$pkgver/test"
+  cd $pkgbase-$pkgver/test
   make DESTDIR="$pkgdir" install-linux
-  (cd ../documentation;  make DESTDIR="$pkgdir" install-linux)
+  make DESTDIR="$pkgdir" -C ../documentation install-linux
   install -D -m644 ../COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }