Date: Wed, 31 Dec 2014 12:33:37 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r375880 - in head/databases/sqlrelay: . files Message-ID: <201412311233.sBVCXbg7020105@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Wed Dec 31 12:33:36 2014 New Revision: 375880 URL: https://svnweb.freebsd.org/changeset/ports/375880 QAT: https://qat.redports.org/buildarchive/r375880/ Log: databases/sqlrelay: 0.56 -> 0.58 Changes: http://software.firstworks.com/2014/10/sql-relay-057-is-out.html http://software.firstworks.com/2014/12/sql-relay-058-is-out.html PR: 196366 Added: head/databases/sqlrelay/files/patch-etc-Makefile (contents, props changed) Modified: head/databases/sqlrelay/Makefile head/databases/sqlrelay/Makefile.common head/databases/sqlrelay/distinfo head/databases/sqlrelay/files/patch-config.mk.in head/databases/sqlrelay/pkg-plist Modified: head/databases/sqlrelay/Makefile ============================================================================== --- head/databases/sqlrelay/Makefile Wed Dec 31 12:29:32 2014 (r375879) +++ head/databases/sqlrelay/Makefile Wed Dec 31 12:33:36 2014 (r375880) @@ -3,7 +3,6 @@ PORTNAME= ${SQLRELAY_PORTNAME} PORTVERSION= ${SQLRELAY_PORTVERSION} -PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= SF @@ -32,6 +31,7 @@ USE_LDCONFIG= yes PORTDOCS= * TOSTRIP= bin/sqlr-start \ + bin/sqlr-stop \ bin/sqlr-listener \ bin/sqlr-connection \ bin/sqlr-scaler \ @@ -53,18 +53,20 @@ TOSTRIP= bin/sqlr-start \ lib/libmysql50sqlrelay.so.1.0.0 \ lib/libmysql51sqlrelay.so.1.0.0 \ lib/libsqlrserver.so.1.0.0 \ - libexec/sqlrelay/sqlrquery_sqlrcmdgstat.so \ - libexec/sqlrelay/sqlrquery_sqlrcmdcstat.so \ - libexec/sqlrelay/sqlrlogger_debug.so \ - libexec/sqlrelay/sqlrlogger_slowqueries.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/sqlrpwdenc_rot.so \ - libexec/sqlrelay/sqlrpwdenc_md5.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/sqlrauth_default.so \ - libexec/sqlrelay/sqlrauth_sqlrelay.so \ - libexec/sqlrelay/sqlrconnection_router.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" @@ -126,7 +128,6 @@ post-patch: -e 's,\$$\(initroot\),\$$\(initroot\)${PREFIX},g' \ -e 's,/etc/rc.conf,/etc/defaults/rc.conf,g' \ ${WRKSRC}/init/Makefile - @${REINPLACE_CMD} -e '/EXAMPLEDIR/d' ${WRKSRC}/etc/Makefile ${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} -E \ -e 's#-release \$$\(SQLR_VERSION\)##g;' Modified: head/databases/sqlrelay/Makefile.common ============================================================================== --- head/databases/sqlrelay/Makefile.common Wed Dec 31 12:29:32 2014 (r375879) +++ head/databases/sqlrelay/Makefile.common Wed Dec 31 12:33:36 2014 (r375880) @@ -1,7 +1,7 @@ # $FreeBSD$ SQLRELAY_PORTNAME= sqlrelay -SQLRELAY_PORTVERSION= 0.56 +SQLRELAY_PORTVERSION= 0.58 SQLRELAY_PORTDIR= ${PORTSDIR}/databases/${SQLRELAY_PORTNAME} SQLRELAY_WRKSRC_CMD= cd ${SQLRELAY_PORTDIR} && ${MAKE} -V WRKSRC Modified: head/databases/sqlrelay/distinfo ============================================================================== --- head/databases/sqlrelay/distinfo Wed Dec 31 12:29:32 2014 (r375879) +++ head/databases/sqlrelay/distinfo Wed Dec 31 12:33:36 2014 (r375880) @@ -1,2 +1,2 @@ -SHA256 (sqlrelay-0.56.tar.gz) = 3dca390fb434d7116fc443e23578c7cf2101be29169ec088640f15775ad8d391 -SIZE (sqlrelay-0.56.tar.gz) = 3717761 +SHA256 (sqlrelay-0.58.tar.gz) = f8c55929c58edbf2925eba7d0af3f01c8a5993b23780d4d1755e6bb26b8155a6 +SIZE (sqlrelay-0.58.tar.gz) = 3719333 Modified: head/databases/sqlrelay/files/patch-config.mk.in ============================================================================== --- head/databases/sqlrelay/files/patch-config.mk.in Wed Dec 31 12:29:32 2014 (r375879) +++ head/databases/sqlrelay/files/patch-config.mk.in Wed Dec 31 12:33:36 2014 (r375880) @@ -1,5 +1,5 @@ ---- config.mk.in.orig 2013-09-22 03:52:29.000000000 +0200 -+++ config.mk.in 2013-10-28 18:58:41.039873864 +0100 +--- 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 @@ exec_prefix= @exec_prefix@ includedir = @includedir@ @@ -9,3 +9,12 @@ libexecdir = @libexecdir@/sqlrelay bindir = @bindir@ localstatedir = @localstatedir@ +@@ -33,7 +33,7 @@ + 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\" + CACHEDIRCPPFLAG = -DCACHE_DIR=\"$(cachedir)\" + + # link flags (-s, -static, -melf, -belf, etc.) Added: head/databases/sqlrelay/files/patch-etc-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/sqlrelay/files/patch-etc-Makefile Wed Dec 31 12:33:36 2014 (r375880) @@ -0,0 +1,18 @@ +--- 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 Modified: head/databases/sqlrelay/pkg-plist ============================================================================== --- head/databases/sqlrelay/pkg-plist Wed Dec 31 12:29:32 2014 (r375879) +++ head/databases/sqlrelay/pkg-plist Wed Dec 31 12:33:36 2014 (r375880) @@ -1,4 +1,3 @@ -bin/backupschema bin/sqlr-cachemanager bin/sqlr-connection bin/sqlr-export @@ -17,10 +16,9 @@ bin/sqlrserver-config bin/sqlrsh etc/rc.d/sqlrcachemanager etc/rc.d/sqlrelay -etc/sqlrelay -etc/sqlrelay.conf.example -etc/sqlrelay.dtd -etc/sqlrelay.xsd +@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 @@ -30,10 +28,19 @@ include/sqlrelay/private/sqlrconnection. 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/sqlrpwdenc.h +include/sqlrelay/sqlrserver.h +include/sqlrelay/sqlrutil.h lib/libmysql3sqlrelay.so lib/libmysql3sqlrelay.so.1 lib/libmysql3sqlrelay.so.1.0.0 @@ -87,6 +94,8 @@ 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 @@ -97,13 +106,13 @@ 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-ipclean.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 +@dir %%ETCDIR%% @dir /var/sqlrelay/tmp/sockets @dir /var/sqlrelay/tmp/pids @dir /var/sqlrelay/tmp/ipc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412311233.sBVCXbg7020105>