Index: head/databases/sqlrelay/Makefile =================================================================== --- head/databases/sqlrelay/Makefile (revision 393724) +++ head/databases/sqlrelay/Makefile (revision 393725) @@ -1,142 +1,157 @@ # 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 +LICENSE= LGPL20 + 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-nodejs \ --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/libsqlrodbc-${SQLRELAY_PORTVERSION}.so.1.0.0 \ lib/libsqlrutil-${SQLRELAY_PORTVERSION}.so.1.0.0 \ lib/libsqlrclient-${SQLRELAY_PORTVERSION}.so.1.0.0 \ lib/libsqlrclientwrapper-${SQLRELAY_PORTVERSION}.so.1.0.0 \ lib/libpqsqlrelay-${SQLRELAY_PORTVERSION}.so.1.0.0 \ lib/libmysql3sqlrelay-${SQLRELAY_PORTVERSION}.so.1.0.0 \ lib/libmysql40sqlrelay-${SQLRELAY_PORTVERSION}.so.1.0.0 \ lib/libmysql41sqlrelay-${SQLRELAY_PORTVERSION}.so.1.0.0 \ lib/libmysql50sqlrelay-${SQLRELAY_PORTVERSION}.so.1.0.0 \ lib/libmysql51sqlrelay-${SQLRELAY_PORTVERSION}.so.1.0.0 \ lib/libsqlrserver-${SQLRELAY_PORTVERSION}.so.1.0.0 \ - libexec/sqlrelay/sqlrauth_default.so \ + libexec/sqlrelay/sqlrauth_database.so \ libexec/sqlrelay/sqlrauth_sqlrelay.so \ + libexec/sqlrelay/sqlrauth_userlist.so \ libexec/sqlrelay/sqlrconnection_router.so \ + libexec/sqlrelay/sqlrfilter_patterns.so \ + libexec/sqlrelay/sqlrfilter_regex.so \ + libexec/sqlrelay/sqlrfilter_string.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 + libexec/sqlrelay/sqlrquery_sqlrcmdgstat.so \ + libexec/sqlrelay/sqlrresultsettranslation_reformatdatetime.so \ + libexec/sqlrelay/sqlrtranslation_normalize.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}" +TOSTRIP+= libexec/sqlrelay/sqlrconnection_sqlite.so .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}" +TOSTRIP+= libexec/sqlrelay/sqlrconnection_firebird.so .else CONFIGURE_ARGS+= --disable-firebird .endif .if ${PORT_OPTIONS:MPGSQL} USES+= pgsql CONFIGURE_ARGS+= --with-postgresql-prefix="${LOCALBASE}" +TOSTRIP+= libexec/sqlrelay/sqlrconnection_postgresql.so .else CONFIGURE_ARGS+= --disable-postgresql .endif .if ${PORT_OPTIONS:MODBC} LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC CONFIGURE_ARGS+= --with-odbc-prefix="${LOCALBASE}" +TOSTRIP+= libexec/sqlrelay/sqlrconnection_odbc.so .else CONFIGURE_ARGS+= --disable-odbc .endif .if ${PORT_OPTIONS:MFREETDS} -LIB_DEPENDS+= libtds.so:${PORTSDIR}/databases/freetds +LIB_DEPENDS+= libtdsodbc.so:${PORTSDIR}/databases/freetds CONFIGURE_ARGS+= --with-freetds-prefix="${LOCALBASE}" +TOSTRIP+= libexec/sqlrelay/sqlrconnection_freetds.so .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 393724) +++ head/databases/sqlrelay/Makefile.common (revision 393725) @@ -1,11 +1,11 @@ # $FreeBSD$ SQLRELAY_PORTNAME= sqlrelay -SQLRELAY_PORTVERSION= 0.60 +SQLRELAY_PORTVERSION= 0.62 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 393724) +++ head/databases/sqlrelay/distinfo (revision 393725) @@ -1,2 +1,2 @@ -SHA256 (sqlrelay-0.60.tar.gz) = aa7dc9a11d99d51f4104ee0e5d5040b1bb16034878303336aec75933d12ce06a -SIZE (sqlrelay-0.60.tar.gz) = 3224288 +SHA256 (sqlrelay-0.62.tar.gz) = fd4f590ce73aef39030a7a37984b25c8235ae5a04050a7b9c43ec73e791d7d93 +SIZE (sqlrelay-0.62.tar.gz) = 3462899 Index: head/databases/sqlrelay/files/patch-Makefile =================================================================== --- head/databases/sqlrelay/files/patch-Makefile (revision 393724) +++ head/databases/sqlrelay/files/patch-Makefile (revision 393725) @@ -1,19 +1,32 @@ ---- Makefile.orig 2015-03-31 20:50:58 UTC +--- Makefile.orig 2015-08-05 21:07:34 UTC +++ Makefile -@@ -30,11 +30,11 @@ install-doc: +@@ -30,16 +30,13 @@ install-doc: cd doc $(AND) $(MAKE) install + install-license: +- $(MKINSTALLDIRS) $(licensedir) +- $(CP) COPYING $(licensedir) +- $(CHMOD) 0644 $(licensedir)/COPYING + install-pkgconfig: - $(MKINSTALLDIRS) $(libdir)/pkgconfig -- $(CP) sqlrelay-c.pc $(libdir)/pkgconfig/sqlrelay-c.pc +- $(CP) sqlrelay-c.pc $(libdir)/pkgconfig - $(CHMOD) 0644 $(libdir)/pkgconfig/sqlrelay-c.pc -- $(CP) sqlrelay-c++.pc $(libdir)/pkgconfig/sqlrelay-c++.pc +- $(CP) sqlrelay-c++.pc $(libdir)/pkgconfig - $(CHMOD) 0644 $(libdir)/pkgconfig/sqlrelay-c++.pc + $(MKINSTALLDIRS) $(prefix)/libdata/pkgconfig + $(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: $(UNINSTALLSUBDIRS) $(RMTREE) $(libexecdir) +@@ -63,7 +60,6 @@ uninstall-doc: + cd doc $(AND) $(MAKE) uninstall + + uninstall-license: +- $(RMTREE) $(licensedir) + + uninstall-pkgconfig: + $(RM) $(libdir)/pkgconfig/sqlrelay-c.pc \ Index: head/databases/sqlrelay/pkg-plist =================================================================== --- head/databases/sqlrelay/pkg-plist (revision 393724) +++ head/databases/sqlrelay/pkg-plist (revision 393725) @@ -1,125 +1,130 @@ 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-0.60.so.1 -lib/libmysql3sqlrelay-0.60.so.1.0.0 +lib/libmysql3sqlrelay-0.62.so.1 +lib/libmysql3sqlrelay-0.62.so.1.0.0 lib/libmysql40sqlrelay.so -lib/libmysql40sqlrelay-0.60.so.1 -lib/libmysql40sqlrelay-0.60.so.1.0.0 +lib/libmysql40sqlrelay-0.62.so.1 +lib/libmysql40sqlrelay-0.62.so.1.0.0 lib/libmysql41sqlrelay.so -lib/libmysql41sqlrelay-0.60.so.1 -lib/libmysql41sqlrelay-0.60.so.1.0.0 +lib/libmysql41sqlrelay-0.62.so.1 +lib/libmysql41sqlrelay-0.62.so.1.0.0 lib/libmysql50sqlrelay.so -lib/libmysql50sqlrelay-0.60.so.1 -lib/libmysql50sqlrelay-0.60.so.1.0.0 +lib/libmysql50sqlrelay-0.62.so.1 +lib/libmysql50sqlrelay-0.62.so.1.0.0 lib/libmysql51sqlrelay.so -lib/libmysql51sqlrelay-0.60.so.1 -lib/libmysql51sqlrelay-0.60.so.1.0.0 +lib/libmysql51sqlrelay-0.62.so.1 +lib/libmysql51sqlrelay-0.62.so.1.0.0 lib/libpqsqlrelay.so -lib/libpqsqlrelay-0.60.so.1 -lib/libpqsqlrelay-0.60.so.1.0.0 +lib/libpqsqlrelay-0.62.so.1 +lib/libpqsqlrelay-0.62.so.1.0.0 lib/libsqlrclient.a lib/libsqlrclient.so -lib/libsqlrclient-0.60.so.1 -lib/libsqlrclient-0.60.so.1.0.0 +lib/libsqlrclient-0.62.so.1 +lib/libsqlrclient-0.62.so.1.0.0 lib/libsqlrclientwrapper.a lib/libsqlrclientwrapper.so -lib/libsqlrclientwrapper-0.60.so.1 -lib/libsqlrclientwrapper-0.60.so.1.0.0 -%%ODBC%%lib/libsqlrodbc.a +lib/libsqlrclientwrapper-0.62.so.1 +lib/libsqlrclientwrapper-0.62.so.1.0.0 %%ODBC%%lib/libsqlrodbc.so -%%ODBC%%lib/libsqlrodbc-0.60.so.1 -%%ODBC%%lib/libsqlrodbc-0.60.so.1.0.0 +%%ODBC%%lib/libsqlrodbc-0.62.so.1 +%%ODBC%%lib/libsqlrodbc-0.62.so.1.0.0 lib/libsqlrserver.a lib/libsqlrserver.so -lib/libsqlrserver-0.60.so.1 -lib/libsqlrserver-0.60.so.1.0.0 +lib/libsqlrserver-0.62.so.1 +lib/libsqlrserver-0.62.so.1.0.0 lib/libsqlrutil.a lib/libsqlrutil.so -lib/libsqlrutil-0.60.so.1 -lib/libsqlrutil-0.60.so.1.0.0 +lib/libsqlrutil-0.62.so.1 +lib/libsqlrutil-0.62.so.1.0.0 libdata/pkgconfig/sqlrelay-c++.pc libdata/pkgconfig/sqlrelay-c.pc +libexec/sqlrelay/sqlrauth_database.so +libexec/sqlrelay/sqlrauth_userlist.so +libexec/sqlrelay/sqlrfilter_patterns.so +libexec/sqlrelay/sqlrfilter_regex.so +libexec/sqlrelay/sqlrfilter_string.so +libexec/sqlrelay/sqlrresultsettranslation_reformatdatetime.so +libexec/sqlrelay/sqlrtranslation_normalize.so %%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