Bunch of fixes to get this working for me, including:

  - support $VARBASE
  - vpnc.conf was installed in the wrong place, rather than move it use
    default.conf instead to mirror what vpnc does natively, and install
    with secure permissions (as it contains passwords)
  - shell portability

Bump PKGREVISION.  Ok'd Jukka/Hubert.

3 files changed, 32 insertions, 8 deletions

diff --git a/net/vpnc/patches/patch-aa b/net/vpnc/patches/patch-aa
index fdd0af523c1..1ecbe53f71b 100644
--- a/net/vpnc/patches/patch-aa
+++ b/net/vpnc/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2008/01/09 11:35:31 hubertf Exp $
+$NetBSD: patch-aa,v 1.6 2008/05/29 20:50:31 sketch Exp $
 
 --- config.c.orig	2007-09-10 22:39:48.000000000 +0200
-+++ config.c	2007-09-14 14:31:56.000000000 +0200
-@@ -267,7 +267,7 @@ static const char *config_def_app_versio
++++ config.c	2008-05-28 16:32:56.000000000 +0100
+@@ -267,12 +267,12 @@ static const char *config_def_app_versio
  
  static const char *config_def_script(void)
  {
@@ -11,6 +11,12 @@ $NetBSD: patch-aa,v 1.5 2008/01/09 11:35:31 hubertf Exp $
  }
  
  static const char *config_def_pid_file(void)
+ {
+-	return "/var/run/vpnc/pid";
++	return "@VARBASE@/run/vpnc/pid";
+ }
+ 
+ static const char *config_def_vendor(void)
 @@ -538,7 +538,7 @@ static char *get_config_filename(const c
  {
  	char *realname;
diff --git a/net/vpnc/patches/patch-ac b/net/vpnc/patches/patch-ac
index 4115093b59f..dbcdac5e458 100644
--- a/net/vpnc/patches/patch-ac
+++ b/net/vpnc/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.5 2008/01/09 11:35:31 hubertf Exp $
+$NetBSD: patch-ac,v 1.6 2008/05/29 20:50:31 sketch Exp $
 
---- vpnc-script.orig	2007-09-06 22:05:15.000000000 +0200
-+++ vpnc-script	2007-09-14 13:30:59.000000000 +0200
-@@ -56,14 +56,15 @@ case "$OS" in
+--- vpnc-script.orig	2007-09-06 21:05:15.000000000 +0100
++++ vpnc-script	2008-05-29 13:32:02.000000000 +0100
+@@ -56,18 +56,19 @@
  		;;
  esac
  
@@ -23,7 +23,12 @@ $NetBSD: patch-ac,v 1.5 2008/01/09 11:35:31 hubertf Exp $
  fi
  
  # stupid SunOS: no blubber in /usr/local/bin ... (on stdout)
-@@ -157,7 +158,7 @@ else # use route command
+-IPROUTE="`which ip | grep '^/' 2> /dev/null`"
++IPROUTE="`command -v ip | grep '^/' 2> /dev/null`"
+ 
+ if [ "$OS" = "Linux" ]; then
+ 	ifconfig_syntax_ptp="pointopoint"
+@@ -157,7 +158,7 @@
  		# isn't -n supposed to give --numeric output?
  		# apperently not...
  		# Get rid of lines containing IPv6 addresses (':')
diff --git a/net/vpnc/patches/patch-af b/net/vpnc/patches/patch-af
new file mode 100644
index 00000000000..04ce13dd085
--- /dev/null
+++ b/net/vpnc/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2008/05/29 20:50:31 sketch Exp $
+
+--- vpnc-disconnect.orig	2005-05-01 21:00:41.000000000 +0100
++++ vpnc-disconnect	2008-05-29 14:02:23.000000000 +0100
+@@ -1,6 +1,6 @@
+-#!/bin/sh
++#!@SH@
+ 
+-pid=/var/run/vpnc/pid
++pid=@VARBASE@/run/vpnc/pid
+ 
+ if [ $# -ne 0 ]; then
+ 	echo "Usage: $0" 1>&2