Foolproof way to pkgver()

2 files changed, 6 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a6098febbf6f..09c07367ccd8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = fpc-svn
-	pkgver = 3.1.1.r35178
+	pkgver = 3.1.1.r35219
 	pkgrel = 1
 	url = http://www.freepascal.org/
 	arch = i686
@@ -35,4 +35,5 @@ pkgname = fpc-src-svn
 
 pkgname = fpc-docs-svn
 	pkgdesc = Documentation for the Free Pascal compiler
+	options = !strip
 
diff --git a/PKGBUILD b/PKGBUILD
index 6e38eb5ffd7f..80804e13f2f2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,8 +13,8 @@ _build_docs=true
 pkgbase=fpc-svn
 pkgname=(fpc-svn fpc-src-svn)
 [[ $_build_docs ]] && pkgname+=(fpc-docs-svn)
-pkgver=3.1.1.r35178
-_pkgver=${pkgver/${pkgver:5}}
+pkgver=3.1.1.r35219
+_pkgver=${pkgver%.r*}
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.freepascal.org/"
@@ -28,9 +28,9 @@ source=(fpcbuild::svn+http://svn.freepascal.org/svn/fpcbuild/trunk)
 sha1sums=('SKIP')
 
 pkgver() {
-  cd "$srcdir/fpcbuild/fpcsrc"
+  cd "${srcdir}"/fpcbuild/fpcsrc
   printf "%s.r%s" \
-    $(grep -m1 version Makefile.fpc |sed 's/version=//') \
+    $(grep -m 1 'version' 'Makefile.fpc' | cut -d '=' -f 2) \
     $(svnversion | tr -d [A-z])
 }