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.

6 files changed, 49 insertions, 19 deletions

diff --git a/net/vpnc/Makefile b/net/vpnc/Makefile
index f98df147b3f..431d54f81e8 100644
--- a/net/vpnc/Makefile
+++ b/net/vpnc/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2008/01/09 13:13:09 ghen Exp $
+# $NetBSD: Makefile,v 1.22 2008/05/29 20:50:31 sketch Exp $
 #
 
 DISTNAME=		vpnc-0.5.1
+PKGREVISION=		1
 CATEGORIES=		net security
 MASTER_SITES=		http://www.unix-ag.uni-kl.de/~massar/vpnc/
 
@@ -19,31 +20,35 @@ INSTALLATION_DIRS=	bin sbin ${PKGMANDIR}/man1 ${PKGMANDIR}/man8 \
 			share/doc/vpnc share/examples/vpnc
 OWN_DIRS=		${PKG_SYSCONFDIR}/vpnc
 
-SUBST_CLASSES+= 	paths
+SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	fixing pathnames
 SUBST_STAGE.paths=	post-patch
-SUBST_FILES.paths=	config.c vpnc-script makeman.pl pcf2vpnc vpnc.8.template
+SUBST_FILES.paths=	config.c vpnc-script makeman.pl pcf2vpnc vpnc.8.template vpnc-disconnect
 SUBST_SED.paths=	-e 's|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g'
 SUBST_SED.paths+=	-e 's|@PREFIX@|${PREFIX}|g'
 SUBST_SED.paths+=	-e 's|@PKGMANDIR@|${PKGMANDIR}|g'
 SUBST_SED.paths+=	-e 's|@VARBASE@|${VARBASE}|g'
 SUBST_SED.paths+=	-e 's|@PERL5@|${PERL5}|g'
+SUBST_SED.paths+=	-e 's|@SH@|${SH}|g'
+
+BUILD_DEFS+=		VARBASE
 
 EGDIR=			${PREFIX}/share/examples/vpnc
-CONF_FILES+=		${EGDIR}/vpnc.conf ${PKG_SYSCONFDIR}/vpnc/vpnc.conf
+CONF_FILES+=		${EGDIR}/default.conf ${PKG_SYSCONFDIR}/vpnc/default.conf
+CONF_FILES_MODE=	0600
 CONF_FILES_PERMS+=	${EGDIR}/vpnc-script ${PKG_SYSCONFDIR}/vpnc/vpnc-script ${ROOT_USER} ${ROOT_GROUP} 755
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/vpnc ${DESTDIR}${PREFIX}/sbin
 	${INSTALL_PROGRAM} ${WRKSRC}/cisco-decrypt ${DESTDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/vpnc-script ${DESTDIR}${EGDIR}
-	${INSTALL_MAN} ${WRKSRC}/vpnc.conf ${DESTDIR}${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/vpnc.conf ${DESTDIR}${EGDIR}/default.conf
 	${INSTALL_SCRIPT} ${WRKSRC}/vpnc-disconnect ${DESTDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/pcf2vpnc ${DESTDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/vpnc.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
 	${INSTALL_MAN} ${WRKSRC}/pcf2vpnc.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_MAN} ${WRKSRC}/cisco-decrypt.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_MAN} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/vpnc
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/vpnc
 
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/vpnc/PLIST b/net/vpnc/PLIST
index 56cbfadb57d..a41bfee7284 100644
--- a/net/vpnc/PLIST
+++ b/net/vpnc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2008/01/09 11:35:31 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/05/29 20:50:31 sketch Exp $
 bin/cisco-decrypt
 bin/pcf2vpnc
 bin/vpnc-disconnect
@@ -7,7 +7,7 @@ man/man1/pcf2vpnc.1
 man/man8/vpnc.8
 sbin/vpnc
 share/doc/vpnc/README
-share/examples/vpnc/vpnc.conf
+share/examples/vpnc/default.conf
 share/examples/vpnc/vpnc-script
 @dirrm share/examples/vpnc
 @dirrm share/doc/vpnc
diff --git a/net/vpnc/distinfo b/net/vpnc/distinfo
index f41218d3d61..0070ebc6cc2 100644
--- a/net/vpnc/distinfo
+++ b/net/vpnc/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.10 2008/01/09 12:25:40 hubertf Exp $
+$NetBSD: distinfo,v 1.11 2008/05/29 20:50:31 sketch Exp $
 
 SHA1 (vpnc-0.5.1.tar.gz) = efc71dba03aa40945af35e4b074d99f922ff7ffd
 RMD160 (vpnc-0.5.1.tar.gz) = 76dd5a3a38bd2109cf8e1fbad85e2762e8489832
 Size (vpnc-0.5.1.tar.gz) = 91496 bytes
-SHA1 (patch-aa) = 93beb83165aeb0abb9605f0d8ce9d203726d7d04
+SHA1 (patch-aa) = 09d912a32883bec22d80ef7c469b818ac1602d82
 SHA1 (patch-ab) = 14aa011b36fcf1da54d506fd5398cfc55cb11748
-SHA1 (patch-ac) = 7cde3e693a73e5848de596a49d23e4be45a7d8a9
+SHA1 (patch-ac) = 3155cbf04ad7effc9470e4b06409abfe12ee2daa
 SHA1 (patch-ad) = 7e31f1804541eb4de9924edcc517304487aad0f2
 SHA1 (patch-ae) = d831819831a5861550c5924955cc270c58341d9d
+SHA1 (patch-af) = d41aaab81061db058c4b38013f07815e1e8cf506
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