- upgrade turnserver from 3.2.1.4 to 3.2.2.5

- fix staging

PR:		ports/186384
Submitted by:	Oleg Moskalenko <mom040267@gmail.com> (maintainer)
Approved by:	bapt (mentor)

3 files changed, 54 insertions, 49 deletions

diff --git a/net/turnserver/Makefile b/net/turnserver/Makefile
index d4db64937051..95cab0b01a86 100644
--- a/net/turnserver/Makefile
+++ b/net/turnserver/Makefile
@@ -1,26 +1,26 @@
 # $FreeBSD$
 
 PORTNAME=	turnserver
-PORTVERSION=	3.2.1.4
+PORTVERSION=	3.2.2.5
 CATEGORIES=	net
-MASTER_SITES=	http://rfc5766-turn-server.googlecode.com/files/
+MASTER_SITES=	http://turnserver.open-sys.org/downloads/v${PORTVERSION}/ \
+		http://turnserver.open-sys.org/downloads/extradocs/ \
+		http://www.olegmoskalenko.com/turnserver/v${PORTVERSION}/ \
+		http://www.olegmoskalenko.com/turnserver/extradocs/
 PKGNAMEPREFIX=
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} turn.extra.docs-2.0.0.1.tar.gz
 
 MAINTAINER=	mom040267@gmail.com
 COMMENT=	STUN/TURN Server; IPv6, DTLS support; RFCs 5389, 5766, 6062, 6156
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	event-2:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent-2.0.so:${PORTSDIR}/devel/libevent2
 
 CONFLICTS=	libevent-1.*
 
 SUB_FILES=	pkg-message
 
-MAN1=	turnserver.1 turnadmin.1 turnutils.1 turnutils_peer.1 turnutils_stunclient.1 turnutils_uclient.1 rfc5766-turn-server.1
-MANCOMPRESSED=	no
-
 USE_OPENSSL=	YES
 
 USE_RC_SUBR=	turnserver
@@ -29,17 +29,19 @@ HAS_CONFIGURE=	YES
 
 OPTIONS_DEFINE=	MYSQL PGSQL REDIS
 
+SHEBANG_FILES=	examples/scripts/restapi/shared_secret_maintainer.pl
+USES=		perl5 shebangfix
+
 MYSQL_DESC=	MySQL support for users database
 PGSQL_DESC=	PostgreSQL support for users database
 REDIS_DESC=	Redis support for user database and for status and statistics reporting
 
 OPTIONS_DEFAULT=	MYSQL PGSQL REDIS
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 PORTDOCS=	html TURNServerRESTAPI.pdf TurnNetworks.pdf
-PORTREADMEDOCS=	README.turnserver README.turnadmin README.turnutils INSTALL
+PORTREADMEDOCS=	LICENSE README.turnserver README.turnadmin README.turnutils INSTALL
 
 _BIN_UTILS=	peer stunclient uclient
 
@@ -52,7 +54,8 @@ basic/udp_client.sh basic/tcp_client.sh \
 loadbalance/master_relay.sh loadbalance/slave_relay_1.sh loadbalance/slave_relay_2.sh \
 loadbalance/udp_c2c.sh loadbalance/tcp_c2c_tcp_relay.sh \
 longtermsecure/secure_dtls_client.sh longtermsecure/secure_relay.sh \
-longtermsecure/secure_dtls_client_cert.sh longtermsecure/secure_relay_cert.sh \
+longtermsecure/secure_tls_client_cert.sh longtermsecure/secure_dtls_client_cert.sh \
+longtermsecure/secure_relay_cert.sh \
 longtermsecure/secure_tcp_client_c2c_tcp_relay.sh longtermsecure/secure_tcp_client.sh \
 longtermsecure/secure_tls_client_c2c_tcp_relay.sh longtermsecure/secure_tls_client.sh \
 longtermsecure/secure_udp_c2c.sh longtermsecure/secure_udp_client.sh \
@@ -74,74 +77,74 @@ CONFIGURE_ENV+=	PTHREAD_LIBS=-pthread TURN_DISABLE_RPATH=1
 
 .if ${PORT_OPTIONS:MPGSQL}
 USE_PGSQL=	yes
-LIB_DEPENDS+=	pq:${PORTSDIR}/databases/postgresql90-client
+LIB_DEPENDS+=	libpq.so:${PORTSDIR}/databases/postgresql90-client
 .else
 CONFIGURE_ENV+=	TURN_NO_PQ=1
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	yes
-LIB_DEPENDS+=	mysqlclient:${PORTSDIR}/databases/mysql55-client
+LIB_DEPENDS+=	libmysqlclient.so:${PORTSDIR}/databases/mysql55-client
 .else
 CONFIGURE_ENV+=	TURN_NO_MYSQL=1
 .endif
 
 .if ${PORT_OPTIONS:MREDIS}
-LIB_DEPENDS+=	hiredis:${PORTSDIR}/databases/hiredis
+LIB_DEPENDS+=	libhiredis.so:${PORTSDIR}/databases/hiredis
 .else
 CONFIGURE_ENV+=	TURN_NO_HIREDIS=1
 .endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/turnserver ${PREFIX}/bin/turnserver
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/turnadmin ${PREFIX}/bin/turnadmin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/turnserver ${STAGEDIR}${PREFIX}/bin/turnserver
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/turnadmin ${STAGEDIR}${PREFIX}/bin/turnadmin
 .for f in ${_BIN_UTILS}
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/turnutils_${f} ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/turnutils_${f} ${STAGEDIR}${PREFIX}/bin/
 .endfor
 .for f in ${MAN1}
-	${INSTALL_MAN} ${WRKSRC}/man/man1/${f} ${PREFIX}/man/man1/${f}
+	${INSTALL_MAN} ${WRKSRC}/man/man1/${f} ${STAGEDIR}${PREFIX}/man/man1/${f}
 .endfor
-	${MKDIR} ${DATADIR}/
-	${INSTALL_DATA} ${WRKSRC}/turndb/schema.sql ${DATADIR}/schema.sql
-	${INSTALL_DATA} ${WRKSRC}/turndb/schema.userdb.redis ${DATADIR}/schema.userdb.redis
-	${INSTALL_DATA} ${WRKSRC}/turndb/schema.stats.redis ${DATADIR}/schema.stats.redis
-	${INSTALL_SCRIPT} ${WRKSRC}/turndb/testredisdbsetup.sh ${DATADIR}/testredisdbsetup.sh
-	${INSTALL_DATA} ${WRKSRC}/lib/libturnclient.a ${PREFIX}/lib/libturnclient.a
-	${INSTALL_DATA} ${WRKSRC}/examples/etc/turnserver.conf ${PREFIX}/etc/turnserver.conf.default
-	${INSTALL_DATA} ${WRKSRC}/examples/etc/turnuserdb.conf ${PREFIX}/etc/turnuserdb.conf.default
-	${MKDIR} ${PREFIX}/include/turn
-	(cd ${WRKSRC}/include/turn/ && ${COPYTREE_SHARE} client ${PREFIX}/include/turn/)
-	(cd ${WRKSRC}/include/turn/ && ${COPYTREE_SHARE} ns_turn_defs.h ${PREFIX}/include/turn/)
+	${MKDIR} ${STAGEDIR}${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/turndb/schema.sql ${STAGEDIR}${DATADIR}/schema.sql
+	${INSTALL_DATA} ${WRKSRC}/turndb/schema.userdb.redis ${STAGEDIR}${DATADIR}/schema.userdb.redis
+	${INSTALL_DATA} ${WRKSRC}/turndb/schema.stats.redis ${STAGEDIR}${DATADIR}/schema.stats.redis
+	${INSTALL_SCRIPT} ${WRKSRC}/turndb/testredisdbsetup.sh ${STAGEDIR}${DATADIR}/testredisdbsetup.sh
+	${INSTALL_DATA} ${WRKSRC}/lib/libturnclient.a ${STAGEDIR}${PREFIX}/lib/libturnclient.a
+	${INSTALL_DATA} ${WRKSRC}/examples/etc/turnserver.conf ${STAGEDIR}${PREFIX}/etc/turnserver.conf.default
+	${INSTALL_DATA} ${WRKSRC}/examples/etc/turnuserdb.conf ${STAGEDIR}${PREFIX}/etc/turnuserdb.conf.default
+	${MKDIR} ${STAGEDIR}${PREFIX}/include/turn
+	(cd ${WRKSRC}/include/turn/ && ${COPYTREE_SHARE} client ${STAGEDIR}${PREFIX}/include/turn/)
+	(cd ${WRKSRC}/include/turn/ && ${COPYTREE_SHARE} ns_turn_defs.h ${STAGEDIR}${PREFIX}/include/turn/)
 .if ${PORT_OPTIONS:MEXAMPLES}
-	${MKDIR} ${EXAMPLESDIR}/scripts
-	${MKDIR} ${EXAMPLESDIR}/scripts/basic
-	${MKDIR} ${EXAMPLESDIR}/scripts/loadbalance
-	${MKDIR} ${EXAMPLESDIR}/scripts/longtermsecure
-	${MKDIR} ${EXAMPLESDIR}/scripts/longtermsecuredb
-	${MKDIR} ${EXAMPLESDIR}/scripts/restapi
-	${MKDIR} ${EXAMPLESDIR}/scripts/shorttermsecure
-	${MKDIR} ${EXAMPLESDIR}/scripts/selfloadbalance
-	${MKDIR} ${EXAMPLESDIR}/etc
-	${INSTALL_MAN} ${WRKSRC}/examples/scripts/readme.txt ${EXAMPLESDIR}/scripts
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/scripts
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/scripts/basic
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/scripts/loadbalance
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/scripts/longtermsecure
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/scripts/longtermsecuredb
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/scripts/restapi
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/scripts/shorttermsecure
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/scripts/selfloadbalance
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/etc
+	${INSTALL_MAN} ${WRKSRC}/examples/scripts/readme.txt ${STAGEDIR}${EXAMPLESDIR}/scripts
 .for f in ${_ETC_EXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/examples/etc/${f} ${EXAMPLESDIR}/etc/
+	${INSTALL_DATA} ${WRKSRC}/examples/etc/${f} ${STAGEDIR}${EXAMPLESDIR}/etc/
 .endfor
 .for f in ${_SCRIPT_EXAMPLES}
-	${INSTALL_SCRIPT} ${WRKSRC}/examples/scripts/${f} ${EXAMPLESDIR}/scripts/${f}
+	${INSTALL_SCRIPT} ${WRKSRC}/examples/scripts/${f} ${STAGEDIR}${EXAMPLESDIR}/scripts/${f}
 .endfor
 .endif
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
-	(cd ${WRKSRC}/../turndocs/docs/ && ${COPYTREE_SHARE} ${f} ${DOCSDIR})
+	(cd ${WRKSRC}/../turndocs/docs/ && ${COPYTREE_SHARE} ${f} ${STAGEDIR}${DOCSDIR})
 .endfor
 .for f in ${PORTREADMEDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
-	${INSTALL_DATA} ${PKGMESSAGE} ${DOCSDIR}/postinstall.txt
-	${INSTALL_DATA} ${WRKSRC}/turndb/schema.sql ${DOCSDIR}/schema.sql
-	${INSTALL_DATA} ${WRKSRC}/turndb/schema.userdb.redis ${DOCSDIR}/schema.userdb.redis
-	${INSTALL_DATA} ${WRKSRC}/turndb/schema.stats.redis ${DOCSDIR}/schema.stats.redis
+	${INSTALL_DATA} ${PKGMESSAGE} ${STAGEDIR}${DOCSDIR}/postinstall.txt
+	${INSTALL_DATA} ${WRKSRC}/turndb/schema.sql ${STAGEDIR}${DOCSDIR}/schema.sql
+	${INSTALL_DATA} ${WRKSRC}/turndb/schema.userdb.redis ${STAGEDIR}${DOCSDIR}/schema.userdb.redis
+	${INSTALL_DATA} ${WRKSRC}/turndb/schema.stats.redis ${STAGEDIR}${DOCSDIR}/schema.stats.redis
 PORTDOCS+=	postinstall.txt ${PORTREADMEDOCS} schema.sql schema.userdb.redis schema.stats.redis
 .endif
 
diff --git a/net/turnserver/distinfo b/net/turnserver/distinfo
index 175c12585753..baff0e3d8a4b 100644
--- a/net/turnserver/distinfo
+++ b/net/turnserver/distinfo
@@ -1,4 +1,4 @@
-SHA256 (turnserver-3.2.1.4.tar.gz) = bf5ca37c83a0c854e2eef3be790b731c13b196ec7e443f1da0252634f6401bb2
-SIZE (turnserver-3.2.1.4.tar.gz) = 287073
+SHA256 (turnserver-3.2.2.5.tar.gz) = f615e1454e7d9fb4c7feb4e6c15d88c6809f3265501bfe771d493b44c954850e
+SIZE (turnserver-3.2.2.5.tar.gz) = 291987
 SHA256 (turn.extra.docs-2.0.0.1.tar.gz) = 3a86600fd0a30ce7aeb547e80402ce68ea9959f7dd58697e5b47fda6e33ab9ce
 SIZE (turn.extra.docs-2.0.0.1.tar.gz) = 485379
diff --git a/net/turnserver/pkg-plist b/net/turnserver/pkg-plist
index cb65ae49a2e1..57774e007f75 100644
--- a/net/turnserver/pkg-plist
+++ b/net/turnserver/pkg-plist
@@ -33,6 +33,7 @@ etc/turnuserdb.conf.default
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/loadbalance/tcp_c2c_tcp_relay.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/longtermsecure/secure_dtls_client.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/longtermsecure/secure_dtls_client_cert.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/longtermsecure/secure_tls_client_cert.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/longtermsecure/secure_relay.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/longtermsecure/secure_relay_cert.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/longtermsecure/secure_tcp_client_c2c_tcp_relay.sh
@@ -74,3 +75,4 @@ include/turn/client/ns_turn_msg_defs.h
 @dirrmtry include/turn/client/
 @dirrmtry include/turn
 @stopdaemon turnserver
+@dirrmtry include/turn/client