Update to new version.

Depend on new libgcrypt-devel port.

PR:		62111
Submitted by:	Christian Lackas <delta@lackas.net>

4 files changed, 18 insertions, 13 deletions

diff --git a/security/vpnc/Makefile b/security/vpnc/Makefile
index 80d02e2e3475..6ceec7566ec5 100644
--- a/security/vpnc/Makefile
+++ b/security/vpnc/Makefile
@@ -7,15 +7,15 @@
 
 PORTNAME=	vpnc
 PORTVERSION=	0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	http://www.unix-ag.uni-kl.de/~massar/vpnc/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-rm+zomb-pre6
+DISTNAME=	${PORTNAME}-${PORTVERSION}-rm+zomb-pre7
 
 MAINTAINER=	delta@lackas.net
 COMMENT=	Client for Cisco 3000 VPN Concentrator
 
-LIB_DEPENDS=	gcrypt.6:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS=	gcrypt.10:${PORTSDIR}/security/libgcrypt-devel
 
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
@@ -31,10 +31,14 @@ post-patch:
 			${WRKSRC}/Makefile
 
 do-install:
-	@${INSTALL_PROGRAM} -m 751 ${WRKSRC}/vpnc ${PREFIX}/sbin
+	@${INSTALL_PROGRAM} -m 751 ${WRKSRC}/vpnc ${PREFIX}/sbin/vpnc
 	@${INSTALL_SCRIPT} -m 755 ${FILESDIR}/vpnc.sh ${PREFIX}/etc/rc.d/vpnc.sh.sample
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \
+				${PREFIX}/etc/rc.d/vpnc.sh.sample
 	@${INSTALL_DATA} -m 600 ${WRKSRC}/vpnc.conf ${PREFIX}/etc/vpnc.conf.sample
+.if !defined(NO_INSTALL_MANPAGES)
 	@${INSTALL_MAN} ${FILESDIR}/vpnc.8 ${PREFIX}/man/man8
+.endif
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
@@ -44,7 +48,5 @@ do-install:
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
-	@${REINPLACE_CMD} -e \
-		's|%%PREFIX%%|${PREFIX}|' ${PREFIX}/etc/rc.d/vpnc.sh.sample
 
 .include <bsd.port.mk>
diff --git a/security/vpnc/distinfo b/security/vpnc/distinfo
index ed4f648bffb9..4dc80e681716 100644
--- a/security/vpnc/distinfo
+++ b/security/vpnc/distinfo
@@ -1 +1 @@
-MD5 (vpnc-0.2-rm+zomb-pre6.tar.gz) = e2061c70455f333b2ee9089c6e25adec
+MD5 (vpnc-0.2-rm+zomb-pre7.tar.gz) = 3aae30829aab05dca932c3f77800b155
diff --git a/security/vpnc/files/patch-Makefile b/security/vpnc/files/patch-Makefile
index da145b91f127..fd7743740664 100644
--- a/security/vpnc/files/patch-Makefile
+++ b/security/vpnc/files/patch-Makefile
@@ -14,8 +14,7 @@
  ifeq ($(shell uname -s), Linux)
  SYSDEP=sysdep-linux.o
  endif
--ifeq ($(shell uname -s), NetBSD)
-+ifeq ($(shell uname -s), FreeBSD)
+ ifeq ($(shell uname -s), NetBSD)
  CFLAGS += -DSOCKADDR_IN_SIN_LEN
  SYSDEP=sysdep-bsd.o
  endif
diff --git a/security/vpnc/files/vpnc.8 b/security/vpnc/files/vpnc.8
index 65ad094a1334..a74048390031 100644
--- a/security/vpnc/files/vpnc.8
+++ b/security/vpnc/files/vpnc.8
@@ -30,7 +30,7 @@ network device for the local system. It uses the
 TUN/TAP driver in Linux kernel 2.4 and above and
 device 
 .BR tun (4)
-on BSD.
+on BSD. It runs completely in user space.
 
 The vpnc daemon by it self does not set any routes. The user
 has to do it on its own, e.g. for a full tunnel under FreeBSD
@@ -62,7 +62,10 @@ your user credentials
 .IP "--ifname name"
 name of the tun-interface to use
 .IP "--local-port port number"
-use this port for the connection <0-65535>, use 0 for random
+use this port for the connection <0-65535> to allow multiple instances of vpnc
+running, use 0 a for 
+.I random
+port
 .IP "--pid-file filename"
 store the pid of background process there
 .IP "--dh IKE DH group"
@@ -72,7 +75,8 @@ Perfect Forward Secrecy <nopfs/dh1/dh2/dh5>
 .IP "--non-inter"
 non interactive mode, don't ask any questions
 .IP "--debug nr"
-set debugging level <0/1/2/3/99>
+set debugging level: none(0), basic(1), control flow(2), packet dump(3),
+include username/password(99)
 .IP "--no-detach"
 do not send daemon to background
 .IP "--print-config"
@@ -103,7 +107,7 @@ IPSec secret mopsWLAN
 .P
 Xauth username abcdef
 .P
-Xauth passwort 123456
+Xauth password 123456
 .PD
 .RE