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)

6 files changed, 16 insertions, 66 deletions

diff --git a/security/openvpn20/Makefile b/security/openvpn20/Makefile
index 152f2075947b..b13eca2c3972 100644
--- a/security/openvpn20/Makefile
+++ b/security/openvpn20/Makefile
@@ -6,14 +6,7 @@
 #
 
 PORTNAME=	openvpn
-# -----------------------------------------------------
-# 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=	9
+PORTVERSION=	2.0.9
 CATEGORIES=	security net
 # MASTER_SITES points to hosts in distinct data centers,
 # so just one MASTER_SITES entry should be OK.
@@ -22,7 +15,8 @@ MASTER_SITES=	http://openvpn.net/release/
 MAINTAINER=	matthias.andree@gmx.de
 COMMENT=	Secure IP/Ethernet tunnel daemon
 
-CONFLICTS=	openvpn-devel-[0-9]*
+LATEST_LINK=	openvpn20
+CONFLICTS=	openvpn-2.[!0]* openvpn-devel-[0-9]*
 
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
@@ -36,7 +30,7 @@ OPTIONS=	PW_SAVE "Interactive passwords may be read from a file" off
 USE_RC_SUBR=	openvpn.sh
 USE_LDCONFIG=	${PREFIX}/lib
 
-SUB_FILES=	pkg-message pkg-req
+SUB_FILES=	pkg-message
 SUB_LIST+=	OSVERSION=${OSVERSION}
 
 .include <bsd.port.pre.mk>
@@ -54,7 +48,7 @@ pre-fetch:
 	@${ECHO} ""
 	@${ECHO} "You may use the following build options:"
 	@${ECHO} ""
-	@${ECHO} "      LOG_OPENVPN={Valid syslog facility}"
+	@${ECHO} "      LOG_OPENVPN={Valid syslog facility, default LOG_DAEMON}"
 	@${ECHO} "      EXAMPLE:  make LOG_OPENVPN=LOG_DAEMON"
 	@${ECHO} ""
 .endif
@@ -81,9 +75,6 @@ post-build:
 	cd ${WRKSRC} && ${MAKE} check
 .endif
 
-pre-install:
-	PKG_PREFIX=${PREFIX} ${SH} ${PKGREQ} ${PKGNAME} INSTALL
-
 post-install:
 	${MKDIR} ${PREFIX}/lib
 	${INSTALL_PROGRAM} ${WRKSRC}/plugin/down-root/openvpn-down-root.so ${PREFIX}/lib
@@ -98,7 +89,7 @@ post-install:
 .endfor
 .for dir in easy-rsa easy-rsa/2.0 sample-config-files
 	${MKDIR} ${DOCSDIR}/${dir}
-	${FIND} ${WRKSRC}/${dir}/ -maxdepth 1 -type f -exec ${INSTALL_DATA} \{\} ${DOCSDIR}/${dir} \;
+	${FIND} ${WRKSRC}/${dir}/ -maxdepth 1 -type f \( -name '.*' -o -name Makefile \) -o -exec ${INSTALL_DATA} \{\} ${DOCSDIR}/${dir} \;
 .endfor
 .for dir in sample-scripts
 	${MKDIR} ${DOCSDIR}/${dir}
diff --git a/security/openvpn20/distinfo b/security/openvpn20/distinfo
index e36e6e490d74..b73badbf2ff8 100644
--- a/security/openvpn20/distinfo
+++ b/security/openvpn20/distinfo
@@ -1,3 +1,3 @@
-MD5 (openvpn-2.0.6.tar.gz) = 8d2f95fa825e58363a676b25d4815aa7
-SHA256 (openvpn-2.0.6.tar.gz) = 1074c9fb5a7881e6d4ff0b125cf1e44a9fb650beef187f061785698522453003
-SIZE (openvpn-2.0.6.tar.gz) = 664816
+MD5 (openvpn-2.0.9.tar.gz) = 60745008b90b7dbe25fe8337c550fec6
+SHA256 (openvpn-2.0.9.tar.gz) = 347c551e7c88affc1f4b7a4b715080253c9298dcc512ed29fe8ca5cd26d015d9
+SIZE (openvpn-2.0.9.tar.gz) = 669076
diff --git a/security/openvpn20/files/pkg-message.in b/security/openvpn20/files/pkg-message.in
index 64494e4d6a85..4aec34fd990b 100644
--- a/security/openvpn20/files/pkg-message.in
+++ b/security/openvpn20/files/pkg-message.in
@@ -1,20 +1,6 @@
 ### ------------------------------------------------------------------------
-###  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 information, see <http://openvpn.net/relnotes.html>
 ### ------------------------------------------------------------------------
diff --git a/security/openvpn20/files/pkg-req.in b/security/openvpn20/files/pkg-req.in
deleted file mode 100644
index 15c8242d8724..000000000000
--- a/security/openvpn20/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
diff --git a/security/openvpn20/pkg-descr b/security/openvpn20/pkg-descr
index b527fa8fa75e..54cd393b84b5 100644
--- a/security/openvpn20/pkg-descr
+++ b/security/openvpn20/pkg-descr
@@ -4,7 +4,7 @@ using an encrypted tunnel over the internet. It can operate over UDP or TCP,
 can use SSL or a pre-shared secret to authenticate peers, and in SSL mode, one
 server can handle many clients.
 
-WWW: http://openvpn.net/
+WWW: http://openvpn.net/index.php/open-source.html
 
 - Matthias Andree
-matthias.andree@gmx.de
+mandree@FreeBSD.org
diff --git a/security/openvpn20/pkg-plist b/security/openvpn20/pkg-plist
index 4df2203dbd05..868afe6a6755 100644
--- a/security/openvpn20/pkg-plist
+++ b/security/openvpn20/pkg-plist
@@ -42,11 +42,13 @@ lib/openvpn-down-root.so
 %%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/clean-all
 %%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/inherit-inter
 %%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/list-crl
+%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/openssl-0.9.6.cnf
 %%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/openssl.cnf
 %%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/pkitool
 %%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/revoke-full
 %%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/sign-req
 %%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/vars
+%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/whichopensslcnf
 %%PORTDOCS%%%%DOCSDIR%%/sample-config-files/README
 %%PORTDOCS%%%%DOCSDIR%%/sample-config-files/client.conf
 %%PORTDOCS%%%%DOCSDIR%%/sample-config-files/firewall.sh