diff -ruN --exclude=CVS /usr/ports/security/openvpn/Makefile /usr/home/emma/ports/security/openvpn/Makefile
--- /usr/ports/security/openvpn/Makefile	Sun Feb 25 20:42:55 2007
+++ /usr/home/emma/ports/security/openvpn/Makefile	Tue Feb 27 10:30:26 2007
@@ -7,13 +7,13 @@
 
 PORTNAME=	openvpn
 # -----------------------------------------------------
-# DO NOT BOTHER TO SEND NOTICES ABOUT 2.0.9 AS IT FIXES
-# WINDOWS-ONLY BUGS THAT DON'T AFFECT *BSD AND THUS
-# DOES NOT WARRANT A PORT UPGRADE! AND UPGRADE REQUESTS
-# WILL BE DROPPED.
+# DO NOT BOTHER TO SEND NOTICES ABOUT OPENVPN 2.0.9
+# AS IT FIXES WINDOWS-ONLY BUGS THAT DON'T AFFECT *BSD
+# AND THUS DOES NOT WARRANT A PORT UPGRADE!
+# UPGRADE REQUESTS WILL BE DROPPED UNLESS BSD-RELATED.
 # -----------------------------------------------------
 PORTVERSION=	2.0.6
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	security net
 # MASTER_SITES points to hosts in distinct data centers,
 # so just one MASTER_SITES entry should be OK.
diff -ruN --exclude=CVS /usr/ports/security/openvpn/files/openvpn.sh.in /usr/home/emma/ports/security/openvpn/files/openvpn.sh.in
--- /usr/ports/security/openvpn/files/openvpn.sh.in	Sun Feb 25 20:42:55 2007
+++ /usr/home/emma/ports/security/openvpn/files/openvpn.sh.in	Tue Feb 27 10:53:05 2007
@@ -2,10 +2,10 @@
 #
 # openvpn.sh - load tun/tap driver and start OpenVPN daemon
 #
-# (C) Copyright 2005 by Matthias Andree
+# (C) Copyright 2005 - 2007 by Matthias Andree
 # based on suggestions by Matthias Grimm and Dirk Gouders
-#
-# Made in Northrhine-Westphalia, Germany
+# with multi-instance contribution from Denis Shaposhnikov, Gleb Kozyrev
+# and Vasil Dimov
 #
 # $FreeBSD: ports/security/openvpn/files/openvpn.sh.in,v 1.7 2007/02/25 19:42:55 vd Exp $
 # 
@@ -64,17 +64,17 @@
 . %%RC_SUBR%%
 
 case "$0" in
-	/etc/rc*)
+/etc/rc*)
 	# during boot (shutdown) $0 is /etc/rc (/etc/rc.shutdown),
 	# so get the name of the script from $_file
-	name=$(basename "$_file")
+	name=$(basename "$_file" .sh)
 	;;
-	*)
-	name=$(basename "$0")
+*)
+	name=$(basename "$0" .sh)
 	;;
 esac
 
-rcvar=`set_rcvar`
+rcvar=$(set_rcvar)
 
 prefix="%%PREFIX%%"
 
@@ -122,9 +122,9 @@
 eval ": \${${name}_configfile:=\"${prefix}/etc/openvpn/${name}.conf\"}"
 eval ": \${${name}_dir:=\"${prefix}/etc/openvpn\"}"
 
-configfile="`eval echo \\${${name}_configfile}`"
-dir="`eval echo \\${${name}_dir}`"
-interfaces="`eval echo \\${${name}_if}`"
+configfile="$(eval echo \${${name}_configfile})"
+dir="$(eval echo \${${name}_dir})"
+interfaces="$(eval echo \${${name}_if})"
 
 required_files=${configfile}
 command_args="--cd ${dir} --daemon --config ${configfile} --writepid ${pidfile}"