[arch-commits] Commit in fltk/trunk (PKGBUILD)

[Eric Bélanger]

    Date: Sunday, October 27, 2013 @ 20:08:45
  Author: eric
Revision: 197653

upgpkg: fltk 1.3.2-4

Rebuild without static libraries, Clean up PKGBUILD

Modified:
  fltk/trunk/PKGBUILD

----------+
 PKGBUILD |   27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-10-27 18:25:32 UTC (rev 197652)
+++ PKGBUILD	2013-10-27 19:08:45 UTC (rev 197653)
@@ -4,11 +4,11 @@
 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,31 +16,29 @@
          '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"
 }
 
@@ -47,13 +45,12 @@
 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 @@
   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"
 }