Index: head/databases/sqlrelay/Makefile =================================================================== --- head/databases/sqlrelay/Makefile (revision 385724) +++ head/databases/sqlrelay/Makefile (revision 385725) @@ -1,142 +1,142 @@ # Created by: Akinori MUSHA aka knu # $FreeBSD$ PORTNAME= ${SQLRELAY_PORTNAME} PORTVERSION= ${SQLRELAY_PORTVERSION} CATEGORIES= databases MASTER_SITES= SF MAINTAINER= pi@FreeBSD.org COMMENT= Persistent DB connection pooling/proxying/load balancing system LIB_DEPENDS= librudiments.so:${PORTSDIR}/devel/rudiments WANT_GNOME= yes USES= gmake libtool CPPFLAGS+= -I${LOCALBASE}/include GNU_CONFIGURE= yes CONFIGURE_ARGS= ${SQLRELAY_CONFIGURE_ARGS} \ --disable-tcl \ --disable-java \ --disable-msql \ --disable-perl \ --disable-php \ --disable-python \ --disable-ruby \ --disable-erlang \ --disable-zope MAKE_JOBS_UNSAFE=yes USE_LDCONFIG= yes PORTDOCS= * TOSTRIP= bin/sqlr-start \ bin/sqlr-stop \ bin/sqlr-listener \ bin/sqlr-connection \ bin/sqlr-scaler \ bin/sqlr-cachemanager \ bin/sqlr-fields \ bin/sqlr-query \ bin/sqlr-export \ bin/sqlr-import \ 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 \ libexec/sqlrelay/sqlrlogger_custom_nw.so \ libexec/sqlrelay/sqlrlogger_custom_sc.so \ libexec/sqlrelay/sqlrlogger_debug.so \ libexec/sqlrelay/sqlrlogger_slowqueries.so \ libexec/sqlrelay/sqlrparser_default.so \ libexec/sqlrelay/sqlrprotocol_sqlrclient.so \ libexec/sqlrelay/sqlrpwdenc_crypt.so \ libexec/sqlrelay/sqlrpwdenc_md5.so \ libexec/sqlrelay/sqlrpwdenc_rot.so \ libexec/sqlrelay/sqlrquery_sqlrcmdcstat.so \ libexec/sqlrelay/sqlrquery_sqlrcmdgstat.so .include "${.CURDIR}/Makefile.common" OPTIONS_DEFINE= MYSQL ODBC ORACLE PGSQL SQLITE3 FREETDS FIREBIRD DOCS OPTIONS_SUB= yes ORACLE_CONFIGURE_ENABLE= oracle .include .if ${PORT_OPTIONS:MSQLITE3} LIB_DEPENDS+= libgdbm.so:${PORTSDIR}/databases/gdbm \ libsqlite3.so:${PORTSDIR}/databases/sqlite3 CONFIGURE_ARGS+= --with-gdbm-prefix="${LOCALBASE}" \ --with-sqlite-prefix="${LOCALBASE}" .else CONFIGURE_ARGS+= --without-gdbm-prefix \ --disable-sqlite .endif .if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= yes CONFIGURE_ARGS+= --with-mysql-prefix="${LOCALBASE}" TOSTRIP+= libexec/sqlrelay/sqlrconnection_mysql.so .else CONFIGURE_ARGS+= --disable-mysql .endif .if ${PORT_OPTIONS:MFIREBIRD} USE_FIREBIRD= yes CONFIGURE_ARGS+= --with-firebird-prefix="${LOCALBASE}" .else CONFIGURE_ARGS+= --disable-firebird .endif .if ${PORT_OPTIONS:MPGSQL} USES+= pgsql CONFIGURE_ARGS+= --with-postgresql-prefix="${LOCALBASE}" .else CONFIGURE_ARGS+= --disable-postgresql .endif .if ${PORT_OPTIONS:MODBC} LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC CONFIGURE_ARGS+= --with-odbc-prefix="${LOCALBASE}" .else CONFIGURE_ARGS+= --disable-odbc .endif .if ${PORT_OPTIONS:MFREETDS} LIB_DEPENDS+= libtds.so:${PORTSDIR}/databases/freetds CONFIGURE_ARGS+= --with-freetds-prefix="${LOCALBASE}" .else CONFIGURE_ARGS+= --disable-freetds .endif post-patch: ${REINPLACE_CMD} -E \ -e 's,\$$\(initroot\),\$$\(initroot\)${PREFIX},g' \ -e 's,/etc/rc.conf,/etc/defaults/rc.conf,g' \ ${WRKSRC}/init/Makefile ${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} -E \ -e 's#-release \$$\(SQLR_VERSION\)##g;' post-configure: @${REINPLACE_CMD} 's,-Werror,,' ${WRKSRC}/config.mk post-stage: .for f in ${TOSTRIP} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${f} .endfor .include Index: head/databases/sqlrelay/Makefile.common =================================================================== --- head/databases/sqlrelay/Makefile.common (revision 385724) +++ head/databases/sqlrelay/Makefile.common (revision 385725) @@ -1,11 +1,11 @@ # $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 SQLRELAY_CONFIGURE_ARGS= \ --localstatedir=/var \ --with-rudiments-prefix="${LOCALBASE}" Index: head/databases/sqlrelay/distinfo =================================================================== --- head/databases/sqlrelay/distinfo (revision 385724) +++ head/databases/sqlrelay/distinfo (revision 385725) @@ -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 Index: head/databases/sqlrelay/files/patch-etc-Makefile =================================================================== --- head/databases/sqlrelay/files/patch-etc-Makefile (revision 385724) +++ head/databases/sqlrelay/files/patch-etc-Makefile (nonexistent) @@ -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 Property changes on: head/databases/sqlrelay/files/patch-etc-Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/sqlrelay/files/patch-Makefile =================================================================== --- head/databases/sqlrelay/files/patch-Makefile (revision 385724) +++ head/databases/sqlrelay/files/patch-Makefile (revision 385725) @@ -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) Index: head/databases/sqlrelay/files/patch-config.mk.in =================================================================== --- head/databases/sqlrelay/files/patch-config.mk.in (revision 385724) +++ head/databases/sqlrelay/files/patch-config.mk.in (revision 385725) @@ -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.) + Index: head/databases/sqlrelay/files/patch-etc_Makefile =================================================================== --- head/databases/sqlrelay/files/patch-etc_Makefile (nonexistent) +++ head/databases/sqlrelay/files/patch-etc_Makefile (revision 385725) @@ -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 + Property changes on: head/databases/sqlrelay/files/patch-etc_Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/sqlrelay/pkg-plist =================================================================== --- head/databases/sqlrelay/pkg-plist (revision 385724) +++ head/databases/sqlrelay/pkg-plist (revision 385725) @@ -1,123 +1,125 @@ bin/sqlr-cachemanager bin/sqlr-connection bin/sqlr-export bin/sqlr-fields bin/sqlr-import bin/sqlr-listener bin/sqlr-pwdenc bin/sqlr-query bin/sqlr-scaler bin/sqlr-start bin/sqlr-status bin/sqlr-stop bin/sqlrclient-config bin/sqlrclientwrapper-config bin/sqlrserver-config bin/sqlrsh etc/rc.d/sqlrcachemanager etc/rc.d/sqlrelay @sample etc/sqlrelay/conf.sample etc/sqlrelay/sqlrelay.dtd 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 include/sqlrelay/private/sqlrcursor.h include/sqlrelay/private/sqlrdefines.h include/sqlrelay/private/sqlrincludes.h include/sqlrelay/private/sqlrlistener.h include/sqlrelay/private/sqlrserverconnection.h include/sqlrelay/private/sqlrservercontroller.h include/sqlrelay/private/sqlrservercursor.h include/sqlrelay/private/sqlrserverdll.h include/sqlrelay/private/sqlrserverincludes.h include/sqlrelay/private/sqlrshmdata.h include/sqlrelay/private/sqlrutildll.h include/sqlrelay/private/wrapperdll.h include/sqlrelay/sqlrclient.h 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 %%FREETDS%%libexec/sqlrelay/sqlrconnection_freetds.so %%MYSQL%%libexec/sqlrelay/sqlrconnection_mysql.so %%ODBC%%libexec/sqlrelay/sqlrconnection_odbc.so %%PGSQL%%libexec/sqlrelay/sqlrconnection_postgresql.so %%SQLITE3%%libexec/sqlrelay/sqlrconnection_sqlite.so libexec/sqlrelay/sqlrauth_default.so libexec/sqlrelay/sqlrauth_sqlrelay.so libexec/sqlrelay/sqlrconnection_router.so libexec/sqlrelay/sqlrlogger_custom_nw.so libexec/sqlrelay/sqlrlogger_custom_sc.so libexec/sqlrelay/sqlrlogger_debug.so libexec/sqlrelay/sqlrlogger_slowqueries.so libexec/sqlrelay/sqlrparser_default.so libexec/sqlrelay/sqlrprotocol_sqlrclient.so libexec/sqlrelay/sqlrpwdenc_crypt.so libexec/sqlrelay/sqlrpwdenc_md5.so libexec/sqlrelay/sqlrpwdenc_rot.so libexec/sqlrelay/sqlrquery_sqlrcmdcstat.so libexec/sqlrelay/sqlrquery_sqlrcmdgstat.so man/man1/sqlr-fields.1.gz man/man1/sqlr-query.1.gz man/man1/sqlrsh.1.gz man/man8/sqlr-cachemanager.8.gz man/man8/sqlr-connection.8.gz man/man8/sqlr-listener.8.gz man/man8/sqlr-scaler.8.gz 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 @dir /var/sqlrelay/tmp/ipc @dir /var/sqlrelay/tmp @dir /var/sqlrelay/log @dir /var/sqlrelay/debug @dir /var/sqlrelay/cache @dir /var/sqlrelay