- Update to 0.8.2

- Sort plist
- Adjust rc script to removal of admin plugin from default list of loaded
  plugins. Note: If you wish to load it at startup, you can do so via
  mysql_proxy_flags in rc.conf.

Changes:	http://dev.mysql.com/doc/refman/5.5/en/mysql-proxy-news-0-8-2.html

4 files changed, 74 insertions, 77 deletions

diff --git a/databases/mysql-proxy/Makefile b/databases/mysql-proxy/Makefile
index 74cef5f519e8..7b9c947f450a 100644
--- a/databases/mysql-proxy/Makefile
+++ b/databases/mysql-proxy/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mysql-proxy
-PORTVERSION=	0.8.1
-PORTREVISION=	2
+PORTVERSION=	0.8.2
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	MySQL-Proxy
diff --git a/databases/mysql-proxy/distinfo b/databases/mysql-proxy/distinfo
index 61b7309d84ba..f2c79a01f2f1 100644
--- a/databases/mysql-proxy/distinfo
+++ b/databases/mysql-proxy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mysql-proxy-0.8.1.tar.gz) = d59a5d0bf536999d067982bbbe92650cbcb84e6ba5d6fddb9778de92c07a7093
-SIZE (mysql-proxy-0.8.1.tar.gz) = 788570
+SHA256 (mysql-proxy-0.8.2.tar.gz) = 3955d9a60249d36b2c5c949706f7a3294419d2563c1e8474164a3a307865f550
+SIZE (mysql-proxy-0.8.2.tar.gz) = 861995
diff --git a/databases/mysql-proxy/files/mysql-proxy.in b/databases/mysql-proxy/files/mysql-proxy.in
index c68b49d6268d..0a2f45be3dbf 100644
--- a/databases/mysql-proxy/files/mysql-proxy.in
+++ b/databases/mysql-proxy/files/mysql-proxy.in
@@ -11,8 +11,6 @@
 # Add the following line to /etc/rc.conf to enable mysql-proxy:
 # mysql_proxy_enable (bool):		Set to "NO" by default.
 #					Set it to "YES" to enable MySQL Proxy.
-# mysql_proxy_admin_address (str):	Set to ":4041" by default.
-#					Set listening address:port of internal admin-server.
 # mysql_proxy_address (str):		Set to ":4040" by default.
 #					Set listening address:port of the proxy-server.
 # mysql_proxy_backend_addresses (str):	Set to "127.0.0.1:3306" by default.
@@ -35,7 +33,6 @@ rcvar=`set_rcvar`
 load_rc_config $name
 
 : ${mysql_proxy_enable="NO"}
-: ${mysql_proxy_admin_address=":4041"}
 : ${mysql_proxy_address=":4040"}
 : ${mysql_proxy_backend_addresses="127.0.0.1:3306"}
 : ${mysql_proxy_pid_file="/var/run/mysql-proxy.pid"}
@@ -46,9 +43,7 @@ done
 
 pidfile="${mysql_proxy_pid_file}"
 command=%%PREFIX%%/libexec/mysql-proxy
-command_args="--admin-username=${mysql_proxy_admin_username} --admin-password=${mysql_proxy_admin_password} --admin-lua-script=${mysql_proxy_admin_lua_scripts} --admin-address=${mysql_proxy_admin_address} --proxy-address=${mysql_proxy_address} ${proxy_backend_addresses} ${mysql_proxy_args} --daemon --pid-file=${mysql_proxy_pid_file}"
+command_args="--proxy-address=${mysql_proxy_address} ${proxy_backend_addresses} ${mysql_proxy_args} --daemon --pid-file=${mysql_proxy_pid_file}"
 procname=%%PREFIX%%/libexec/mysql-proxy
 
 run_rc_command "$1"
-
-
diff --git a/databases/mysql-proxy/pkg-plist b/databases/mysql-proxy/pkg-plist
index a04a0b0fccf9..a993610f3af2 100644
--- a/databases/mysql-proxy/pkg-plist
+++ b/databases/mysql-proxy/pkg-plist
@@ -1,96 +1,98 @@
 @comment $FreeBSD$
-bin/mysql-proxy
 bin/mysql-binlog-dump
 bin/mysql-myisam-dump
-include/network-mysqld.h
-include/network-mysqld-lua.h
-include/network-mysqld-proto.h
-include/network-mysqld-binlog.h
-include/network-mysqld-packet.h
-include/network-mysqld-masterinfo.h
-include/network-conn-pool.h
-include/network-conn-pool-lua.h
-include/network-queue.h
-include/network-socket.h
-include/network-socket-lua.h
-include/network-address.h
-include/network-address-lua.h
-include/sys-pedantic.h
-include/chassis-plugin.h
-include/chassis-log.h
+bin/mysql-proxy
+include/chassis-event-thread.h
+include/chassis-exports.h
+include/chassis-filemode.h
+include/chassis-frontend.h
+include/chassis-gtimeval.h
 include/chassis-keyfile.h
+include/chassis-limits.h
+include/chassis-log.h
 include/chassis-mainloop.h
+include/chassis-options.h
 include/chassis-path.h
-include/chassis-filemode.h
-include/chassis-limits.h
-include/chassis-event-thread.h
-include/chassis-gtimeval.h
+include/chassis-plugin.h
 include/chassis-shutdown-hooks.h
-include/chassis-frontend.h
-include/chassis-options.h
-include/chassis-win32-service.h
+include/chassis-stats.h
+include/chassis-timings.h
 include/chassis-unix-daemon.h
-include/glib-ext.h
+include/chassis-win32-service.h
+include/disable-dtrace.h
 include/glib-ext-ref.h
-include/string-len.h
-include/lua-load-factory.h
-include/lua-scope.h
+include/glib-ext.h
 include/lua-env.h
-include/network-injection.h
-include/network-injection-lua.h
-include/chassis-exports.h
-include/network-exports.h
-include/network-backend.h
-include/network-backend-lua.h
-include/disable-dtrace.h
+include/lua-load-factory.h
 include/lua-registry-keys.h
-include/chassis-stats.h
-include/chassis-timings.h
+include/lua-scope.h
 include/my_rdtsc.h
-libexec/mysql-proxy
-libexec/mysql-binlog-dump
-libexec/mysql-myisam-dump
-libexec/pkgconfig/mysql-proxy.pc
-libexec/pkgconfig/mysql-chassis.pc
-lib/libmysql-chassis.so.0
-lib/libmysql-chassis.so
-lib/libmysql-chassis.la
-lib/libmysql-chassis-timing.so.0
-lib/libmysql-chassis-timing.so
-lib/libmysql-chassis-timing.la
-lib/libmysql-chassis-glibext.so.0
-lib/libmysql-chassis-glibext.so
+include/network-address-lua.h
+include/network-address.h
+include/network-backend-lua.h
+include/network-backend.h
+include/network-conn-pool-lua.h
+include/network-conn-pool.h
+include/network-exports.h
+include/network-injection-lua.h
+include/network-injection.h
+include/network-mysqld-binlog.h
+include/network-mysqld-lua.h
+include/network-mysqld-masterinfo.h
+include/network-mysqld-packet.h
+include/network-mysqld-proto.h
+include/network-mysqld.h
+include/network-queue.h
+include/network-socket-lua.h
+include/network-socket.h
+include/network_mysqld_proto_binary.h
+include/network_mysqld_type.h
+include/string-len.h
+include/sys-pedantic.h
 lib/libmysql-chassis-glibext.la
-lib/libmysql-proxy.so.0
-lib/libmysql-proxy.so
+lib/libmysql-chassis-glibext.so
+lib/libmysql-chassis-glibext.so.0
+lib/libmysql-chassis-timing.la
+lib/libmysql-chassis-timing.so
+lib/libmysql-chassis-timing.so.0
+lib/libmysql-chassis.la
+lib/libmysql-chassis.so
+lib/libmysql-chassis.so.0
 lib/libmysql-proxy.la
+lib/libmysql-proxy.so
+lib/libmysql-proxy.so.0
 lib/mysql-proxy/lua/admin.lua
-lib/mysql-proxy/lua/lfs.so
-lib/mysql-proxy/lua/lfs.la
-lib/mysql-proxy/lua/glib2.so
-lib/mysql-proxy/lua/glib2.la
-lib/mysql-proxy/lua/chassis.so
 lib/mysql-proxy/lua/chassis.la
-lib/mysql-proxy/lua/mysql.so
-lib/mysql-proxy/lua/mysql.la
-lib/mysql-proxy/lua/lpeg.so
+lib/mysql-proxy/lua/chassis.so
+lib/mysql-proxy/lua/glib2.la
+lib/mysql-proxy/lua/glib2.so
+lib/mysql-proxy/lua/lfs.la
+lib/mysql-proxy/lua/lfs.so
 lib/mysql-proxy/lua/lpeg.la
-lib/mysql-proxy/lua/posix.so
+lib/mysql-proxy/lua/lpeg.so
+lib/mysql-proxy/lua/mysql.la
+lib/mysql-proxy/lua/mysql.so
 lib/mysql-proxy/lua/posix.la
+lib/mysql-proxy/lua/posix.so
 lib/mysql-proxy/lua/proxy/auto-config.lua
 lib/mysql-proxy/lua/proxy/balance.lua
 lib/mysql-proxy/lua/proxy/commands.lua
 lib/mysql-proxy/lua/proxy/parser.lua
-lib/mysql-proxy/lua/proxy/tokenizer.lua
 lib/mysql-proxy/lua/proxy/test.lua
-lib/mysql-proxy/plugins/libadmin.so
+lib/mysql-proxy/lua/proxy/tokenizer.lua
 lib/mysql-proxy/plugins/libadmin.la
-lib/mysql-proxy/plugins/libproxy.so
+lib/mysql-proxy/plugins/libadmin.so
+lib/mysql-proxy/plugins/libdebug.la
+lib/mysql-proxy/plugins/libdebug.so
 lib/mysql-proxy/plugins/libproxy.la
-lib/mysql-proxy/plugins/libreplicant.so
+lib/mysql-proxy/plugins/libproxy.so
 lib/mysql-proxy/plugins/libreplicant.la
-lib/mysql-proxy/plugins/libdebug.so
-lib/mysql-proxy/plugins/libdebug.la
+lib/mysql-proxy/plugins/libreplicant.so
+libexec/mysql-binlog-dump
+libexec/mysql-myisam-dump
+libexec/mysql-proxy
+libexec/pkgconfig/mysql-chassis.pc
+libexec/pkgconfig/mysql-proxy.pc
 %%DATADIR%%/active-queries.lua
 %%DATADIR%%/active-transactions.lua
 %%DATADIR%%/admin-sql.lua
@@ -112,6 +114,7 @@ lib/mysql-proxy/plugins/libdebug.la
 %%EXAMPLESDIR%%/tutorial-keepalive.lua
 %%EXAMPLESDIR%%/tutorial-monitor.lua
 %%EXAMPLESDIR%%/tutorial-packets.lua
+%%EXAMPLESDIR%%/tutorial-prep-stmts.lua
 %%EXAMPLESDIR%%/tutorial-query-time.lua
 %%EXAMPLESDIR%%/tutorial-resultset.lua
 %%EXAMPLESDIR%%/tutorial-rewrite.lua