Index: head/databases/sqlrelay/Makefile =================================================================== --- head/databases/sqlrelay/Makefile (revision 460937) +++ head/databases/sqlrelay/Makefile (revision 460938) @@ -1,171 +1,165 @@ # Created by: Akinori MUSHA aka knu # $FreeBSD$ PORTNAME= ${SQLRELAY_PORTNAME} PORTVERSION= ${SQLRELAY_PORTVERSION} -PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= SF MAINTAINER= pi@FreeBSD.org COMMENT= Persistent DB connection pooling/proxying/load balancing system LICENSE= LGPL20 LIB_DEPENDS= librudiments.so:devel/rudiments \ libkrb5.so:security/krb5 \ libcurl.so:ftp/curl USES= gmake libtool pathfix python readline PATHFIX_MAKEFILEIN= Makefile CPPFLAGS+= -I${LOCALBASE}/include GNU_CONFIGURE= yes CONFIGURE_ARGS= ${SQLRELAY_CONFIGURE_ARGS} \ --disable-tcl \ --disable-java \ --disable-nodejs \ --disable-perl \ --disable-php \ --disable-python \ --disable-python3 \ --disable-ruby \ --disable-erlang 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.so.4.0.0 \ - lib/libsqlrutil.so.4.0.0 \ + lib/libsqlrutil.so.6.0.0 \ lib/libsqlrclient.so.4.0.0 \ lib/libsqlrclientwrapper.so.4.0.0 \ lib/libpqsqlrelay.so.4.0.0 \ lib/libmysql3sqlrelay.so.4.0.0 \ lib/libmysql40sqlrelay.so.4.0.0 \ lib/libmysql41sqlrelay.so.4.0.0 \ lib/libmysql50sqlrelay.so.4.0.0 \ lib/libmysql51sqlrelay.so.4.0.0 \ - lib/libsqlrserver.so.4.0.0 \ + lib/libsqlrserver.so.6.0.0 \ libexec/sqlrelay/sqlrauth_database.so \ - libexec/sqlrelay/sqlrauth_krb_userlist.so \ libexec/sqlrelay/sqlrauth_proxied.so \ libexec/sqlrelay/sqlrauth_sqlrelay.so \ - libexec/sqlrelay/sqlrauth_tls_userlist.so \ libexec/sqlrelay/sqlrauth_userlist.so \ - libexec/sqlrelay/sqlrconfig_xml.so \ libexec/sqlrelay/sqlrconfig_xmldom.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/sqlrnotification_events.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/sqlrresultsettranslation_reformatdatetime.so \ libexec/sqlrelay/sqlrresultsettranslation_test.so \ libexec/sqlrelay/sqlrrouter_clientiplist.so \ libexec/sqlrelay/sqlrrouter_regex.so \ libexec/sqlrelay/sqlrrouter_userlist.so \ libexec/sqlrelay/sqlrschedule_cron_userlist.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:databases/gdbm \ libsqlite3.so:databases/sqlite3 CONFIGURE_ARGS+= --with-gdbm-prefix="${LOCALBASE}" \ --with-sqlite-prefix="${LOCALBASE}" TOSTRIP+= libexec/sqlrelay/sqlrconnection_sqlite.so .else CONFIGURE_ARGS+= --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} USES+= firebird 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: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+= libtdsodbc.so: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-install: .for f in ${TOSTRIP} -${STRIP_CMD} ${STAGEDIR}${PREFIX}/${f} .endfor ${RM} ${STAGEDIR}${PREFIX}/lib/SQLRClient.dll ${RM} ${STAGEDIR}${PREFIX}/lib/SQLRClient.dll.config .include Index: head/databases/sqlrelay/Makefile.common =================================================================== --- head/databases/sqlrelay/Makefile.common (revision 460937) +++ head/databases/sqlrelay/Makefile.common (revision 460938) @@ -1,11 +1,11 @@ # $FreeBSD$ SQLRELAY_PORTNAME= sqlrelay -SQLRELAY_PORTVERSION= 1.1.0 +SQLRELAY_PORTVERSION= 1.2.0 SQLRELAY_PORTDIR= databases/${SQLRELAY_PORTNAME} SQLRELAY_WRKSRC_CMD= cd ${PORTSDIR}/${SQLRELAY_PORTDIR} && ${MAKE} -V WRKSRC SQLRELAY_CONFIGURE_ARGS= \ --localstatedir=/var \ --with-rudiments-prefix="${LOCALBASE}" Index: head/databases/sqlrelay/distinfo =================================================================== --- head/databases/sqlrelay/distinfo (revision 460937) +++ head/databases/sqlrelay/distinfo (revision 460938) @@ -1,3 +1,3 @@ -TIMESTAMP = 1496516419 -SHA256 (sqlrelay-1.1.0.tar.gz) = 38b0a4c283ef839be8a8bddce470cfb904e710fd9e1732770d4fa8cae3ac2713 -SIZE (sqlrelay-1.1.0.tar.gz) = 4388952 +TIMESTAMP = 1517740275 +SHA256 (sqlrelay-1.2.0.tar.gz) = 535e3c09819b48c5a5d8a51000bd8f549cfd5ee30024953d58176c1cf34a2988 +SIZE (sqlrelay-1.2.0.tar.gz) = 4421537 Index: head/databases/sqlrelay/pkg-plist =================================================================== --- head/databases/sqlrelay/pkg-plist (revision 460937) +++ head/databases/sqlrelay/pkg-plist (revision 460938) @@ -1,160 +1,154 @@ bin/sqlr-cachemanager bin/sqlr-connection bin/sqlr-export bin/sqlr-import bin/sqlr-listener bin/sqlr-pwdenc 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.xsd include/sqlrelay/private/sqlrauth.h include/sqlrelay/private/sqlrauths.h include/sqlrelay/private/sqlrclientincludes.h include/sqlrelay/private/sqlrclientwrapper.h include/sqlrelay/private/sqlrclientwrapperincludes.h include/sqlrelay/private/sqlrconnection.h include/sqlrelay/private/sqlrcursor.h include/sqlrelay/private/sqlrfilter.h include/sqlrelay/private/sqlrfilters.h include/sqlrelay/private/sqlrgsscredentials.h include/sqlrelay/private/sqlrlistener.h include/sqlrelay/private/sqlrlogger.h include/sqlrelay/private/sqlrloggers.h include/sqlrelay/private/sqlrnotification.h include/sqlrelay/private/sqlrnotifications.h include/sqlrelay/private/sqlrparser.h include/sqlrelay/private/sqlrprotocol.h include/sqlrelay/private/sqlrprotocols.h include/sqlrelay/private/sqlrpwdenc.h include/sqlrelay/private/sqlrpwdencs.h include/sqlrelay/private/sqlrqueries.h include/sqlrelay/private/sqlrquery.h include/sqlrelay/private/sqlrquerycursor.h include/sqlrelay/private/sqlrresultsetrowtranslation.h include/sqlrelay/private/sqlrresultsetrowtranslations.h include/sqlrelay/private/sqlrresultsettranslation.h include/sqlrelay/private/sqlrresultsettranslations.h include/sqlrelay/private/sqlrrouter.h include/sqlrelay/private/sqlrrouters.h include/sqlrelay/private/sqlrschedule.h include/sqlrelay/private/sqlrschedulerule.h include/sqlrelay/private/sqlrschedules.h include/sqlrelay/private/sqlrserverconnection.h include/sqlrelay/private/sqlrservercontroller.h include/sqlrelay/private/sqlrservercursor.h include/sqlrelay/private/sqlrserverincludes.h include/sqlrelay/private/sqlrshm.h include/sqlrelay/private/sqlrtlscredentials.h include/sqlrelay/private/sqlrtranslation.h include/sqlrelay/private/sqlrtranslations.h include/sqlrelay/private/sqlrtrigger.h include/sqlrelay/private/sqlrtriggers.h include/sqlrelay/private/sqlruserpasswordcredentials.h include/sqlrelay/private/sqlrutilincludes.h include/sqlrelay/sqlrclient.h include/sqlrelay/sqlrclientwrapper.h include/sqlrelay/sqlrserver.h include/sqlrelay/sqlrutil.h -%%MYSQL%%lib/libmysql3sqlrelay.so %%MYSQL%%lib/libmysql3sqlrelay.so.4 %%MYSQL%%lib/libmysql3sqlrelay.so.4.0.0 -%%MYSQL%%lib/libmysql40sqlrelay.so %%MYSQL%%lib/libmysql40sqlrelay.so.4 %%MYSQL%%lib/libmysql40sqlrelay.so.4.0.0 -%%MYSQL%%lib/libmysql41sqlrelay.so %%MYSQL%%lib/libmysql41sqlrelay.so.4 %%MYSQL%%lib/libmysql41sqlrelay.so.4.0.0 -%%MYSQL%%lib/libmysql50sqlrelay.so %%MYSQL%%lib/libmysql50sqlrelay.so.4 %%MYSQL%%lib/libmysql50sqlrelay.so.4.0.0 -%%MYSQL%%lib/libmysql51sqlrelay.so %%MYSQL%%lib/libmysql51sqlrelay.so.4 %%MYSQL%%lib/libmysql51sqlrelay.so.4.0.0 -%%PGSQL%%lib/libpqsqlrelay.so lib/libpqsqlrelay.so.4 lib/libpqsqlrelay.so.4.0.0 lib/libsqlrclient.a lib/libsqlrclient.so lib/libsqlrclient.so.4 lib/libsqlrclient.so.4.0.0 lib/libsqlrclientwrapper.a lib/libsqlrclientwrapper.so lib/libsqlrclientwrapper.so.4 lib/libsqlrclientwrapper.so.4.0.0 %%ODBC%%lib/libsqlrodbc.so %%ODBC%%lib/libsqlrodbc.so.4 -%%ODBC%%lib/libsqlrodbc.so.4.0.1 +%%ODBC%%lib/libsqlrodbc.so.4.0.0 lib/libsqlrserver.a lib/libsqlrserver.so -lib/libsqlrserver.so.5 -lib/libsqlrserver.so.5.0.0 +lib/libsqlrserver.so.6 +lib/libsqlrserver.so.6.0.0 lib/libsqlrutil.a lib/libsqlrutil.so -lib/libsqlrutil.so.5 -lib/libsqlrutil.so.5.0.0 +lib/libsqlrutil.so.6 +lib/libsqlrutil.so.6.0.0 libdata/pkgconfig/sqlrelay-c++.pc libdata/pkgconfig/sqlrelay-c.pc libexec/sqlrelay/sqlrauth_database.so libexec/sqlrelay/sqlrauth_proxied.so libexec/sqlrelay/sqlrauth_sqlrelay.so libexec/sqlrelay/sqlrauth_userlist.so libexec/sqlrelay/sqlrconfig_xmldom.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/sqlrnotification_events.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/sqlrresultsettranslation_test.so libexec/sqlrelay/sqlrresultsettranslation_reformatdatetime.so libexec/sqlrelay/sqlrrouter_clientinfolist.so libexec/sqlrelay/sqlrrouter_clientiplist.so libexec/sqlrelay/sqlrrouter_regex.so libexec/sqlrelay/sqlrrouter_usedatabase.so libexec/sqlrelay/sqlrrouter_userlist.so libexec/sqlrelay/sqlrschedule_cron_userlist.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 man/man1/sqlr-export.1.gz man/man1/sqlr-import.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-pwdenc.8.gz man/man8/sqlr-scaler.8.gz man/man8/sqlr-start.8.gz man/man8/sqlr-status.8.gz man/man8/sqlr-stop.8.gz %%DATADIR%%/examples/sqlrelay.conf %%DATADIR%%/examples/sample-mssqlserver-mysql-errors.map %%DATADIR%%/examples/sample-oracle-mysql-errors.map @dir %%ETCDIR%% @dir /var/cache/sqlrelay @dir /var/log/sqlrelay/debug @dir /var/log/sqlrelay @dir /var/run/sqlrelay