coturn: Rototill install paths

Install docs and examples to the canonical pkgsrc locations.
Require pkg-config, so that the libevent builtin installs pc files.
Point mysql to 57 because 55 is gone.

(This commit changes a lot of lines but is not semantically that big a deal.)

diff --git a/coturn/Makefile b/coturn/Makefile
index 79994aefc906a80107494d8f1f0a6ffeb415ca72..276535ef396d82c61204b2d2fa8ba47fa9d8aa6c 100644 (file)
--- a/coturn/Makefile
+++ b/coturn/Makefile
@@ -11,28 +11,39 @@ COMMENT=    The TURN Server is a VoIP media traffic NAT traversal server
 LICENSE=       modified-bsd
 
 USE_LANGUAGES= c c++
+
+USE_TOOLS+=    pkg-config
 USE_LIBTOOL=   yes
 
+HAS_CONFIGURE= yes
+
+# Pass cflags/libs
 CONFIGURE_ENV+=                PTHREAD_LIBS=-pthread TURN_DISABLE_RPATH=1
 CONFIGURE_ENV+=                LIBEVENT_OPENSSL_CFLAGS="-I${BUILDLINK_PREFIX.libevent}/include"
 CONFIGURE_ENV+=                LIBEVENT_OPENSSL_LIBS="-L${BUILDLINK_PREFIX.libevent}/lib -levent_openssl -levent"
-CONFIGURE_ENV+=                LOCALSTATEDIR=/var
+
+# Configure installation paths.
+# \todo Why is this not setting PREFIX?
 CONFIGURE_ENV+=                BINDIR=${PREFIX}/bin
 CONFIGURE_ENV+=                LIBDIR=${PREFIX}/lib
-CONFIGURE_ENV+=                CONFDIR=${PKG_SYSCONFDIR}
 CONFIGURE_ENV+=                MANPREFIX=${PREFIX}
-CONFIGURE_ENV+=                DOCSDIR=${PREFIX}/share/doc
+CONFIGURE_ENV+=                CONFDIR=${PKG_SYSCONFDIR}
 CONFIGURE_ENV+=                INCLUDEDIR=${PREFIX}/include
-CONFIGURE_ENV+=                EXAMPLESDIR=${PREFIX}/share/examples
-CONFIGURE_ENV+=                TURNDBDIR=${PREFIX}/share/turnserver
+CONFIGURE_ENV+=                LOCALSTATEDIR=${PREFIX}/var/turnserver
+CONFIGURE_ENV+=                DOCSDIR=${PREFIX}/share/doc/coturn
+CONFIGURE_ENV+=                EXAMPLESDIR=${PREFIX}/share/examples/coturn
+CONFIGURE_ENV+=                TURNDBDIR=${VARBASE}/turnserver
 CONFIGURE_ENV+=                TURNINCLUDEDIR=${PREFIX}/include/turn
 
-INSTALLATION_DIRS+=    bin include lib ${PKGMANDIR}/man1 share/doc share/examples/etc share/examples/scripts share/turnserver
+# \todo Does the package really not make these?
+INSTALLATION_DIRS+=    bin lib ${PKGMANDIR}/man1
+INSTALLATION_DIRS+=    ${PREFIX}/var/turnserver
+INSTALLATION_DIRS+=    share/doc/coturn share/examples/coturn
+
 #CONF_FILES+=          ${PREFIX}/etc/turnserver.conf.default
 #RCD_SCRIPTS=          turnserver
 
 WRKSRC=                ${WRKDIR}/${DISTNAME}
-HAS_CONFIGURE= yes
 
 .include "options.mk"
 

diff --git a/coturn/PLIST b/coturn/PLIST
index 2ef6e0eb6f456642f5eb81070d92a1b924106d5f..576ce51ff9f78073e163fee92f7c8c692f25ba6e 100644 (file)
--- a/coturn/PLIST
+++ b/coturn/PLIST
@@ -24,69 +24,72 @@ man/man1/turnutils_oauth.1
 man/man1/turnutils_peer.1
 man/man1/turnutils_stunclient.1
 man/man1/turnutils_uclient.1
-share/doc/INSTALL
-share/doc/LICENSE
-share/doc/README.turnadmin
-share/doc/README.turnserver
-share/doc/README.turnutils
-share/doc/postinstall.txt
-share/doc/schema.mongo.sh
-share/doc/schema.sql
-share/doc/schema.stats.redis
-share/doc/schema.userdb.redis
-share/examples/etc/turn_client_cert.pem
-share/examples/etc/turn_client_pkey.pem
-share/examples/etc/turn_server_cert.pem
-share/examples/etc/turn_server_pkey.pem
-share/examples/etc/turnserver.conf
-share/examples/scripts/basic/dos_attack.sh
-share/examples/scripts/basic/relay.sh
-share/examples/scripts/basic/tcp_client.sh
-share/examples/scripts/basic/tcp_client_c2c_tcp_relay.sh
-share/examples/scripts/basic/udp_c2c_client.sh
-share/examples/scripts/basic/udp_client.sh
-share/examples/scripts/loadbalance/master_relay.sh
-share/examples/scripts/loadbalance/slave_relay_1.sh
-share/examples/scripts/loadbalance/slave_relay_2.sh
-share/examples/scripts/loadbalance/tcp_c2c_tcp_relay.sh
-share/examples/scripts/loadbalance/udp_c2c.sh
-share/examples/scripts/longtermsecure/secure_dos_attack.sh
-share/examples/scripts/longtermsecure/secure_dtls_client.sh
-share/examples/scripts/longtermsecure/secure_dtls_client_cert.sh
-share/examples/scripts/longtermsecure/secure_relay.sh
-share/examples/scripts/longtermsecure/secure_relay_cert.sh
-share/examples/scripts/longtermsecure/secure_sctp_client.sh
-share/examples/scripts/longtermsecure/secure_tcp_client.sh
-share/examples/scripts/longtermsecure/secure_tcp_client_c2c_tcp_relay.sh
-share/examples/scripts/longtermsecure/secure_tls_client.sh
-share/examples/scripts/longtermsecure/secure_tls_client_c2c_tcp_relay.sh
-share/examples/scripts/longtermsecure/secure_tls_client_cert.sh
-share/examples/scripts/longtermsecure/secure_udp_c2c.sh
-share/examples/scripts/longtermsecure/secure_udp_client.sh
-share/examples/scripts/longtermsecuredb/secure_relay_with_db_mongo.sh
-share/examples/scripts/longtermsecuredb/secure_relay_with_db_mysql.sh
-share/examples/scripts/longtermsecuredb/secure_relay_with_db_mysql_ssl.sh
-share/examples/scripts/longtermsecuredb/secure_relay_with_db_psql.sh
-share/examples/scripts/longtermsecuredb/secure_relay_with_db_redis.sh
-share/examples/scripts/longtermsecuredb/secure_relay_with_db_sqlite.sh
-share/examples/scripts/mobile/mobile_dtls_client.sh
-share/examples/scripts/mobile/mobile_relay.sh
-share/examples/scripts/mobile/mobile_tcp_client.sh
-share/examples/scripts/mobile/mobile_tls_client_c2c_tcp_relay.sh
-share/examples/scripts/mobile/mobile_udp_client.sh
-share/examples/scripts/oauth.sh
-share/examples/scripts/peer.sh
-share/examples/scripts/readme.txt
-share/examples/scripts/restapi/secure_relay_secret.sh
-share/examples/scripts/restapi/secure_relay_secret_with_db_mongo.sh
-share/examples/scripts/restapi/secure_relay_secret_with_db_mysql.sh
-share/examples/scripts/restapi/secure_relay_secret_with_db_psql.sh
-share/examples/scripts/restapi/secure_relay_secret_with_db_redis.sh
-share/examples/scripts/restapi/secure_relay_secret_with_db_sqlite.sh
-share/examples/scripts/restapi/secure_udp_client_with_secret.sh
-share/examples/scripts/restapi/shared_secret_maintainer.pl
-share/examples/scripts/selfloadbalance/secure_dos_attack.sh
-share/examples/scripts/selfloadbalance/secure_relay.sh
+share/doc/coturn/INSTALL
+share/doc/coturn/LICENSE
+share/doc/coturn/README.turnadmin
+share/doc/coturn/README.turnserver
+share/doc/coturn/README.turnutils
+share/doc/coturn/postinstall.txt
+share/doc/coturn/schema.mongo.sh
+share/doc/coturn/schema.sql
+share/doc/coturn/schema.stats.redis
+share/doc/coturn/schema.userdb.redis
+share/examples/coturn/etc/cacert.pem
+share/examples/coturn/etc/coturn.service
+share/examples/coturn/etc/turn_client_cert.pem
+share/examples/coturn/etc/turn_client_pkey.pem
+share/examples/coturn/etc/turn_server_cert.pem
+share/examples/coturn/etc/turn_server_pkey.pem
+share/examples/coturn/etc/turnserver.conf
+share/examples/coturn/scripts/basic/dos_attack.sh
+share/examples/coturn/scripts/basic/relay.sh
+share/examples/coturn/scripts/basic/tcp_client.sh
+share/examples/coturn/scripts/basic/tcp_client_c2c_tcp_relay.sh
+share/examples/coturn/scripts/basic/udp_c2c_client.sh
+share/examples/coturn/scripts/basic/udp_client.sh
+share/examples/coturn/scripts/loadbalance/master_relay.sh
+share/examples/coturn/scripts/loadbalance/slave_relay_1.sh
+share/examples/coturn/scripts/loadbalance/slave_relay_2.sh
+share/examples/coturn/scripts/loadbalance/tcp_c2c_tcp_relay.sh
+share/examples/coturn/scripts/loadbalance/udp_c2c.sh
+share/examples/coturn/scripts/longtermsecure/secure_dos_attack.sh
+share/examples/coturn/scripts/longtermsecure/secure_dtls_client.sh
+share/examples/coturn/scripts/longtermsecure/secure_dtls_client_cert.sh
+share/examples/coturn/scripts/longtermsecure/secure_relay.sh
+share/examples/coturn/scripts/longtermsecure/secure_relay_cert.sh
+share/examples/coturn/scripts/longtermsecure/secure_sctp_client.sh
+share/examples/coturn/scripts/longtermsecure/secure_tcp_client.sh
+share/examples/coturn/scripts/longtermsecure/secure_tcp_client_c2c_tcp_relay.sh
+share/examples/coturn/scripts/longtermsecure/secure_tls_client.sh
+share/examples/coturn/scripts/longtermsecure/secure_tls_client_c2c_tcp_relay.sh
+share/examples/coturn/scripts/longtermsecure/secure_tls_client_cert.sh
+share/examples/coturn/scripts/longtermsecure/secure_udp_c2c.sh
+share/examples/coturn/scripts/longtermsecure/secure_udp_client.sh
+share/examples/coturn/scripts/longtermsecuredb/secure_relay_with_db_mongo.sh
+share/examples/coturn/scripts/longtermsecuredb/secure_relay_with_db_mysql.sh
+share/examples/coturn/scripts/longtermsecuredb/secure_relay_with_db_mysql_ssl.sh
+share/examples/coturn/scripts/longtermsecuredb/secure_relay_with_db_psql.sh
+share/examples/coturn/scripts/longtermsecuredb/secure_relay_with_db_redis.sh
+share/examples/coturn/scripts/longtermsecuredb/secure_relay_with_db_sqlite.sh
+share/examples/coturn/scripts/mobile/mobile_dtls_client.sh
+share/examples/coturn/scripts/mobile/mobile_relay.sh
+share/examples/coturn/scripts/mobile/mobile_tcp_client.sh
+share/examples/coturn/scripts/mobile/mobile_tls_client_c2c_tcp_relay.sh
+share/examples/coturn/scripts/mobile/mobile_udp_client.sh
+share/examples/coturn/scripts/oauth.sh
+share/examples/coturn/scripts/pack.sh
+share/examples/coturn/scripts/peer.sh
+share/examples/coturn/scripts/readme.txt
+share/examples/coturn/scripts/restapi/secure_relay_secret.sh
+share/examples/coturn/scripts/restapi/secure_relay_secret_with_db_mongo.sh
+share/examples/coturn/scripts/restapi/secure_relay_secret_with_db_mysql.sh
+share/examples/coturn/scripts/restapi/secure_relay_secret_with_db_psql.sh
+share/examples/coturn/scripts/restapi/secure_relay_secret_with_db_redis.sh
+share/examples/coturn/scripts/restapi/secure_relay_secret_with_db_sqlite.sh
+share/examples/coturn/scripts/restapi/secure_udp_client_with_secret.sh
+share/examples/coturn/scripts/restapi/shared_secret_maintainer.pl
+share/examples/coturn/scripts/selfloadbalance/secure_dos_attack.sh
+share/examples/coturn/scripts/selfloadbalance/secure_relay.sh
 share/turnserver/schema.mongo.sh
 share/turnserver/schema.sql
 share/turnserver/schema.stats.redis
@@ -94,4 +97,4 @@ share/turnserver/schema.userdb.redis
 share/turnserver/testmongosetup.sh
 share/turnserver/testredisdbsetup.sh
 share/turnserver/testsqldbsetup.sql
-share/turnserver/turndb
+@pkgdir var/turnserver

diff --git a/coturn/options.mk b/coturn/options.mk
index 07a875f8e7086ae57147158eee8150e2cf312f47..709ce07135495af1c86eb3d8b2fb48f351cc9c93 100644 (file)
--- a/coturn/options.mk
+++ b/coturn/options.mk
@@ -1,7 +1,9 @@
+# $NetBSD$
+
 PKG_OPTIONS_VAR=               PKG_OPTIONS.coturn
 PKG_SUPPORTED_OPTIONS=         hiredis mysql pgsql sqlite redis
 
-PKG_SUGGESTED_OPTIONS= sqlite
+PKG_SUGGESTED_OPTIONS=         sqlite
 
 .include "../../mk/bsd.options.mk"
 
@@ -10,7 +12,7 @@ PKG_SUGGESTED_OPTIONS=        sqlite
 .endif
 
 .if !empty(PKG_OPTIONS:Mmysql)
-.include "../../databases/mysql55-client/buildlink3.mk"
+.include "../../databases/mysql57-client/buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mpgsql)