Move security/openvpn to security/openvpn20 (after previous repocopy).

Update security/openvpn20 to 2.0.9, revising pkg-message.

Move security/openvpn-devel to security/openvpn and
update security/openvpn to 2.1.1.

Remove security/openvpn-devel, adding a MOVED entry.

Update security/Makefile to remove openvpn-devel and add openvpn20 to
SUBDIRS.

Add a UPDATING entry for this shuffle.  Currently without upgrade
instructions since neither portupgrade nor portmaster are up to the
task (because of the CONFLICTS).

Approved by:  garga@ (mentor)

3 files changed, 30 insertions, 46 deletions

diff --git a/security/openvpn/files/patch-selftest-ports b/security/openvpn/files/patch-selftest-ports
new file mode 100644
index 000000000000..5e195261eecb
--- /dev/null
+++ b/security/openvpn/files/patch-selftest-ports
@@ -0,0 +1,26 @@
+--- sample-config-files/loopback-client.orig	Mon Oct 16 00:30:20 2006
++++ sample-config-files/loopback-client	Wed Apr  4 00:51:31 2007
+@@ -9,8 +9,8 @@
+ #  ./openvpn --config sample-config-files/loopback-client  (In one window) 
+ #  ./openvpn --config sample-config-files/loopback-server  (Simultaneously in another window) 
+ 
+-rport 16000
+-lport 16001
++rport 16100
++lport 16101
+ remote localhost
+ local localhost
+ dev null
+--- sample-config-files/loopback-server.orig	Mon Oct 16 00:30:20 2006
++++ sample-config-files/loopback-server	Wed Apr  4 00:51:31 2007
+@@ -9,8 +9,8 @@
+ #  ./openvpn --config sample-config-files/loopback-client  (In one window) 
+ #  ./openvpn --config sample-config-files/loopback-server  (Simultaneously in another window) 
+ 
+-rport 16001
+-lport 16000
++rport 16101
++lport 16100
+ remote localhost
+ local localhost
+ dev null
diff --git a/security/openvpn/files/pkg-message.in b/security/openvpn/files/pkg-message.in
index 64494e4d6a85..f79da215e039 100644
--- a/security/openvpn/files/pkg-message.in
+++ b/security/openvpn/files/pkg-message.in
@@ -1,20 +1,7 @@
 ### ------------------------------------------------------------------------
-###  The OpenVPN FreeBSD port, since v2.0.1, uses rcNG to start OpenVPN.
-###  Edit /etc/rc.conf to start OpenVPN automatically at system startup.
-###  See %%PREFIX%%/etc/rc.d/openvpn%%RCSFX%% for details.
+###  Edit /etc/rc.conf[.local] to start OpenVPN automatically at system
+###  startup. See %%PREFIX%%/etc/rc.d/openvpn%%RCSFX%% for details.
 ### ------------------------------------------------------------------------
-###  To get OpenVPN 1.X to talk with the new 2.0 version, you may need to
-###  edit the 1.X configuration file by adding these lines:
-###    tun-mtu 1500
-###    tun-mtu-extra 32
-###    mssfix 1450
-###    key-method 2       <- this key-method line only for TLS setups
-### - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-###  WARNING: THE DEFAULT PORT HAS CHANGED AND IS NOW 1194!
-###  OpenVPN 1.6 and older used 5000 rather than 1194 as their default
-###  port, so add the proper port options to your configuration file!
-### - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-###  For further compatibility, see <http://openvpn.net/relnotes.html>
-### ------------------------------------------------------------------------
-###  If you want to donate to OpenVPN: <http://openvpn.net/donate.html>
+###  For compatibility notes when interoperating with older OpenVPN
+###  versions, please, see <http://openvpn.net/relnotes.html>
 ### ------------------------------------------------------------------------
diff --git a/security/openvpn/files/pkg-req.in b/security/openvpn/files/pkg-req.in
deleted file mode 100644
index 15c8242d8724..000000000000
--- a/security/openvpn/files/pkg-req.in
+++ /dev/null
@@ -1,29 +0,0 @@
-set -e
-
-rcvers() {
-	# determine if we have "old" or "new" (rcorder integration) scheme
-	# for %%PREFIX%%/etc/rc.d/* files
-	if test $1 -ge 700007 || test $1 -lt 700000 -a $1 -ge 600101 ; then
-		echo 2
-	else
-		echo 1
-	fi
-}
-
-if [ "$2" = INSTALL ] ; then
-	# check if the base system is new enough for us,
-	# which should only matter for package installs.
-	buildrc=$(rcvers %%OSVERSION%%)
-	execrc=$(rcvers $(sysctl -n kern.osreldate) )
-	if test $buildrc -gt $execrc ; then
-		cat <<EOF
-
-Error:   this package, $1, was compiled for a newer FreeBSD
-======   version that uses different boot scripts.
-         Therefore, the rc.d script WILL NOT WORK.
-         Please update your ports tree and install security/openvpn from there.
-
-EOF
-		exit 1
-	fi
-fi