Update to new snapshot 201139, removing files/patch-t_cltsrv.sh [1].

Remove files/pkg-req.in and references in SUB_FILES and pre-install,
it was a (now obsolete) workaround to warn users that installed newer
6.X packages on older 6.X systems and ended up with the new rc world
order scripts unfound and openvpn not running. [2]

Fix version number in CONFLICTS to encompass openvpn (not just
openvpn20), and demote to CONFLICTS_INSTALL. Neither port installs
headers or libraries that might get in the way.

PR:           ports/161285
Submitted by: Eric F. Crist (maintainer) [1]
Approved by:  Eric F. Crist (maintainer) [2]

4 files changed, 5 insertions, 49 deletions

diff --git a/security/openvpn-devel/Makefile b/security/openvpn-devel/Makefile
index f6247afac079..2220945054bc 100644
--- a/security/openvpn-devel/Makefile
+++ b/security/openvpn-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	openvpn
-DISTVERSION=	201126
+DISTVERSION=	201139
 CATEGORIES=	security net
 MASTER_SITES=	ftp://ftp.secure-computing.net/pub/FreeBSD/ports/openvpn-devel/ \
 		ftp://ftp2.secure-computing.net/pub/FreeBSD/ports/openvpn-devel/
@@ -19,7 +19,7 @@ LICENSE=	GPLv2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}
 
-CONFLICTS=	openvpn-2.0* openvpn-beta-[0-9]*
+CONFLICTS_INSTALL=	openvpn-[0-9]* openvpn-beta-[0-9]*
 
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
@@ -38,7 +38,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}
 
 .if defined(PACKAGE_BUILDING)
@@ -85,9 +85,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/
diff --git a/security/openvpn-devel/distinfo b/security/openvpn-devel/distinfo
index 6fad16e77f76..172635769bff 100644
--- a/security/openvpn-devel/distinfo
+++ b/security/openvpn-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (openvpn-201126.tar.gz) = bbd2fa7156eb8aacb444e2f8a148a63e8ee87ad19bb2e5eb987c336fdabf1dca
-SIZE (openvpn-201126.tar.gz) = 1036643
+SHA256 (openvpn-201139.tar.gz) = 45e285617e01b0add811bd8d218920a12a99d29d0e8fc5baacae848669d3cc8e
+SIZE (openvpn-201139.tar.gz) = 1086646
diff --git a/security/openvpn-devel/files/patch-t_cltsrv.sh b/security/openvpn-devel/files/patch-t_cltsrv.sh
deleted file mode 100644
index c5deea6254de..000000000000
--- a/security/openvpn-devel/files/patch-t_cltsrv.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./t_cltsrv.sh.orig	2011-07-20 22:10:38.000000000 +0200
-+++ ./t_cltsrv.sh	2011-07-20 22:10:52.000000000 +0200
-@@ -33,7 +33,7 @@
- 	    echo "###"
- 	    echo "### To run the test in a FreeBSD jail, you MUST add an IP alias for the jail's IP."
- 	    echo "###"
--	    exit 1
-+	    exit 77
- 	fi
-     fi
-     ;;
diff --git a/security/openvpn-devel/files/pkg-req.in b/security/openvpn-devel/files/pkg-req.in
deleted file mode 100644
index 7ecaaa576ff1..000000000000
--- a/security/openvpn-devel/files/pkg-req.in
+++ /dev/null
@@ -1,30 +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-devel 
-         from there.
-
-EOF
-		exit 1
-	fi
-fi