- fix broken rw-spliting

- bump PORTREVISION

PR:		ports/139792
Submitted by:	Vladimir Korkodinov <viper_AT_perm dot raid dot ru>

3 files changed, 8 insertions, 29 deletions

diff --git a/databases/mysql-proxy/Makefile b/databases/mysql-proxy/Makefile
index 86e4fba048ab..724fb8d5d0e8 100644
--- a/databases/mysql-proxy/Makefile
+++ b/databases/mysql-proxy/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mysql-proxy
 PORTVERSION=	0.7.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	MySQL-Proxy
diff --git a/databases/mysql-proxy/files/patch-lib-proxy-Makefile.in b/databases/mysql-proxy/files/patch-lib-proxy-Makefile.in
index a5c1e66bf551..e69de29bb2d1 100644
--- a/databases/mysql-proxy/files/patch-lib-proxy-Makefile.in
+++ b/databases/mysql-proxy/files/patch-lib-proxy-Makefile.in
@@ -1,22 +0,0 @@
---- lib/proxy/Makefile.in.orig	2009-04-04 20:13:04.000000000 +0600
-+++ lib/proxy/Makefile.in	2009-05-05 12:48:40.000000000 +0600
-@@ -16,7 +16,7 @@
- 
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
-+pkglibdir = $(datadir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
---- lib/proxy/Makefile.in.orig	2009-05-18 22:15:03.000000000 +0800
-+++ lib/proxy/Makefile.in	2009-07-08 17:41:43.000000000 +0800
-@@ -192,7 +192,7 @@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--luaextdir = ${pkglibdir}/lua/
-+luaextdir = ${pkgdatadir}/lua/
- pkglib_proxydir = $(luaextdir)/proxy
- dist_pkglib_proxy_DATA = \
- 		 auto-config.lua \
diff --git a/databases/mysql-proxy/pkg-plist b/databases/mysql-proxy/pkg-plist
index 039c7f8c5834..f715a72aad52 100644
--- a/databases/mysql-proxy/pkg-plist
+++ b/databases/mysql-proxy/pkg-plist
@@ -23,6 +23,12 @@ lib/mysql-proxy/lua/lpeg.so
 lib/mysql-proxy/lua/lpeg.la
 lib/mysql-proxy/lua/posix.so
 lib/mysql-proxy/lua/posix.la
+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/plugins/libadmin.la
 lib/mysql-proxy/plugins/libproxy.so
@@ -46,12 +52,6 @@ lib/mysql-proxy/plugins/libdebug.la
 %%DATADIR%%/ro-pooling.lua
 %%DATADIR%%/rw-splitting.lua
 %%DATADIR%%/xtab.lua
-%%DATADIR%%/lua/proxy/auto-config.lua
-%%DATADIR%%/lua/proxy/balance.lua
-%%DATADIR%%/lua/proxy/commands.lua
-%%DATADIR%%/lua/proxy/parser.lua
-%%DATADIR%%/lua/proxy/tokenizer.lua
-%%DATADIR%%/lua/proxy/test.lua
 %%EXAMPLESDIR%%/tutorial-basic.lua
 %%EXAMPLESDIR%%/tutorial-constants.lua
 %%EXAMPLESDIR%%/tutorial-inject.lua
@@ -67,6 +67,7 @@ lib/mysql-proxy/plugins/libdebug.la
 %%EXAMPLESDIR%%/tutorial-union.lua
 %%EXAMPLESDIR%%/tutorial-warnings.lua
 @dirrmtry lib/mysql-proxy/plugins
+@dirrmtry lib/mysql-proxy/lua/proxy
 @dirrmtry lib/mysql-proxy/lua
 @dirrmtry lib/mysql-proxy
 @dirrmtry %%EXAMPLESDIR%%