Cleaned up PKGBUILD and updated CMake toolchain file

1 files changed, 23 insertions, 14 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 7442af311247..d0c2f7dabe69 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,45 @@
 # Maintainer:  Tyler Veness <calcmogul at gmail dot com>
 # Contributor: Alex Brinister <alex_brinister@yahoo.com>
-_main_name=frcmake
-pkgname=$_main_name-git
+
+pkgname=frcmake-git
 pkgver=46.c66f929
-pkgrel=3
+pkgrel=4
 pkgdesc="Some CMake stuff for use with the VxWorks 6.3 GCC Toolchain"
 arch=(any)
 provides=('frcmake')
+conflicts=('frcmake')
 url="http://firstforge.wpi.edu/sf/projects/c--11_toochain"
 license=('GPL')
 depends=('wput' 'cmake')
 options=('!strip' 'libtool' '!zipman')
-conflicts=('vxworks-gcc-toolchain-bin' 'frcmake')
-source=("git+http://bitbucket.org/frc-cpp11/$_main_name")
-sha512sums=('SKIP')
+source=("git+http://bitbucket.org/frc-cpp11/frcmake"
+        "toolchain-cmake.patch")
+sha512sums=('SKIP'
+            'b8c1ed21eab5af8b04f17ae8699e6c5ccdb99eff943e42e2ff2a5f3baf4b157e2426e3677f5086ff1694b713fdb945fc3e21b88cb5e5b2ed65274726433f3972')
 
 pkgver() {
-  cd $_main_name
+  cd "${srcdir}/frcmake"
+
   echo $(git rev-list --count master).$(git rev-parse --short master)
 }
 
+prepare() {
+  cd "${srcdir}/frcmake"
+
+  git apply ../toolchain-cmake.patch
+}
+
 build() {
-  cd "$srcdir/$_main_name"
-  mkdir build && cd build
+  cd "${srcdir}/frcmake"
+
+  mkdir -p build && cd build
   cmake ..
-  make ${MAKEFLAGS} || return 1
+  make
 }
 
 package() {
-  cd "$srcdir/$_main_name/build"
-  make ${MAKEFLAGS} DESTDIR=$pkgdir install || return 1
+  cd "${srcdir}/frcmake/build"
+
+  make DESTDIR=${pkgdir} install
   mv $pkgdir/usr/bin/frcmake $pkgdir/usr/bin/frcmake-wrs
 }
-
-# vim:set ts=2 sw=2 et: