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

[Eric Bélanger]

    Date: Wednesday, September 22, 2010 @ 17:51:17
  Author: eric
Revision: 91127

Removed ccache makedepends, PKGBUILD cleanup

Modified:
  wxgtk/trunk/ChangeLog
  wxgtk/trunk/PKGBUILD

-----------+
 ChangeLog |    5 +++++
 PKGBUILD  |   21 +++++++++------------
 2 files changed, 14 insertions(+), 12 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog   2010-09-22 21:38:28 UTC (rev 91126)
+++ ChangeLog   2010-09-22 21:51:17 UTC (rev 91127)
@@ -1,3 +1,8 @@
+2010-09-22  Eric Belanger  <e...@archlinux.org>
+
+       * Removed ccache makedepends
+       * PKGBUILD cleanup
+
 2010-05-08  Eric Belanger  <e...@archlinux.org>
 
        * wxgtk 2.8.11-1

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2010-09-22 21:38:28 UTC (rev 91126)
+++ PKGBUILD    2010-09-22 21:51:17 UTC (rev 91127)
@@ -1,8 +1,5 @@
 # $Id$
 # Maintainer: Eric Belanger <e...@archlinux.org>
-# Original Contributor: Tom Newsom <jeeps...@gmx.co.uk>
-# New Version - Contributor: Bob Finch <w...@arrl.net>
-# with help from J. Santiago Hirschfeld <jsantia...@yahoo.com.ar> aka Angelus
 
 pkgname=wxgtk
 pkgver=2.8.11
@@ -12,8 +9,8 @@
 url="http://wxwidgets.org";
 license=('custom:wxWindows')
 depends=('gtk2' 'gstreamer0.10-base' 'libgl')
-makedepends=('libgnomeprintui' 'gstreamer0.10-base-plugins' 'gconf' 'ccache' 
'mesa')
-options=('ccache') # required to build libwx_gtk2u_mmedia
+makedepends=('libgnomeprintui' 'gstreamer0.10-base-plugins' 'gconf' 'mesa')
+changelog=ChangeLog
 
#source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2)
 source=(http://downloads.sourceforge.net/wxwindows/wxGTK-${pkgver}.tar.bz2)
 md5sums=('6040933d200037f90f6aa1c5169e7ec6')
@@ -24,17 +21,17 @@
   cd "${srcdir}/wxGTK-${pkgver}"
   ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl 
--enable-unicode \
     --enable-graphics_ctx --with-gnomeprint --disable-optimize 
--enable-mediactrl \
-    --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys 
|| return 1
-  make || return 1
-  make -C locale allmo || return 1
+    --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys
+  make
+  make -C locale allmo
   cd contrib/src
-  make || return 1
+  make
 }
 
 package() {
   cd "${srcdir}/wxGTK-${pkgver}"
-  make DESTDIR="${pkgdir}" install || return 1
+  make DESTDIR="${pkgdir}" install
   cd contrib/src
-  make DESTDIR="${pkgdir}" install || return 1
-  install -D -m644 ../../docs/licence.txt 
"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 ../../docs/licence.txt 
"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }