From 17bb8b877042ec6c07914c72aac9bc9bfb958a17 Mon Sep 17 00:00:00 2001 From: Steve Wills Date: Sun, 12 Dec 2010 04:33:28 +0000 Subject: - Update to 0.8.1 [1] - Rename rc script - Add path to mysql_config PR: ports/152368 [1] Submitted by: Florian Smeets [1] Approved by: pgollucci (mentor) --- databases/mysql-proxy/Makefile | 7 ++-- databases/mysql-proxy/distinfo | 5 +-- databases/mysql-proxy/files/mysql-proxy.in | 54 +++++++++++++++++++++++++++ databases/mysql-proxy/files/mysql-proxy.sh.in | 54 --------------------------- databases/mysql-proxy/pkg-plist | 10 +++++ 5 files changed, 69 insertions(+), 61 deletions(-) create mode 100644 databases/mysql-proxy/files/mysql-proxy.in delete mode 100644 databases/mysql-proxy/files/mysql-proxy.sh.in (limited to 'databases/mysql-proxy') diff --git a/databases/mysql-proxy/Makefile b/databases/mysql-proxy/Makefile index 66d77e2bac0f..33f8c1e256df 100644 --- a/databases/mysql-proxy/Makefile +++ b/databases/mysql-proxy/Makefile @@ -6,8 +6,7 @@ # PORTNAME= mysql-proxy -PORTVERSION= 0.8.0 -PORTREVISION= 1 +PORTVERSION= 0.8.1 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL} MASTER_SITE_SUBDIR= MySQL-Proxy @@ -18,7 +17,7 @@ COMMENT= Monitor, analyze or transform the communication of MySQL LIB_DEPENDS= event-1.4:${PORTSDIR}/devel/libevent \ glib:${PORTSDIR}/devel/glib20 -CONFIGURE_ARGS+= --with-lua=lua-5.1 --with-mysql --docdir=${DATADIR} --enable-self-contained +CONFIGURE_ARGS+= --with-lua=lua-5.1 --with-mysql=${LOCALBASE}/bin/mysql_config --docdir=${DATADIR} --enable-self-contained CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib -L${LUA_LIBDIR}" \ PKG_CONFIG_PATH="${LUA_PREFIX}/share/doc/${LUA_SUBDIR}/etc" @@ -28,7 +27,7 @@ USE_ICONV= yes USE_LDCONFIG= yes USE_LUA= 5.1+ USE_MYSQL= yes -USE_RC_SUBR= mysql-proxy.sh +USE_RC_SUBR= mysql-proxy IGNORE_WITH_MYSQL= 323 40 41 .include diff --git a/databases/mysql-proxy/distinfo b/databases/mysql-proxy/distinfo index c61a92892354..61b7309d84ba 100644 --- a/databases/mysql-proxy/distinfo +++ b/databases/mysql-proxy/distinfo @@ -1,3 +1,2 @@ -MD5 (mysql-proxy-0.8.0.tar.gz) = b6a9748d72e8db7fe3789fbdd60ff451 -SHA256 (mysql-proxy-0.8.0.tar.gz) = 0a195fe0f86d12df8d9ffc27e91347680521c8702460bac5ed591608a740bc1c -SIZE (mysql-proxy-0.8.0.tar.gz) = 756371 +SHA256 (mysql-proxy-0.8.1.tar.gz) = d59a5d0bf536999d067982bbbe92650cbcb84e6ba5d6fddb9778de92c07a7093 +SIZE (mysql-proxy-0.8.1.tar.gz) = 788570 diff --git a/databases/mysql-proxy/files/mysql-proxy.in b/databases/mysql-proxy/files/mysql-proxy.in new file mode 100644 index 000000000000..79704eb9ddf5 --- /dev/null +++ b/databases/mysql-proxy/files/mysql-proxy.in @@ -0,0 +1,54 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# PROVIDE: mysql-proxy +# REQUIRE: LOGIN +# KEYWORD: shutdown + +# +# 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. +# Set address:port of the remote backend-servers +# mysql_proxy_pid_file (path): Default to "/var/run/mysql-proxy.pid" +# Set PID file in case we are started as daemon +# mysql_proxy_args (str): Default to "" +# Custom additional arguments to be passed to mysql-proxy: +# --proxy-read-only-backend-addresses= - address:port of the remote slave-server +# --proxy-skip-profiling - disables profiling of queries (default: enabled) +# --proxy-fix-bug-25371 - fix bug #25371 (mysqld > 5.1.12) for older libmysql versions +# --proxy-lua-script= - filename of the lua script +# --no-proxy - don't start proxy-server + +. /etc/rc.subr + +name="mysql_proxy" +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"} +proxy_backend_addresses="" +for addr in ${mysql_proxy_backend_addresses}; do + proxy_backend_addresses="${proxy_backend_addresses} --proxy-backend-addresses=${addr}" +done + +pidfile="${mysql_proxy_pid_file}" +command=%%PREFIX%%/libexec/mysql-proxy +command_args="--admin-address=${mysql_proxy_admin_address} --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/files/mysql-proxy.sh.in b/databases/mysql-proxy/files/mysql-proxy.sh.in deleted file mode 100644 index fe328e56a363..000000000000 --- a/databases/mysql-proxy/files/mysql-proxy.sh.in +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: /tmp/pcvs/ports/databases/mysql-proxy/files/Attic/mysql-proxy.sh.in,v 1.4 2010-03-27 00:12:46 dougb Exp $ -# - -# PROVIDE: mysql-proxy -# REQUIRE: LOGIN -# KEYWORD: shutdown - -# -# 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. -# Set address:port of the remote backend-servers -# mysql_proxy_pid_file (path): Default to "/var/run/mysql-proxy.pid" -# Set PID file in case we are started as daemon -# mysql_proxy_args (str): Default to "" -# Custom additional arguments to be passed to mysql-proxy: -# --proxy-read-only-backend-addresses= - address:port of the remote slave-server -# --proxy-skip-profiling - disables profiling of queries (default: enabled) -# --proxy-fix-bug-25371 - fix bug #25371 (mysqld > 5.1.12) for older libmysql versions -# --proxy-lua-script= - filename of the lua script -# --no-proxy - don't start proxy-server - -. /etc/rc.subr - -name="mysql_proxy" -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"} -proxy_backend_addresses="" -for addr in ${mysql_proxy_backend_addresses}; do - proxy_backend_addresses="${proxy_backend_addresses} --proxy-backend-addresses=${addr}" -done - -pidfile="${mysql_proxy_pid_file}" -command=%%PREFIX%%/libexec/mysql-proxy -command_args="--admin-address=${mysql_proxy_admin_address} --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 a8ef7bd1d659..a04a0b0fccf9 100644 --- a/databases/mysql-proxy/pkg-plist +++ b/databases/mysql-proxy/pkg-plist @@ -24,6 +24,12 @@ include/chassis-path.h include/chassis-filemode.h include/chassis-limits.h include/chassis-event-thread.h +include/chassis-gtimeval.h +include/chassis-shutdown-hooks.h +include/chassis-frontend.h +include/chassis-options.h +include/chassis-win32-service.h +include/chassis-unix-daemon.h include/glib-ext.h include/glib-ext-ref.h include/string-len.h @@ -52,9 +58,13 @@ 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 +lib/libmysql-chassis-glibext.la lib/libmysql-proxy.so.0 lib/libmysql-proxy.so lib/libmysql-proxy.la +lib/mysql-proxy/lua/admin.lua lib/mysql-proxy/lua/lfs.so lib/mysql-proxy/lua/lfs.la lib/mysql-proxy/lua/glib2.so -- cgit v1.2.3