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

[Eric Bélanger]

    Date: Wednesday, July 1, 2009 @ 18:06:07
  Author: eric
Revision: 44390

upgpkg: wxgtk-2.6 2.6.4-3
    libjpeg rebuild

Modified:
  wxgtk-2.6/trunk/PKGBUILD

----------+
 PKGBUILD |   25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-07-01 22:03:16 UTC (rev 44389)
+++ PKGBUILD	2009-07-01 22:06:07 UTC (rev 44390)
@@ -2,7 +2,7 @@
 # Maintainer: Alexander Baldeck <alexander at archlinux.org>
 pkgname=wxgtk-2.6
 pkgver=2.6.4
-pkgrel=2
+pkgrel=3
 pkgdesc="wxGTK - GTK+ implementation of wxWidgets API for GUI"
 arch=(i686 x86_64)
 license=('LGPL')
@@ -16,8 +16,8 @@
 md5sums=('ce0fd2b425bc98957cf70eea5f154b49' 'cffc3739d315e7d78299bd75f25ff5c4')
 
 build() {
-  cd ${startdir}/src/wxGTK-${pkgver}
-  patch -Np0 -i ${startdir}/src/wxgtk-borderfree.patch || return 1
+  cd "${srcdir}/wxGTK-${pkgver}"
+  patch -Np0 -i "${srcdir}/wxgtk-borderfree.patch" || return 1
   ./configure --prefix=/usr \
               --with-gtk=2 \
               --with-opengl \
@@ -26,21 +26,20 @@
               --enable-optimize || return 1
   make || return 1
   make -C locale allmo
-  make DESTDIR=${startdir}/pkg install || return 1
+  make DESTDIR="${pkgdir}" install || return 1
   cd contrib/src
   make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
-  rm -f ${startdir}/pkg/usr/bin/wx-config
-  rm -f ${startdir}/pkg/usr/bin/wxrc
-  ln -sf /usr/lib/wx/config/gtk2-unicode-release-2.6 ${startdir}/pkg/usr/bin/wx-config-2.6
+  make DESTDIR="${pkgdir}" install || return 1
+  rm -f "${pkgdir}/usr/bin/wx-config"
+  rm -f "${pkgdir}/usr/bin/wxrc"
+  ln -sf /usr/lib/wx/config/gtk2-unicode-release-2.6 "${pkgdir}/usr/bin/wx-config-2.6"
 
-  rm -rf ${startdir}/pkg/usr/share/bakefile
-  find ${startdir}/pkg/usr/share/locale -name wxmsw.mo | xargs rm -f
+  rm -rf "${pkgdir}/usr/share/bakefile"
+  find "${pkgdir}/usr/share/locale" -name wxmsw.mo | xargs rm -f
 
-  for i in ${startdir}/pkg/usr/share/locale/*/LC_MESSAGES/wxstd.mo; do
+  for i in "${pkgdir}"/usr/share/locale/*/LC_MESSAGES/wxstd.mo; do
     NEWNAME=${i/wxstd.mo/compat-wxstd26.mo}
     mv $i $NEWNAME;
   done
-  mv ${startdir}/pkg/usr/share/aclocal/wxwin.m4 \
-   ${startdir}/pkg/usr/share/aclocal/wxwin-2.6.m4
+  mv "${pkgdir}/usr/share/aclocal/wxwin.m4" "${pkgdir}/usr/share/aclocal/wxwin-2.6.m4"
 }