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

[Dave Reisner]

    Date: Monday, December 26, 2011 @ 02:05:27
  Author: dreisner
Revision: 145644

upgpkg: vpnc 0.5.3.svn481-1

new snapshot for both vpnc and vpnc-script

Modified:
  vpnc/trunk/PKGBUILD

----------+
 PKGBUILD |   23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-12-26 03:52:35 UTC (rev 145643)
+++ PKGBUILD	2011-12-26 07:05:27 UTC (rev 145644)
@@ -4,7 +4,7 @@
 
 pkgname=vpnc
 _vpncver=0.5.3
-pkgver=$_vpncver.svn472
+pkgver=$_vpncver.svn481
 pkgrel=1
 pkgdesc="VPN client for cisco3000 VPN Concentrators"
 url="http://www.unix-ag.uni-kl.de/~massar/vpnc/"
@@ -15,25 +15,30 @@
 source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz"
         'vpnc.conf')
 backup=('etc/vpnc/default.conf')
-md5sums=('51c350341ad4e7f8efbba19810b138a3'
+md5sums=('42edf29f8b9f05cd2e708d5130deb770'
          'a3f4e0cc682f437e310a1c86ae198e45')
 
 mktarball() {
+  [[ -d tarball ]] || mkdir tarball
+
+  pushd tarball
+
   svn co http://svn.unix-ag.uni-kl.de/vpnc/trunk
-  pushd trunk
-  _svnrev=$(svn info | awk '/^Revision:/ { print $2 }')
-  popd
+  _svnrev=$(cd trunk >/dev/null; svn info | awk '/^Revision:/ { print $2 }')
 
   git clone git://git.infradead.org/users/dwmw2/vpnc-scripts.git
   cp vpnc-scripts/vpnc-script trunk/
 
   find trunk/ -type d -name .svn -exec rm -rf {} +
   mv trunk "$pkgname-$_vpncver.svn$_svnrev"
-  tar cJf "$pkgname-$_vpncver.svn$_svnrev"{.tar.xz,}
+  tar cJf "../$pkgname-$_vpncver.svn$_svnrev.tar.xz" "$pkgname-$_vpncver.svn$_svnrev/"
+
+  popd
+  rm -rf tarball
 }
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
   # Build hybrid support
   sed -i 's|^#OPENSSL|OPENSSL|g' Makefile
@@ -41,11 +46,11 @@
   # fix resolvconf location for community/openresolv
   sed -i 's|/sbin/resolvconf|/usr&|g' vpnc-script
 
-  make PREFIX=/usr
+  make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
   make DESTDIR="$pkgdir" PREFIX=/usr install