4 files changed, 32 insertions, 9 deletions
diff --git a/frc-libre/smartdashboard-client/PKGBUILD b/frc-libre/smartdashboard-client/PKGBUILD
index 5f7d699..6cbe339 100644
--- a/frc-libre/smartdashboard-client/PKGBUILD
+++ b/frc-libre/smartdashboard-client/PKGBUILD
@@ -15,14 +15,26 @@ source=(
 )
 
 build() {
-  cd "$srcdir"
-  cp -r "smartdashboard$pkgver" "smartdashboard$pkgver-build"
-  cd "smartdashboard$pkgver-build"
-
+  cd "$srcdir/smartdashboard$pkgver"
   ln -s /usr/share/java/wpilibj/NetworkTable_Client.jar lib
   ln -s /usr/share/java/jcommon.jar lib
   ln -s /usr/share/java/jfreechart.jar lib
   ln -s /usr/share/java/junit.jar lib
+  touch lib/nblibraries.properties
+  # Use the global install of NetworkTable_Client
+  _networktable=/usr/share/java/wpilibj/NetworkTable_Client
+  sed -i "s@^\(project\.NetworkTable_Client=\).*@\1$_networktable@" \
+    nbproject/project.properties
+  # Make depends .jar files version-agnostic
+  sed -i 's@lib/\([a-z]*\)-[0-9.]*\.jar@lib/\1.jar@' \
+    nbproject/project.properties nbbuild.xml
+  mkdir dist
+  ln -s ../lib dist/lib
+  cd ..
+
+  cp -a "smartdashboard$pkgver" "smartdashboard$pkgver-build"
+  cd "smartdashboard$pkgver-build"
+
   ant jar
 }
 
@@ -46,5 +58,5 @@ package() {
   ln -s /usr/share/java/junit.jar .
 }
 
-md5sums=('8f69a9db66c5d73042e3dedf54228c5d'
+md5sums=('7e1bf5e8d10b68d435e26dc40f3df283'
          'a278b2e86bd4d732e86ac9e084f5ec4d')
diff --git a/frc-libre/smartdashboard-client/SRCBUILD b/frc-libre/smartdashboard-client/SRCBUILD
index 09e6dc0..a36075b 100644
--- a/frc-libre/smartdashboard-client/SRCBUILD
+++ b/frc-libre/smartdashboard-client/SRCBUILD
@@ -19,7 +19,8 @@ build() {
   msg "Removing sample save files..."
   rm -v customSave *.log lol.xml lol2.xml
   msg "Removing precompiled binaries..."
-  rm -rfv lib/*
+  rm -rfv lib/*/
+  rm -v lib/*.jar
 }
 
 package() {
diff --git a/frc-libre/wpijavacv/PKGBUILD b/frc-libre/wpijavacv/PKGBUILD
index c42691f..c743f55 100644
--- a/frc-libre/wpijavacv/PKGBUILD
+++ b/frc-libre/wpijavacv/PKGBUILD
@@ -17,13 +17,19 @@ build() {
   ln -s /usr/share/java/javacpp.jar lib
   ln -s /usr/share/java/javacv.jar lib
   ln -s /usr/share/java/javacv-platform.jar lib
+
+  cd ..
+  cp -a "$srcdir/$pkgname" "$srcdir/$pkgname-build"
+  cd "$srcdir/$pkgname-build"
+
   ant jar
   ant javadoc
 }
 
 package() {
-  cd "$srcdir/$pkgname/dist"
+  cd "$srcdir/$pkgname-build/dist"
   install -m644 -D WPIJavaCV.jar "$pkgdir/usr/share/java/WPIJavaCV.jar"
+  cp -a "$srcdir/$pkgname" "$pkgdir/usr/share/java/WPIJavaCV"
   install -d "$pkgdir/usr/share/doc/wpijavacv"
   cp -r javadoc "$pkgdir/usr/share/doc/wpijavacv"
 }
diff --git a/frc-libre/wpilibj-networktable-client/PKGBUILD b/frc-libre/wpilibj-networktable-client/PKGBUILD
index f42459f..f8702a7 100644
--- a/frc-libre/wpilibj-networktable-client/PKGBUILD
+++ b/frc-libre/wpilibj-networktable-client/PKGBUILD
@@ -13,15 +13,19 @@ makedepends=(apache-ant)
 source=("https://gitorious.org/absfrc/sources/blobs/raw/master/$pkgname-$pkgver-$pkgrel-any.src.tar.xz")
 
 build() {
-  cd "$srcdir/$pkgname"
+  cd "$srcdir"
+  cp -a "$pkgname" "$pkgname-build"
+  cd "$pkgname-build"
   ant jar
   ant javadoc
 }
 
 package() {
-  cd "$srcdir/$pkgname/dist"
+  cd "$srcdir/$pkgname-build/dist"
   install -d "$pkgdir/usr/share/java/wpilibj"
   install -m644 -D NetworkTable_Client.jar "$pkgdir/usr/share/java/wpilibj"
+  cp -a "$srcdir/$pkgname" "$pkgdir/usr/share/java/wpilibj/NetworkTable_Client"
+
   install -d "$pkgdir/usr/share/doc/wpilibj"
   cp -r javadoc "$pkgdir/usr/share/doc/wpilibj/networktable-client"
 }