javapsionlink-cvs 2.0_beta1-3: cleanup

Update to the VCS packaging guidelines, according to PKGBUILD-cvs.proto, but
$pkgver left as is.

** Manually imported from AUR 3 **

1 files changed, 38 insertions, 15 deletions

diff --git a/PKGBUILD b/PKGBUILD
index b359790b53c0..92204f8446a6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
 # Maintainer: Markus Heidelberg <markus dot heidelberg at web dot de>
+
 pkgname=javapsionlink-cvs
 pkgver=2.0_beta1
-pkgrel=2
+pkgrel=3
 pkgdesc="Data transfer between Psion EPOC PDA and PC via RS-232; PsiWin clone"
 arch=('any')
 url="http://littlespikeyland.com/psionlink/"
@@ -18,19 +19,41 @@ md5sums=('29ac8e314bc13e912f74ebeee340ac88'
          '20581709a51cbad21029bc8b829ae1df'
          '8d8ec03c8acf71f12b70794187286c94')
 
+_cvsroot=":pserver:anonymous:@javapsionlink.cvs.sourceforge.net:/cvsroot/javapsionlink"
+_cvsmod="javapsionlink"
+
 build() {
-	if [ -d $srcdir/javapsionlink/CVS ]; then
-		cd $srcdir/javapsionlink
-		cvs -q update
-	else
-		cvs -z3 -d:pserver:anonymous:@javapsionlink.cvs.sourceforge.net:/cvsroot/javapsionlink checkout -P javapsionlink
-		cd $srcdir/javapsionlink
-		patch -p1 < $srcdir/replace-javax.comm.patch
-		patch -p1 < $srcdir/remove-beanshell-classpath.patch
-	fi
-	ant -lib /usr/share/java/rxtx/ jar || return 1
-	install -D -m644 dist/jpl2.jar $pkgdir/usr/share/java/javapsionlink/jpl2.jar
-	install -D -m644 icon.gif $pkgdir/usr/share/pixmaps/javapsionlink.gif
-	install -D -m644 $srcdir/javapsionlink.desktop $pkgdir/usr/share/applications/javapsionlink.desktop
-	install -D -m755 $srcdir/javapsionlink.sh $pkgdir/usr/bin/jpl2
+  cd "$srcdir"
+  msg "Connecting to CVS server...."
+
+  if [[ -d "$_cvsmod/CVS" ]]; then
+    cd "$_cvsmod"
+    cvs -z3 update -d
+  else
+    cvs -z3 -d "$_cvsroot" co -P -f "$_cvsmod"
+    cd "$_cvsmod"
+  fi
+
+  msg "CVS checkout done or server timeout"
+  msg "Starting build..."
+
+  rm -rf "$srcdir/$_cvsmod-build"
+  cp -r "$srcdir/$_cvsmod" "$srcdir/$_cvsmod-build"
+  cd "$srcdir/$_cvsmod-build"
+
+  patch -p1 < "$srcdir/replace-javax.comm.patch"
+  patch -p1 < "$srcdir/remove-beanshell-classpath.patch"
+
+  #
+  # BUILD HERE
+  #
+  ant -lib /usr/share/java/rxtx/ jar
+}
+
+package() {
+  cd "$srcdir/$_cvsmod-build"
+  install -D -m644 dist/jpl2.jar "$pkgdir/usr/share/java/javapsionlink/jpl2.jar"
+  install -D -m644 icon.gif "$pkgdir/usr/share/pixmaps/javapsionlink.gif"
+  install -D -m644 "$srcdir/javapsionlink.desktop" "$pkgdir/usr/share/applications/javapsionlink.desktop"
+  install -D -m755 "$srcdir/javapsionlink.sh" "$pkgdir/usr/bin/jpl2"
 }