From df6ea19c9f50cc27477d5a81aa3944659b6a0c57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rcio=20Alexandre=20Silva=20Delgado?=
 <coadde@lavabit.com>
Date: Sat, 10 Aug 2013 00:28:30 -0300
Subject: librevpn: fixing bugs

---
 pcr/librevpn/PKGBUILD | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

(limited to 'pcr/librevpn/PKGBUILD')

diff --git a/pcr/librevpn/PKGBUILD b/pcr/librevpn/PKGBUILD
index ec05fc552..299fc85e5 100644
--- a/pcr/librevpn/PKGBUILD
+++ b/pcr/librevpn/PKGBUILD
@@ -21,7 +21,7 @@ _srcname=lvpn
 _pkgname=librevpn
 pkgname=$_pkgname-git
 pkgver=$_srcver
-pkgrel=1
+pkgrel=2
 pkgdesc='Free Virtual Network with tinc2dot and generate-ipv6-address'
 url=http://$_pkgname.org.ar/
 license=('AGPL3:(lvpn, tinc2dot)' 'MIT:(generate-ipv6-address)')
@@ -38,7 +38,6 @@ optdepends=(
 )
 provides=($_pkgname)
 conflicts=$_pkgname
-options=(!emptydirs)
 source=$_srcname-$_commit.tar.xz::http://repo.hackcoop.com.ar/$_pkgname.git/snapshot/$_commit.tar.xz
 sha512sums=$_sha512sums
 
@@ -47,6 +46,10 @@ build() {
 
   if [[ $_branch == feature/empaquetable ]]; then
     sed -i '\|generate-ipv6-address|d;\|natpmp|d;\|upnpc|d' Makefile
+    sed -i '\|LVPN_DIR=| s|${PWD}|/usr/share/lvpn|' $_srcname.in
+    sed -i 's|${LVPN_DIR}/bin|/usr/bin|;
+            s|$(uname -m)-||;
+           ' lib/common
     make PREFIX=/usr
   fi
 
@@ -67,6 +70,9 @@ package() {
     install -vm755 bin/tinc2dot            $pkgdir/usr/share/$_srcname # tinc2dot 0.2.1 script
     install -vm755 bin/cronjob             $pkgdir/usr/share/$_srcname/fauno-cronjob # fauno script
 
+    msg 'Removing dirs'
+    rmdir -v $pkgdir/usr/share/locale/pacman-scripts
+
     msg 'Fixing beagle patch'
     rmdir -v $pkgdir/usr/share/$_srcname/beadle
     ln -vs hosts $pkgdir/usr/share/$_srcname/beadle
@@ -87,10 +93,14 @@ package() {
     cd $srcdir/$_commit
 
     msg 'Fixing patchs with sed'
-    sed -i '\|${_srcname^^}_BIN=|    s|${${_srcname^^}_DIR}|/usr|;
-            \|${_srcname^^}_LIBDIR=| s|${${_srcname^^}_DIR}/lib|/usr/lib/$_srcname|;
-            \|${_srcname^^}_HOSTS=|  s|${${_srcname^^}_DIR}|/usr/share/$_srcname|;
+    sed -i '\|LVPN=|        s|$(readlink -f $0)|lvpn|;
+            \|LVPN_DIR=|    s|$(dirname "$LVPN")|/usr/share/lvpn|;
+            \|LVPN_BIN=|    s|${LVPN_DIR}|/usr|;
+            \|LVPN_LIBDIR=| s|${LVPN_DIR}/lib|/usr/lib/lvpn|;
            ' $_srcname
+    sed -i 's|${LVPN_DIR}/bin|/usr/bin|;
+            s|$(uname -m)-||;
+           ' lib/{common,lvpn-init}
 
     msg 'Copying doc, hosts and lib dirs'
     install -vd $pkgdir/usr/{lib,share/$_srcname}
@@ -121,6 +131,12 @@ package() {
     done
   fi
 
+  #msg 'linking bin dir'
+  #ln -vs /usr/bin $pkgdir/usr/share/$_srcname/bin
+
+  msg 'Creating dirs'
+  install -d $pkgdir/usr/share/$_srcname/nodos
+
   msg 'Installing license files'
   install -vDm644 LICENSE $pkgdir/usr/share/licenses/$_srcname/COPYING
 
-- 
cgit v1.2.3-2-g168b