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

[Felix Yan]

    Date: Saturday, March 1, 2014 @ 04:47:48
  Author: fyan
Revision: 106361

upgpkg: boinc 7.2.42-1

Modified:
  boinc/trunk/PKGBUILD

----------+
 PKGBUILD |   36 ++++++++++++++----------------------
 1 file changed, 14 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-02-28 23:48:04 UTC (rev 106360)
+++ PKGBUILD	2014-03-01 03:47:48 UTC (rev 106361)
@@ -5,7 +5,7 @@
 
 pkgbase=boinc
 pkgname=(boinc boinc-nox)
-pkgver=7.2.39
+pkgver=7.2.42
 _tag="client_release/7.2/$pkgver"
 pkgrel=1
 arch=('i686' 'x86_64')
@@ -19,19 +19,19 @@
 	boinc.service
 	boinc-AM_CONDITIONAL.patch)
 
-build() {
-  msg "Starting make..."
-  
-  # Build boinc
-  rm -rf "$srcdir/$pkgbase-build"
-  git clone "$srcdir/$pkgbase-v2" "$srcdir/$pkgbase-build"
-  cd "$srcdir/$pkgbase-build"
-  git checkout "$_tag"
-
+prepare() {
+  cd "$srcdir/$pkgbase-v2"
   patch -Np1 -i "${srcdir}/boinc-AM_CONDITIONAL.patch"
 
   ./_autosetup
 
+  cp -r "$srcdir/$pkgbase-v2" "$srcdir/$pkgbase-v2-nox"
+}
+
+build() {
+  msg "Starting make..."
+  
+  cd "$srcdir/$pkgbase-v2"
   LDFLAGS='-lX11' ./configure \
     --prefix=/usr \
     --disable-server \
@@ -47,15 +47,7 @@
   make
 
   # Build boinc-nox
-  rm -rf "$srcdir/$pkgbase-nox-build"
-  git clone "$srcdir/$pkgbase-v2" "$srcdir/$pkgbase-nox-build"
-  cd "$srcdir/$pkgbase-nox-build"
-  git checkout "$_tag"
-
-  patch -Np1 -i "${srcdir}/boinc-AM_CONDITIONAL.patch"
-
-  ./_autosetup
-
+  cd "$srcdir/$pkgbase-v2-nox"
   PKG_CONFIG="$(which pkg-config)" ./configure \
     --prefix=/usr \
     --disable-server \
@@ -75,7 +67,7 @@
   pkgdesc="Berkeley Open Infrastructure for Network Computing for desktop"
   depends=("libxss" "libnotify" "wxgtk2.8" "curl" "sqlite3")
 
-  cd $pkgbase-build
+  cd $pkgbase-v2
 
   make DESTDIR="$pkgdir" install
 
@@ -89,7 +81,7 @@
   install -Dm644 "${srcdir}/${pkgbase}.desktop" "${pkgdir}/usr/share/applications/${pkgbase}.desktop"
 
   #install icons
-  install -Dm644 "${srcdir}/${pkgbase}-build/clientgui/res/boincmgr.48x48.png" "${pkgdir}/usr/share/pixmaps/$pkgbase.png"
+  install -Dm644 "${srcdir}/${pkgbase}-v2/clientgui/res/boincmgr.48x48.png" "${pkgdir}/usr/share/pixmaps/$pkgbase.png"
 
   #remove initscripts stuff
   rm -rf "$pkgdir/etc"
@@ -101,7 +93,7 @@
   provides=("boinc")
   conflicts=("boinc")
 
-  cd $pkgbase-nox-build
+  cd $pkgbase-v2-nox
 
   make DESTDIR="$pkgdir" install