diff options
Diffstat (limited to 'databases/sqlrelay')
| -rw-r--r-- | databases/sqlrelay/Makefile | 20 | ||||
| -rw-r--r-- | databases/sqlrelay/Makefile.common | 2 | ||||
| -rw-r--r-- | databases/sqlrelay/distinfo | 4 | ||||
| -rw-r--r-- | databases/sqlrelay/files/patch-Makefile | 28 | ||||
| -rw-r--r-- | databases/sqlrelay/files/patch-config.mk.in | 14 | ||||
| -rw-r--r-- | databases/sqlrelay/files/patch-etc-Makefile | 18 | ||||
| -rw-r--r-- | databases/sqlrelay/files/patch-etc_Makefile | 23 | ||||
| -rw-r--r-- | databases/sqlrelay/pkg-plist | 46 |
8 files changed, 83 insertions, 72 deletions
diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile index 45c13681255f..6659f26f6cdc 100644 --- a/databases/sqlrelay/Makefile +++ b/databases/sqlrelay/Makefile @@ -43,16 +43,16 @@ TOSTRIP= bin/sqlr-start \ bin/sqlr-pwdenc \ bin/sqlr-status \ bin/sqlrsh \ - lib/libsqlrutil.so.1.0.0 \ - lib/libsqlrclient.so.1.0.0 \ - lib/libsqlrclientwrapper.so.1.0.0 \ - lib/libpqsqlrelay.so.1.0.0 \ - lib/libmysql3sqlrelay.so.1.0.0 \ - lib/libmysql40sqlrelay.so.1.0.0 \ - lib/libmysql41sqlrelay.so.1.0.0 \ - lib/libmysql50sqlrelay.so.1.0.0 \ - lib/libmysql51sqlrelay.so.1.0.0 \ - lib/libsqlrserver.so.1.0.0 \ + lib/libsqlrutil-0.59.so.1.0.0 \ + lib/libsqlrclient-0.59.so.1.0.0 \ + lib/libsqlrclientwrapper-0.59.so.1.0.0 \ + lib/libpqsqlrelay-0.59.so.1.0.0 \ + lib/libmysql3sqlrelay-0.59.so.1.0.0 \ + lib/libmysql40sqlrelay-0.59.so.1.0.0 \ + lib/libmysql41sqlrelay-0.59.so.1.0.0 \ + lib/libmysql50sqlrelay-0.59.so.1.0.0 \ + lib/libmysql51sqlrelay-0.59.so.1.0.0 \ + lib/libsqlrserver-0.59.so.1.0.0 \ libexec/sqlrelay/sqlrauth_default.so \ libexec/sqlrelay/sqlrauth_sqlrelay.so \ libexec/sqlrelay/sqlrconnection_router.so \ diff --git a/databases/sqlrelay/Makefile.common b/databases/sqlrelay/Makefile.common index a09519279fe2..d48938e203fb 100644 --- a/databases/sqlrelay/Makefile.common +++ b/databases/sqlrelay/Makefile.common @@ -1,7 +1,7 @@ # $FreeBSD$ SQLRELAY_PORTNAME= sqlrelay -SQLRELAY_PORTVERSION= 0.58.1 +SQLRELAY_PORTVERSION= 0.59 SQLRELAY_PORTDIR= ${PORTSDIR}/databases/${SQLRELAY_PORTNAME} SQLRELAY_WRKSRC_CMD= cd ${SQLRELAY_PORTDIR} && ${MAKE} -V WRKSRC diff --git a/databases/sqlrelay/distinfo b/databases/sqlrelay/distinfo index a755ec85a761..1b94d4588118 100644 --- a/databases/sqlrelay/distinfo +++ b/databases/sqlrelay/distinfo @@ -1,2 +1,2 @@ -SHA256 (sqlrelay-0.58.1.tar.gz) = 03fd21bb3550fe368e5fe0a065b408e7f8060c569e91b966b8e7c092a376fc9e -SIZE (sqlrelay-0.58.1.tar.gz) = 3724622 +SHA256 (sqlrelay-0.59.tar.gz) = f2e6433a153cd64684980246574654d49a1df8d4b5bcde75634e8fb19f405c02 +SIZE (sqlrelay-0.59.tar.gz) = 3224000 diff --git a/databases/sqlrelay/files/patch-Makefile b/databases/sqlrelay/files/patch-Makefile index 7deaacf1aa36..9a4135433cc1 100644 --- a/databases/sqlrelay/files/patch-Makefile +++ b/databases/sqlrelay/files/patch-Makefile @@ -1,15 +1,19 @@ ---- Makefile.orig Thu Aug 5 18:46:10 2004 -+++ Makefile Mon Feb 14 10:26:16 2005 -@@ -26,9 +26,9 @@ - $(MAKE) -C init install - $(MAKE) -C man install - $(MAKE) -C doc install +--- Makefile.orig 2015-03-31 20:50:58 UTC ++++ Makefile +@@ -30,11 +30,11 @@ install-doc: + cd doc $(AND) $(MAKE) install + + install-pkgconfig: - $(MKINSTALLDIRS) $(libdir)/pkgconfig -- $(INSTALL) -m 0644 sqlrelay-c.pc $(libdir)/pkgconfig/sqlrelay-c.pc -- $(INSTALL) -m 0644 sqlrelay-c++.pc $(libdir)/pkgconfig/sqlrelay-c++.pc +- $(CP) sqlrelay-c.pc $(libdir)/pkgconfig/sqlrelay-c.pc +- $(CHMOD) 0644 $(libdir)/pkgconfig/sqlrelay-c.pc +- $(CP) sqlrelay-c++.pc $(libdir)/pkgconfig/sqlrelay-c++.pc +- $(CHMOD) 0644 $(libdir)/pkgconfig/sqlrelay-c++.pc + $(MKINSTALLDIRS) $(prefix)/libdata/pkgconfig -+ $(INSTALL) -m 0644 sqlrelay-c.pc $(prefix)/libdata/pkgconfig/sqlrelay-c.pc -+ $(INSTALL) -m 0644 sqlrelay-c++.pc $(prefix)/libdata/pkgconfig/sqlrelay-c++.pc ++ $(CP) sqlrelay-c.pc $(prefix)/libdata/pkgconfig/sqlrelay-c.pc ++ $(CHMOD) 0644 $(prefix)/libdata/pkgconfig/sqlrelay-c.pc ++ $(CP) sqlrelay-c++.pc $(prefix)/libdata/pkgconfig/sqlrelay-c++.pc ++ $(CHMOD) 0644 $(prefix)/libdata/pkgconfig/sqlrelay-c++.pc - uninstall: - $(MAKE) -C src uninstall + uninstall: $(UNINSTALLSUBDIRS) + $(RMTREE) $(libexecdir) diff --git a/databases/sqlrelay/files/patch-config.mk.in b/databases/sqlrelay/files/patch-config.mk.in index 34398fdedfb5..5b21b1787ba8 100644 --- a/databases/sqlrelay/files/patch-config.mk.in +++ b/databases/sqlrelay/files/patch-config.mk.in @@ -1,20 +1,20 @@ ---- config.mk.in.orig 2014-12-28 09:10:48.000000000 +0100 -+++ config.mk.in 2014-12-29 20:44:27.000000000 +0100 -@@ -9,7 +9,7 @@ +--- config.mk.in.orig 2015-05-07 19:42:23 UTC ++++ config.mk.in +@@ -8,7 +8,7 @@ prefix = @prefix@ exec_prefix= @exec_prefix@ includedir = @includedir@ libdir = @libdir@ -javadir = ${exec_prefix}/java +javadir = ${exec_prefix}/share/java/classes + dotnetdir = $(libdir) libexecdir = @libexecdir@/sqlrelay bindir = @bindir@ - localstatedir = @localstatedir@ -@@ -33,7 +33,7 @@ +@@ -59,7 +59,7 @@ OBJ = lo TMPDIRCPPFLAG = -DTMP_DIR=\"$(tmpdir)\" DEBUGDIRCPPFLAG = -DDEBUG_DIR=\"$(debugdir)\" LOGDIRCPPFLAG = -DLOG_DIR=\"$(logdir)\" -CONFIGFILECPPFLAG = -DDEFAULT_CONFIG_FILE=\"$(sysconfdir)/sqlrelay.conf\" -DDEFAULT_CONFIG_DIR=\"$(sysconfdir)/sqlrelay.conf.d\" -+CONFIGFILECPPFLAG = -DDEFAULT_CONFIG_FILE=\"$(sysconfdir)/sqlrelay/conf\" -DDEFAULT_CONFIG_DIR=\"$(sysconfdir)/sqlrelay\" ++CONFIGFILECPPFLAG = -DDEFAULT_CONFIG_FILE=\"$(sysconfdir)/sqlrelay.conf\" -DDEFAULT_CONFIG_DIR=\"$(sysconfdir)/sqlrelay\" CACHEDIRCPPFLAG = -DCACHE_DIR=\"$(cachedir)\" - # link flags (-s, -static, -melf, -belf, etc.) + diff --git a/databases/sqlrelay/files/patch-etc-Makefile b/databases/sqlrelay/files/patch-etc-Makefile deleted file mode 100644 index dc8d400f9e2d..000000000000 --- a/databases/sqlrelay/files/patch-etc-Makefile +++ /dev/null @@ -1,18 +0,0 @@ ---- etc/Makefile.orig 2014-12-29 21:02:52.000000000 +0100 -+++ etc/Makefile 2014-12-29 21:03:40.000000000 +0100 -@@ -6,11 +6,10 @@ - - install: - $(MKINSTALLDIRS) $(sysconfdir) -- $(MKINSTALLDIRS) $(sysconfdir)/sqlrelay.conf.d -- $(INSTALL) -m 644 sqlrelay.conf.example $(sysconfdir) -- $(INSTALL) -m 644 sqlrelay.dtd $(sysconfdir) -- $(INSTALL) -m 644 sqlrelay.xsd $(sysconfdir) -- $(INSTALL) -m 644 sqlrelay.conf.example $(EXAMPLEDIR)/sqlrelay.conf -+ $(MKINSTALLDIRS) $(sysconfdir)/sqlrelay -+ $(INSTALL) -m 644 sqlrelay.conf.example $(sysconfdir)/sqlrelay/conf.sample -+ $(INSTALL) -m 644 sqlrelay.dtd $(sysconfdir)/sqlrelay/ -+ $(INSTALL) -m 644 sqlrelay.xsd $(sysconfdir)/sqlrelay/ - - uninstall: - $(RM) $(sysconfdir)/sqlrelay.conf.example diff --git a/databases/sqlrelay/files/patch-etc_Makefile b/databases/sqlrelay/files/patch-etc_Makefile new file mode 100644 index 000000000000..28f26beab443 --- /dev/null +++ b/databases/sqlrelay/files/patch-etc_Makefile @@ -0,0 +1,23 @@ +--- etc/Makefile.orig 2015-05-07 19:44:34 UTC ++++ etc/Makefile +@@ -4,13 +4,13 @@ include ../config.mk + + install: + $(MKINSTALLDIRS) $(sysconfdir) +- $(MKINSTALLDIRS) $(sysconfdir)/sqlrelay.conf.d +- $(CP) sqlrelay.conf.example $(sysconfdir) +- $(CHMOD) 644 $(sysconfdir)/sqlrelay.conf.example +- $(CP) sqlrelay.dtd $(sysconfdir) +- $(CHMOD) 644 $(sysconfdir)/sqlrelay.dtd +- $(CP) sqlrelay.xsd $(sysconfdir) +- $(CHMOD) 644 $(sysconfdir)/sqlrelay.xsd ++ $(MKINSTALLDIRS) $(sysconfdir)/sqlrelay ++ $(CP) sqlrelay.conf.example $(sysconfdir)//sqlrelay/conf.sample ++ $(CHMOD) 644 $(sysconfdir)/sqlrelay/conf.sample ++ $(CP) sqlrelay.dtd $(sysconfdir)/sqlrelay/ ++ $(CHMOD) 644 $(sysconfdir)/sqlrelay/sqlrelay.dtd ++ $(CP) sqlrelay.xsd $(sysconfdir)/sqlrelay/ ++ $(CHMOD) 644 $(sysconfdir)/sqlrelay/sqlrelay.xsd + $(CP) sqlrelay.conf.example $(EXAMPLEDIR)/sqlrelay.conf + $(CHMOD) 644 $(EXAMPLEDIR)/sqlrelay.conf + diff --git a/databases/sqlrelay/pkg-plist b/databases/sqlrelay/pkg-plist index 9c969a010abc..405ad7fac6af 100644 --- a/databases/sqlrelay/pkg-plist +++ b/databases/sqlrelay/pkg-plist @@ -22,6 +22,7 @@ etc/sqlrelay/sqlrelay.xsd include/sqlrelay/private/bindvar.h include/sqlrelay/private/column.h include/sqlrelay/private/dll.h +include/sqlrelay/private/listformat.h include/sqlrelay/private/row.h include/sqlrelay/private/sqlrclientwrapper.h include/sqlrelay/private/sqlrconnection.h @@ -42,43 +43,43 @@ include/sqlrelay/sqlrclientwrapper.h include/sqlrelay/sqlrserver.h include/sqlrelay/sqlrutil.h lib/libmysql3sqlrelay.so -lib/libmysql3sqlrelay.so.1 -lib/libmysql3sqlrelay.so.1.0.0 +lib/libmysql3sqlrelay-0.59.so.1 +lib/libmysql3sqlrelay-0.59.so.1.0.0 lib/libmysql40sqlrelay.so -lib/libmysql40sqlrelay.so.1 -lib/libmysql40sqlrelay.so.1.0.0 +lib/libmysql40sqlrelay-0.59.so.1 +lib/libmysql40sqlrelay-0.59.so.1.0.0 lib/libmysql41sqlrelay.so -lib/libmysql41sqlrelay.so.1 -lib/libmysql41sqlrelay.so.1.0.0 +lib/libmysql41sqlrelay-0.59.so.1 +lib/libmysql41sqlrelay-0.59.so.1.0.0 lib/libmysql50sqlrelay.so -lib/libmysql50sqlrelay.so.1 -lib/libmysql50sqlrelay.so.1.0.0 +lib/libmysql50sqlrelay-0.59.so.1 +lib/libmysql50sqlrelay-0.59.so.1.0.0 lib/libmysql51sqlrelay.so -lib/libmysql51sqlrelay.so.1 -lib/libmysql51sqlrelay.so.1.0.0 +lib/libmysql51sqlrelay-0.59.so.1 +lib/libmysql51sqlrelay-0.59.so.1.0.0 lib/libpqsqlrelay.so -lib/libpqsqlrelay.so.1 -lib/libpqsqlrelay.so.1.0.0 +lib/libpqsqlrelay-0.59.so.1 +lib/libpqsqlrelay-0.59.so.1.0.0 lib/libsqlrclient.a lib/libsqlrclient.so -lib/libsqlrclient.so.1 -lib/libsqlrclient.so.1.0.0 +lib/libsqlrclient-0.59.so.1 +lib/libsqlrclient-0.59.so.1.0.0 lib/libsqlrclientwrapper.a lib/libsqlrclientwrapper.so -lib/libsqlrclientwrapper.so.1 -lib/libsqlrclientwrapper.so.1.0.0 +lib/libsqlrclientwrapper-0.59.so.1 +lib/libsqlrclientwrapper-0.59.so.1.0.0 %%ODBC%%lib/libsqlrodbc.a %%ODBC%%lib/libsqlrodbc.so -%%ODBC%%lib/libsqlrodbc.so.1 -%%ODBC%%lib/libsqlrodbc.so.1.0.0 +%%ODBC%%lib/libsqlrodbc-0.59.so.1 +%%ODBC%%lib/libsqlrodbc-0.59.so.1.0.0 lib/libsqlrserver.a lib/libsqlrserver.so -lib/libsqlrserver.so.1 -lib/libsqlrserver.so.1.0.0 +lib/libsqlrserver-0.59.so.1 +lib/libsqlrserver-0.59.so.1.0.0 lib/libsqlrutil.a lib/libsqlrutil.so -lib/libsqlrutil.so.1 -lib/libsqlrutil.so.1.0.0 +lib/libsqlrutil-0.59.so.1 +lib/libsqlrutil-0.59.so.1.0.0 libdata/pkgconfig/sqlrelay-c++.pc libdata/pkgconfig/sqlrelay-c.pc %%FIREBIRD%%libexec/sqlrelay/sqlrconnection_firebird.so @@ -112,6 +113,7 @@ man/man8/sqlr-start.8.gz man/man8/sqlr-stop.8.gz share/examples/sample-mssqlserver-mysql-errors.map share/examples/sample-oracle-mysql-errors.map +share/examples/sqlrelay.conf @dir %%ETCDIR%% @dir /var/sqlrelay/tmp/sockets @dir /var/sqlrelay/tmp/pids |