diff options
24 files changed, 381 insertions, 201 deletions
diff --git a/databases/ruby-sqlrelay/Makefile b/databases/ruby-sqlrelay/Makefile index bec0153c68c..15bbeebde68 100644 --- a/databases/ruby-sqlrelay/Makefile +++ b/databases/ruby-sqlrelay/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2014/05/22 12:50:47 fhajny Exp $ +# $NetBSD: Makefile,v 1.2 2015/05/20 13:26:45 ryoon Exp $ COMMENT= Ruby extension for SQL Relay @@ -6,7 +6,6 @@ COMMENT= Ruby extension for SQL Relay CONFIGURE_ARGS+= ac_cv_prog_RUBY=${RUBY} CONFIGURE_ARGS+= --with-ruby-site-arch-dir=${PREFIX}/${RUBY_VENDORARCHLIB} -CONFIGURE_ARGS+= --with-ruby-site-lib-dir=${PREFIX}/${RUBY_VENDORLIB} BUILD_DIRS= src/api/ruby diff --git a/databases/ruby-sqlrelay/PLIST b/databases/ruby-sqlrelay/PLIST index 1978407bfb9..37dfeac3560 100644 --- a/databases/ruby-sqlrelay/PLIST +++ b/databases/ruby-sqlrelay/PLIST @@ -1,4 +1,2 @@ -@comment $NetBSD: PLIST,v 1.1 2014/05/22 12:50:47 fhajny Exp $ -${RUBY_VENDORLIB}/DBD/SQLRelay/SQLRelay.rb -${RUBY_VENDORLIB}/dbd/SQLRelay.rb +@comment $NetBSD: PLIST,v 1.2 2015/05/20 13:26:45 ryoon Exp $ ${RUBY_VENDORARCHLIB}/sqlrelay.${RUBY_DLEXT} diff --git a/databases/sqlrelay-freetds/Makefile b/databases/sqlrelay-freetds/Makefile index 78c168d0440..b35c9f941b2 100644 --- a/databases/sqlrelay-freetds/Makefile +++ b/databases/sqlrelay-freetds/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2014/05/22 12:50:48 fhajny Exp $ +# $NetBSD: Makefile,v 1.2 2015/05/20 13:26:45 ryoon Exp $ PKGNAME= ${DISTNAME:S/sqlrelay/sqlrelay-freetds/} COMMENT= FreeTDS support for SQL Relay @@ -6,8 +6,19 @@ COMMENT= FreeTDS support for SQL Relay .include "../../databases/sqlrelay/Makefile.common" CONFIGURE_ARGS+= --with-freetds-prefix=${BUILDLINK_PREFIX.freetds} +CONFIGURE_ARGS+= --disable-postgresql +CONFIGURE_ARGS+= --disable-sqlite +CONFIGURE_ARGS+= --disable-mysql +CONFIGURE_ARGS+= --disable-odbc -BUILD_DIRS= src/connections/freetds +BUILD_DIRS= src/connections + +INSTALLATION_DIRS+= libexec/sqlrelay + +do-install: + ${LIBTOOL} --mode=install ${INSTALL_LIB} \ + ${WRKSRC}/${BUILD_DIRS}/sqlrconnection_freetds.la \ + ${DESTDIR}${PREFIX}/libexec/sqlrelay .include "../../databases/freetds/buildlink3.mk" .include "../../databases/sqlrelay/buildlink3.mk" diff --git a/databases/sqlrelay-freetds/PLIST b/databases/sqlrelay-freetds/PLIST index 3babeb289f3..a8828325c24 100644 --- a/databases/sqlrelay-freetds/PLIST +++ b/databases/sqlrelay-freetds/PLIST @@ -1,2 +1,2 @@ -@comment $NetBSD: PLIST,v 1.1 2014/05/22 12:50:48 fhajny Exp $ -libexec/sqlrelay/sqlrconnection_freetds.so +@comment $NetBSD: PLIST,v 1.2 2015/05/20 13:26:45 ryoon Exp $ +libexec/sqlrelay/sqlrconnection_freetds.la diff --git a/databases/sqlrelay-mysql/Makefile b/databases/sqlrelay-mysql/Makefile index dc522ddc564..03c067935c9 100644 --- a/databases/sqlrelay-mysql/Makefile +++ b/databases/sqlrelay-mysql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2014/05/22 12:50:48 fhajny Exp $ +# $NetBSD: Makefile,v 1.2 2015/05/20 13:26:45 ryoon Exp $ PKGNAME= ${DISTNAME:S/sqlrelay/sqlrelay-mysql/} COMMENT= MySQL support for SQL Relay @@ -8,8 +8,19 @@ COMMENT= MySQL support for SQL Relay LICENSE= gnu-gpl-v2 CONFIGURE_ARGS+= --with-mysql-prefix=${BUILDLINK_PREFIX.mysql-client} +CONFIGURE_ARGS+= --disable-postgresql +CONFIGURE_ARGS+= --disable-sqlite +CONFIGURE_ARGS+= --disable-freetds +CONFIGURE_ARGS+= --disable-odbc -BUILD_DIRS= src/connections/mysql +BUILD_DIRS= src/connections + +INSTALLATION_DIRS+= libexec/sqlrelay + +do-install: + ${LIBTOOL} --mode=install ${INSTALL_LIB} \ + ${WRKSRC}/${BUILD_DIRS}/sqlrconnection_mysql.la \ + ${DESTDIR}${PREFIX}/libexec/sqlrelay .include "../../databases/sqlrelay/buildlink3.mk" .include "../../mk/mysql.buildlink3.mk" diff --git a/databases/sqlrelay-mysql/PLIST b/databases/sqlrelay-mysql/PLIST index 79d2d7fd810..3c0bab58086 100644 --- a/databases/sqlrelay-mysql/PLIST +++ b/databases/sqlrelay-mysql/PLIST @@ -1,2 +1,2 @@ -@comment $NetBSD: PLIST,v 1.1 2014/05/22 12:50:48 fhajny Exp $ -libexec/sqlrelay/sqlrconnection_mysql.so +@comment $NetBSD: PLIST,v 1.2 2015/05/20 13:26:45 ryoon Exp $ +libexec/sqlrelay/sqlrconnection_mysql.la diff --git a/databases/sqlrelay-odbc/Makefile b/databases/sqlrelay-odbc/Makefile index 1b9b708a331..6bedf60baad 100644 --- a/databases/sqlrelay-odbc/Makefile +++ b/databases/sqlrelay-odbc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2015/04/26 11:52:19 ryoon Exp $ +# $NetBSD: Makefile,v 1.4 2015/05/20 13:26:45 ryoon Exp $ PKGNAME= ${DISTNAME:S/sqlrelay/sqlrelay-odbc/} PKGREVISION= 1 @@ -9,8 +9,19 @@ COMMENT= ODBC support for SQL Relay LICENSE= gnu-lgpl-v2 CONFIGURE_ARGS+= --with-odbc-prefix=${BUILDLINK_PREFIX.unixodbc} +CONFIGURE_ARGS+= --disable-postgresql +CONFIGURE_ARGS+= --disable-sqlite +CONFIGURE_ARGS+= --disable-freetds +CONFIGURE_ARGS+= --disable-mysql -BUILD_DIRS= src/connections/odbc +BUILD_DIRS= src/connections + +INSTALLATION_DIRS+= libexec/sqlrelay + +do-install: + ${LIBTOOL} --mode=install ${INSTALL_LIB} \ + ${WRKSRC}/${BUILD_DIRS}/sqlrconnection_odbc.la \ + ${DESTDIR}${PREFIX}/libexec/sqlrelay .include "../../databases/sqlrelay/buildlink3.mk" .include "../../databases/unixodbc/buildlink3.mk" diff --git a/databases/sqlrelay-odbc/PLIST b/databases/sqlrelay-odbc/PLIST index f3090c331ad..f606241d54f 100644 --- a/databases/sqlrelay-odbc/PLIST +++ b/databases/sqlrelay-odbc/PLIST @@ -1,2 +1,2 @@ -@comment $NetBSD: PLIST,v 1.1 2014/05/22 12:50:48 fhajny Exp $ -libexec/sqlrelay/sqlrconnection_odbc.so +@comment $NetBSD: PLIST,v 1.2 2015/05/20 13:26:45 ryoon Exp $ +libexec/sqlrelay/sqlrconnection_odbc.la diff --git a/databases/sqlrelay-pgsql/Makefile b/databases/sqlrelay-pgsql/Makefile index a42db805bf0..458c872077c 100644 --- a/databases/sqlrelay-pgsql/Makefile +++ b/databases/sqlrelay-pgsql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2014/05/22 12:50:48 fhajny Exp $ +# $NetBSD: Makefile,v 1.2 2015/05/20 13:26:45 ryoon Exp $ PKGNAME= ${DISTNAME:S/sqlrelay/sqlrelay-pgsql/} COMMENT= PostgreSQL support for SQL Relay @@ -8,8 +8,19 @@ COMMENT= PostgreSQL support for SQL Relay LICENSE= postgresql-license CONFIGURE_ARGS+= --with-postgresql-prefix=${PGSQL_PREFIX} +CONFIGURE_ARGS+= --disable-mysql +CONFIGURE_ARGS+= --disable-sqlite +CONFIGURE_ARGS+= --disable-freetds +CONFIGURE_ARGS+= --disable-odbc -BUILD_DIRS= src/connections/postgresql +BUILD_DIRS= src/connections + +INSTALLATION_DIRS+= libexec/sqlrelay + +do-install: + ${LIBTOOL} --mode=install ${INSTALL_LIB} \ + ${WRKSRC}/${BUILD_DIRS}/sqlrconnection_postgresql.la \ + ${DESTDIR}${PREFIX}/libexec/sqlrelay .include "../../databases/sqlrelay/buildlink3.mk" .include "../../mk/pgsql.buildlink3.mk" diff --git a/databases/sqlrelay-pgsql/PLIST b/databases/sqlrelay-pgsql/PLIST index e047b821447..ff2b710cdb2 100644 --- a/databases/sqlrelay-pgsql/PLIST +++ b/databases/sqlrelay-pgsql/PLIST @@ -1,2 +1,2 @@ -@comment $NetBSD: PLIST,v 1.1 2014/05/22 12:50:48 fhajny Exp $ -libexec/sqlrelay/sqlrconnection_postgresql.so +@comment $NetBSD: PLIST,v 1.2 2015/05/20 13:26:45 ryoon Exp $ +libexec/sqlrelay/sqlrconnection_postgresql.la diff --git a/databases/sqlrelay-sqlite/Makefile b/databases/sqlrelay-sqlite/Makefile index c1001bc994e..04baf80d016 100644 --- a/databases/sqlrelay-sqlite/Makefile +++ b/databases/sqlrelay-sqlite/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.2 2015/04/06 08:17:24 adam Exp $ +# $NetBSD: Makefile,v 1.3 2015/05/20 13:26:45 ryoon Exp $ PKGNAME= ${DISTNAME:S/sqlrelay/sqlrelay-sqlite/} -PKGREVISION= 1 COMMENT= SQLite support for SQL Relay .include "../../databases/sqlrelay/Makefile.common" @@ -9,8 +8,19 @@ COMMENT= SQLite support for SQL Relay CONFIGURE_ARGS+= --with-sqlite-prefix=${BUILDLINK_PREFIX.sqlite3} # Configure never does this correctly CXXFLAGS+= -DSQLITE3=1 +CONFIGURE_ARGS+= --disable-postgresql +CONFIGURE_ARGS+= --disable-mysql +CONFIGURE_ARGS+= --disable-freetds +CONFIGURE_ARGS+= --disable-odbc -BUILD_DIRS= src/connections/sqlite +BUILD_DIRS= src/connections + +INSTALLATION_DIRS+= libexec/sqlrelay + +do-install: + ${LIBTOOL} --mode=install ${INSTALL_LIB} \ + ${WRKSRC}/${BUILD_DIRS}/sqlrconnection_sqlite.la \ + ${DESTDIR}${PREFIX}/libexec/sqlrelay .include "../../databases/sqlite3/buildlink3.mk" .include "../../databases/sqlrelay/buildlink3.mk" diff --git a/databases/sqlrelay-sqlite/PLIST b/databases/sqlrelay-sqlite/PLIST index ec2781981c0..3a6e575fe36 100644 --- a/databases/sqlrelay-sqlite/PLIST +++ b/databases/sqlrelay-sqlite/PLIST @@ -1,2 +1,2 @@ -@comment $NetBSD: PLIST,v 1.1 2014/05/22 12:50:48 fhajny Exp $ -libexec/sqlrelay/sqlrconnection_sqlite.so +@comment $NetBSD: PLIST,v 1.2 2015/05/20 13:26:45 ryoon Exp $ +libexec/sqlrelay/sqlrconnection_sqlite.la diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile index 91696f7e520..340bf5e878f 100644 --- a/databases/sqlrelay/Makefile +++ b/databases/sqlrelay/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2014/11/29 00:47:35 joerg Exp $ +# $NetBSD: Makefile,v 1.41 2015/05/20 13:26:45 ryoon Exp $ COMMENT= Database connection pooling middleware and API @@ -61,6 +61,6 @@ CWRAPPERS_APPEND.cxx+= -Wno-error=unused-private-field -Wno-error=mismatched-tag .endif post-install: - ${INSTALL_DATA} ${WRKSRC}/init/sqlrelay ${DESTDIR}${EGDIR}/sqlrelay + ${INSTALL_DATA} ${WRKSRC}/init/rc.sqlrelay ${DESTDIR}${EGDIR}/sqlrelay .include "../../mk/bsd.pkg.mk" diff --git a/databases/sqlrelay/Makefile.common b/databases/sqlrelay/Makefile.common index 61bbbadd1a3..e448324d74a 100644 --- a/databases/sqlrelay/Makefile.common +++ b/databases/sqlrelay/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.6 2014/12/01 12:39:16 joerg Exp $ +# $NetBSD: Makefile.common,v 1.7 2015/05/20 13:26:45 ryoon Exp $ # used by databases/p5-sqlrelay/Makefile # used by databases/php-sqlrelay/Makefile # used by databases/py-sqlrelay/Makefile @@ -10,7 +10,7 @@ # used by databases/sqlrelay-sqlite/Makefile # used by databases/sqlrelay/Makefile -DISTNAME= sqlrelay-0.57 +DISTNAME= sqlrelay-0.59 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sqlrelay/} diff --git a/databases/sqlrelay/PLIST b/databases/sqlrelay/PLIST index e23371284e0..43590653734 100644 --- a/databases/sqlrelay/PLIST +++ b/databases/sqlrelay/PLIST @@ -1,5 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 2014/07/18 18:16:30 fhajny Exp $ -bin/backupschema +@comment $NetBSD: PLIST,v 1.12 2015/05/20 13:26:45 ryoon Exp $ bin/sqlr-cachemanager bin/sqlr-connection bin/sqlr-export @@ -19,16 +18,26 @@ bin/sqlrsh 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/sqlrpwdenc.h +include/sqlrelay/sqlrserver.h +include/sqlrelay/sqlrutil.h lib/libmysql3${PKGNAME}.so.1 lib/libmysql3${PKGNAME}.so.1.0.0 lib/libmysql3sqlrelay.so @@ -60,6 +69,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 @@ -70,7 +81,6 @@ man/man1/sqlr-query.1 man/man1/sqlrsh.1 man/man8/sqlr-cachemanager.8 man/man8/sqlr-connection.8 -man/man8/sqlr-ipclean.8 man/man8/sqlr-listener.8 man/man8/sqlr-scaler.8 man/man8/sqlr-start.8 @@ -81,9 +91,74 @@ share/doc/sqlrelay/admin/installing.html share/doc/sqlrelay/admin/loadbalfailover.html share/doc/sqlrelay/admin/oraclentier.html share/doc/sqlrelay/admin/router.html -share/doc/sqlrelay/admin/router.png share/doc/sqlrelay/admin/running.html share/doc/sqlrelay/admin/tuning.html +share/doc/sqlrelay/api/ado.net/html/annotated.html +share/doc/sqlrelay/api/ado.net/html/bc_s.png +share/doc/sqlrelay/api/ado.net/html/bdwn.png +share/doc/sqlrelay/api/ado.net/html/class_s_q_l_r_client_1_1_s_q_l_relay_command-members.html +share/doc/sqlrelay/api/ado.net/html/class_s_q_l_r_client_1_1_s_q_l_relay_command.html +share/doc/sqlrelay/api/ado.net/html/class_s_q_l_r_client_1_1_s_q_l_relay_connection-members.html +share/doc/sqlrelay/api/ado.net/html/class_s_q_l_r_client_1_1_s_q_l_relay_connection.html +share/doc/sqlrelay/api/ado.net/html/class_s_q_l_r_client_1_1_s_q_l_relay_data_adapter-members.html +share/doc/sqlrelay/api/ado.net/html/class_s_q_l_r_client_1_1_s_q_l_relay_data_adapter.html +share/doc/sqlrelay/api/ado.net/html/class_s_q_l_r_client_1_1_s_q_l_relay_data_reader-members.html +share/doc/sqlrelay/api/ado.net/html/class_s_q_l_r_client_1_1_s_q_l_relay_data_reader.html +share/doc/sqlrelay/api/ado.net/html/class_s_q_l_r_client_1_1_s_q_l_relay_exception-members.html +share/doc/sqlrelay/api/ado.net/html/class_s_q_l_r_client_1_1_s_q_l_relay_exception.html +share/doc/sqlrelay/api/ado.net/html/class_s_q_l_r_client_1_1_s_q_l_relay_parameter-members.html +share/doc/sqlrelay/api/ado.net/html/class_s_q_l_r_client_1_1_s_q_l_relay_parameter.html +share/doc/sqlrelay/api/ado.net/html/class_s_q_l_r_client_1_1_s_q_l_relay_parameter_collection-members.html +share/doc/sqlrelay/api/ado.net/html/class_s_q_l_r_client_1_1_s_q_l_relay_parameter_collection.html +share/doc/sqlrelay/api/ado.net/html/class_s_q_l_r_client_1_1_s_q_l_relay_row_updated_event_args-members.html +share/doc/sqlrelay/api/ado.net/html/class_s_q_l_r_client_1_1_s_q_l_relay_row_updated_event_args.html +share/doc/sqlrelay/api/ado.net/html/class_s_q_l_r_client_1_1_s_q_l_relay_row_updating_event_args-members.html +share/doc/sqlrelay/api/ado.net/html/class_s_q_l_r_client_1_1_s_q_l_relay_row_updating_event_args.html +share/doc/sqlrelay/api/ado.net/html/class_s_q_l_r_client_1_1_s_q_l_relay_transaction-members.html +share/doc/sqlrelay/api/ado.net/html/class_s_q_l_r_client_1_1_s_q_l_relay_transaction.html +share/doc/sqlrelay/api/ado.net/html/classes.html +share/doc/sqlrelay/api/ado.net/html/closed.png +share/doc/sqlrelay/api/ado.net/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html +share/doc/sqlrelay/api/ado.net/html/dir_c80a175e0fe38d5268efa0e9cdea41f9.html +share/doc/sqlrelay/api/ado.net/html/dir_da61e3e9a357748887e3ca8d7c5a0c16.html +share/doc/sqlrelay/api/ado.net/html/dir_dc5893416c2ccfb32b121666cb6e0b59.html +share/doc/sqlrelay/api/ado.net/html/doxygen.css +share/doc/sqlrelay/api/ado.net/html/doxygen.png +share/doc/sqlrelay/api/ado.net/html/dynsections.js +share/doc/sqlrelay/api/ado.net/html/ftv2blank.png +share/doc/sqlrelay/api/ado.net/html/ftv2cl.png +share/doc/sqlrelay/api/ado.net/html/ftv2doc.png +share/doc/sqlrelay/api/ado.net/html/ftv2folderclosed.png +share/doc/sqlrelay/api/ado.net/html/ftv2folderopen.png +share/doc/sqlrelay/api/ado.net/html/ftv2lastnode.png +share/doc/sqlrelay/api/ado.net/html/ftv2link.png +share/doc/sqlrelay/api/ado.net/html/ftv2mlastnode.png +share/doc/sqlrelay/api/ado.net/html/ftv2mnode.png +share/doc/sqlrelay/api/ado.net/html/ftv2mo.png +share/doc/sqlrelay/api/ado.net/html/ftv2node.png +share/doc/sqlrelay/api/ado.net/html/ftv2ns.png +share/doc/sqlrelay/api/ado.net/html/ftv2plastnode.png +share/doc/sqlrelay/api/ado.net/html/ftv2pnode.png +share/doc/sqlrelay/api/ado.net/html/ftv2splitbar.png +share/doc/sqlrelay/api/ado.net/html/ftv2vertline.png +share/doc/sqlrelay/api/ado.net/html/functions.html +share/doc/sqlrelay/api/ado.net/html/functions_func.html +share/doc/sqlrelay/api/ado.net/html/functions_prop.html +share/doc/sqlrelay/api/ado.net/html/hierarchy.html +share/doc/sqlrelay/api/ado.net/html/index.html +share/doc/sqlrelay/api/ado.net/html/jquery.js +share/doc/sqlrelay/api/ado.net/html/namespace_s_q_l_r_client.html +share/doc/sqlrelay/api/ado.net/html/nav_f.png +share/doc/sqlrelay/api/ado.net/html/nav_g.png +share/doc/sqlrelay/api/ado.net/html/nav_h.png +share/doc/sqlrelay/api/ado.net/html/open.png +share/doc/sqlrelay/api/ado.net/html/sync_off.png +share/doc/sqlrelay/api/ado.net/html/sync_on.png +share/doc/sqlrelay/api/ado.net/html/tab_a.png +share/doc/sqlrelay/api/ado.net/html/tab_b.png +share/doc/sqlrelay/api/ado.net/html/tab_h.png +share/doc/sqlrelay/api/ado.net/html/tab_s.png +share/doc/sqlrelay/api/ado.net/html/tabs.css share/doc/sqlrelay/api/c++/html/annotated.html share/doc/sqlrelay/api/c++/html/bc_s.png share/doc/sqlrelay/api/c++/html/bdwn.png @@ -181,6 +256,55 @@ share/doc/sqlrelay/api/c/html/tab_h.png share/doc/sqlrelay/api/c/html/tab_s.png share/doc/sqlrelay/api/c/html/tabs.css share/doc/sqlrelay/api/c/html/wrapperdll_8h_source.html +share/doc/sqlrelay/api/cs/html/annotated.html +share/doc/sqlrelay/api/cs/html/bc_s.png +share/doc/sqlrelay/api/cs/html/bdwn.png +share/doc/sqlrelay/api/cs/html/class_s_q_l_r_client_1_1_s_q_l_r_connection-members.html +share/doc/sqlrelay/api/cs/html/class_s_q_l_r_client_1_1_s_q_l_r_connection.html +share/doc/sqlrelay/api/cs/html/class_s_q_l_r_client_1_1_s_q_l_r_cursor-members.html +share/doc/sqlrelay/api/cs/html/class_s_q_l_r_client_1_1_s_q_l_r_cursor.html +share/doc/sqlrelay/api/cs/html/classes.html +share/doc/sqlrelay/api/cs/html/closed.png +share/doc/sqlrelay/api/cs/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html +share/doc/sqlrelay/api/cs/html/dir_c80a175e0fe38d5268efa0e9cdea41f9.html +share/doc/sqlrelay/api/cs/html/dir_da61e3e9a357748887e3ca8d7c5a0c16.html +share/doc/sqlrelay/api/cs/html/dir_dc5893416c2ccfb32b121666cb6e0b59.html +share/doc/sqlrelay/api/cs/html/doxygen.css +share/doc/sqlrelay/api/cs/html/doxygen.png +share/doc/sqlrelay/api/cs/html/dynsections.js +share/doc/sqlrelay/api/cs/html/ftv2blank.png +share/doc/sqlrelay/api/cs/html/ftv2cl.png +share/doc/sqlrelay/api/cs/html/ftv2doc.png +share/doc/sqlrelay/api/cs/html/ftv2folderclosed.png +share/doc/sqlrelay/api/cs/html/ftv2folderopen.png +share/doc/sqlrelay/api/cs/html/ftv2lastnode.png +share/doc/sqlrelay/api/cs/html/ftv2link.png +share/doc/sqlrelay/api/cs/html/ftv2mlastnode.png +share/doc/sqlrelay/api/cs/html/ftv2mnode.png +share/doc/sqlrelay/api/cs/html/ftv2mo.png +share/doc/sqlrelay/api/cs/html/ftv2node.png +share/doc/sqlrelay/api/cs/html/ftv2ns.png +share/doc/sqlrelay/api/cs/html/ftv2plastnode.png +share/doc/sqlrelay/api/cs/html/ftv2pnode.png +share/doc/sqlrelay/api/cs/html/ftv2splitbar.png +share/doc/sqlrelay/api/cs/html/ftv2vertline.png +share/doc/sqlrelay/api/cs/html/functions.html +share/doc/sqlrelay/api/cs/html/functions_func.html +share/doc/sqlrelay/api/cs/html/hierarchy.html +share/doc/sqlrelay/api/cs/html/index.html +share/doc/sqlrelay/api/cs/html/jquery.js +share/doc/sqlrelay/api/cs/html/namespace_s_q_l_r_client.html +share/doc/sqlrelay/api/cs/html/nav_f.png +share/doc/sqlrelay/api/cs/html/nav_g.png +share/doc/sqlrelay/api/cs/html/nav_h.png +share/doc/sqlrelay/api/cs/html/open.png +share/doc/sqlrelay/api/cs/html/sync_off.png +share/doc/sqlrelay/api/cs/html/sync_on.png +share/doc/sqlrelay/api/cs/html/tab_a.png +share/doc/sqlrelay/api/cs/html/tab_b.png +share/doc/sqlrelay/api/cs/html/tab_h.png +share/doc/sqlrelay/api/cs/html/tab_s.png +share/doc/sqlrelay/api/cs/html/tabs.css share/doc/sqlrelay/api/java/allclasses-frame.html share/doc/sqlrelay/api/java/allclasses-noframe.html share/doc/sqlrelay/api/java/com/firstworks/sqlrelay/SQLRConnection.html @@ -195,7 +319,11 @@ share/doc/sqlrelay/api/java/index-all.html share/doc/sqlrelay/api/java/index.html share/doc/sqlrelay/api/java/overview-tree.html share/doc/sqlrelay/api/java/package-list +share/doc/sqlrelay/api/java/resources/background.gif share/doc/sqlrelay/api/java/resources/inherit.gif +share/doc/sqlrelay/api/java/resources/tab.gif +share/doc/sqlrelay/api/java/resources/titlebar.gif +share/doc/sqlrelay/api/java/resources/titlebar_end.gif share/doc/sqlrelay/api/java/stylesheet.css share/doc/sqlrelay/api/perl/Connection.html share/doc/sqlrelay/api/perl/Cursor.html @@ -217,43 +345,6 @@ share/doc/sqlrelay/api/php/packages.html share/doc/sqlrelay/api/php/sql_relay/_sql_relay.doc.php.html share/doc/sqlrelay/api/python/PySQLRClient.py.html share/doc/sqlrelay/api/python/PySQLRDB.py.html -share/doc/sqlrelay/api/ruby/dbidoc/DBI.html -share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI.html -share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD.html -share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay.html -share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay/Database.html -share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay/Database.src/M000011.html -share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay/Database.src/M000012.html -share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay/Database.src/M000013.html -share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay/Database.src/M000014.html -share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay/Database.src/M000015.html -share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay/Database.src/M000016.html -share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay/Database.src/M000017.html -share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay/Driver.html -share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay/Driver.src/M000017.html -share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay/Driver.src/M000018.html -share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay/Driver.src/M000019.html -share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay/Driver.src/M000020.html -share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay/Statement.html -share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay/Statement.src/M000001.html -share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay/Statement.src/M000002.html -share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay/Statement.src/M000003.html -share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay/Statement.src/M000004.html -share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay/Statement.src/M000005.html -share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay/Statement.src/M000006.html -share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay/Statement.src/M000007.html -share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay/Statement.src/M000008.html -share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay/Statement.src/M000009.html -share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay/Statement.src/M000010.html -share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay/Statement.src/M000011.html -share/doc/sqlrelay/api/ruby/dbidoc/files/SQLRelay_rb.html -share/doc/sqlrelay/api/ruby/dbidoc/fr_class_index.html -share/doc/sqlrelay/api/ruby/dbidoc/fr_file_index.html -share/doc/sqlrelay/api/ruby/dbidoc/fr_method_index.html -share/doc/sqlrelay/api/ruby/dbidoc/index.html -share/doc/sqlrelay/api/ruby/dbidoc/rdoc-style.css -share/doc/sqlrelay/api/ruby/dbidoc/rdoc.css -share/doc/sqlrelay/api/ruby/dbidoc/table_of_contents.html share/doc/sqlrelay/api/ruby/doc/SQLRConnection.html share/doc/sqlrelay/api/ruby/doc/SQLRCursor.html share/doc/sqlrelay/api/ruby/doc/classes/SQLRConnection.html @@ -379,7 +470,37 @@ share/doc/sqlrelay/api/ruby/doc/files/sqlrelay_cpp.html share/doc/sqlrelay/api/ruby/doc/fr_class_index.html share/doc/sqlrelay/api/ruby/doc/fr_file_index.html share/doc/sqlrelay/api/ruby/doc/fr_method_index.html +share/doc/sqlrelay/api/ruby/doc/images/add.png +share/doc/sqlrelay/api/ruby/doc/images/arrow_up.png +share/doc/sqlrelay/api/ruby/doc/images/brick.png +share/doc/sqlrelay/api/ruby/doc/images/brick_link.png +share/doc/sqlrelay/api/ruby/doc/images/bug.png +share/doc/sqlrelay/api/ruby/doc/images/bullet_black.png +share/doc/sqlrelay/api/ruby/doc/images/bullet_toggle_minus.png +share/doc/sqlrelay/api/ruby/doc/images/bullet_toggle_plus.png +share/doc/sqlrelay/api/ruby/doc/images/date.png +share/doc/sqlrelay/api/ruby/doc/images/delete.png +share/doc/sqlrelay/api/ruby/doc/images/find.png +share/doc/sqlrelay/api/ruby/doc/images/macFFBgHack.png +share/doc/sqlrelay/api/ruby/doc/images/package.png +share/doc/sqlrelay/api/ruby/doc/images/page_green.png +share/doc/sqlrelay/api/ruby/doc/images/page_white_text.png +share/doc/sqlrelay/api/ruby/doc/images/page_white_width.png +share/doc/sqlrelay/api/ruby/doc/images/plugin.png +share/doc/sqlrelay/api/ruby/doc/images/ruby.png +share/doc/sqlrelay/api/ruby/doc/images/tag_blue.png +share/doc/sqlrelay/api/ruby/doc/images/tag_green.png +share/doc/sqlrelay/api/ruby/doc/images/transparent.png +share/doc/sqlrelay/api/ruby/doc/images/wrench.png +share/doc/sqlrelay/api/ruby/doc/images/wrench_orange.png +share/doc/sqlrelay/api/ruby/doc/images/zoom.png share/doc/sqlrelay/api/ruby/doc/index.html +share/doc/sqlrelay/api/ruby/doc/js/darkfish.js +share/doc/sqlrelay/api/ruby/doc/js/jquery.js +share/doc/sqlrelay/api/ruby/doc/js/navigation.js +share/doc/sqlrelay/api/ruby/doc/js/search.js +share/doc/sqlrelay/api/ruby/doc/js/search_index.js +share/doc/sqlrelay/api/ruby/doc/js/searcher.js share/doc/sqlrelay/api/ruby/doc/rdoc-style.css share/doc/sqlrelay/api/ruby/doc/rdoc.css share/doc/sqlrelay/api/ruby/doc/table_of_contents.html @@ -415,35 +536,6 @@ share/doc/sqlrelay/features/resultsetcaching.html share/doc/sqlrelay/features/substitutionandbindvars.html share/doc/sqlrelay/features/suspendedtx.html share/doc/sqlrelay/features/throttling.html -share/doc/sqlrelay/gettingstarted/blackray.html -share/doc/sqlrelay/gettingstarted/db2.html -share/doc/sqlrelay/gettingstarted/db2/72.html -share/doc/sqlrelay/gettingstarted/db2/81.html -share/doc/sqlrelay/gettingstarted/db2/82.html -share/doc/sqlrelay/gettingstarted/db2/824.html -share/doc/sqlrelay/gettingstarted/db2/91.html -share/doc/sqlrelay/gettingstarted/firebird.html -share/doc/sqlrelay/gettingstarted/msde.html -share/doc/sqlrelay/gettingstarted/mysql.html -share/doc/sqlrelay/gettingstarted/oracle.html -share/doc/sqlrelay/gettingstarted/oracle/linux/fedoracore/1/10g.html -share/doc/sqlrelay/gettingstarted/oracle/linux/fedoracore/1/9iR2.html -share/doc/sqlrelay/gettingstarted/oracle/linux/fedoracore/2/10g.html -share/doc/sqlrelay/gettingstarted/oracle/linux/fedoracore/3/10g.html -share/doc/sqlrelay/gettingstarted/oracle/linux/fedoracore/5/10g.html -share/doc/sqlrelay/gettingstarted/oracle/linux/redhat/5/805.html -share/doc/sqlrelay/gettingstarted/oracle/linux/redhat/6/8i.html -share/doc/sqlrelay/gettingstarted/oracle/linux/redhat/7/8i.html -share/doc/sqlrelay/gettingstarted/oracle/linux/redhat/8/9iR2.html -share/doc/sqlrelay/gettingstarted/oracle/linux/redhat/9/9iR2.html -share/doc/sqlrelay/gettingstarted/postgresql.html -share/doc/sqlrelay/gettingstarted/sqlite.html -share/doc/sqlrelay/gettingstarted/sybase.html -share/doc/sqlrelay/gettingstarted/sybase/11.0.3.3.html -share/doc/sqlrelay/gettingstarted/sybase/11.9.2.html -share/doc/sqlrelay/gettingstarted/sybase/12.5.1.html -share/doc/sqlrelay/gettingstarted/sybase/12.5.2.html -share/doc/sqlrelay/gettingstarted/sybase/15.0.2.html share/doc/sqlrelay/images/WPM_4877_1.PNG share/doc/sqlrelay/images/app-pdo-mysql.png share/doc/sqlrelay/images/app-pdo-sqlr-mysql.png @@ -517,9 +609,13 @@ share/doc/sqlrelay/modules/sqlr-connection-oracletest-querylog.2899.html share/doc/sqlrelay/modules/sqlr-connection.1871.html share/doc/sqlrelay/modules/sqlr-listener.1869.html share/doc/sqlrelay/modules/sqlr-listener.1886.html +share/doc/sqlrelay/programming/ado.net.html share/doc/sqlrelay/programming/binds.html share/doc/sqlrelay/programming/c++.html share/doc/sqlrelay/programming/c.html +share/doc/sqlrelay/programming/cs.html +share/doc/sqlrelay/programming/erlang.html +share/doc/sqlrelay/programming/guide.html share/doc/sqlrelay/programming/java.html share/doc/sqlrelay/programming/jdbc.html share/doc/sqlrelay/programming/odbc.html @@ -527,14 +623,16 @@ share/doc/sqlrelay/programming/perl.html share/doc/sqlrelay/programming/perldbi.html share/doc/sqlrelay/programming/php.html share/doc/sqlrelay/programming/phppdo.html +share/doc/sqlrelay/programming/precisionscale.html share/doc/sqlrelay/programming/python.html share/doc/sqlrelay/programming/pythondb.html share/doc/sqlrelay/programming/ruby.html -share/doc/sqlrelay/programming/rubydbi.html share/doc/sqlrelay/programming/tcl.html share/examples/sqlrelay/sample-mssqlserver-mysql-errors.map share/examples/sqlrelay/sample-oracle-mysql-errors.map share/examples/sqlrelay/sqlrelay share/examples/sqlrelay/sqlrelay.conf +share/examples/sqlrelay/sqlrelay.conf.example share/examples/sqlrelay/sqlrelay.dtd share/examples/sqlrelay/sqlrelay.xsd +@pkgdir etc/sqlrelay/sqlrelay.conf.d diff --git a/databases/sqlrelay/distinfo b/databases/sqlrelay/distinfo index 76011ca44a7..3055026470f 100644 --- a/databases/sqlrelay/distinfo +++ b/databases/sqlrelay/distinfo @@ -1,11 +1,12 @@ -$NetBSD: distinfo,v 1.13 2014/11/17 19:00:39 joerg Exp $ +$NetBSD: distinfo,v 1.14 2015/05/20 13:26:45 ryoon Exp $ -SHA1 (sqlrelay-0.57.tar.gz) = 537733e01beb5374688f2da9642024704bc93580 -RMD160 (sqlrelay-0.57.tar.gz) = 709de60d7be64ab3d98df64a78bad3f110e9562e -Size (sqlrelay-0.57.tar.gz) = 3774384 bytes -SHA1 (patch-ad) = b822a43854848641feba34a5331082bb95f5d419 -SHA1 (patch-configure) = 72175a91d2892d5325ec619f45a5b2f571bcdbf5 -SHA1 (patch-etc_Makefile) = 262968ad43d34d53b4fe65514c1351127660e12c -SHA1 (patch-init_rc.sqlrelay.in) = 6d358d9396339ecee8ef3b7054750100433fb271 -SHA1 (patch-src_api_php_sql__relay.cpp) = 6634d30035473a932c5e5a4a78a0573a0a879ed7 +SHA1 (sqlrelay-0.59.tar.gz) = 0d89f1cfff4c929297f92a575bfdae43d0b7affa +RMD160 (sqlrelay-0.59.tar.gz) = a0731c80048f280b71ec1dcb89bedad2b5145348 +Size (sqlrelay-0.59.tar.gz) = 3224000 bytes +SHA1 (patch-ad) = cc4a94941ec737abede98bdd7b19bc902f755609 +SHA1 (patch-config.mk.in) = 3ac1d68eec9e71b2827a675549dc873be9a56741 +SHA1 (patch-configure) = cd7598c42a3d12c3ac4874d07cfe679b3dc24b2c +SHA1 (patch-etc_Makefile) = 128102a3eaaeba96425060f82dc8e5e94edeabd0 +SHA1 (patch-src_api_ruby_getcflags.rb) = a08e18e15cf8b7e7aff4b50d3927d7c352ec15c3 +SHA1 (patch-src_api_ruby_getsitearchdir.rb) = 89d1bee15077d009a8e9b3b98443dcc667a583da SHA1 (patch-src_loggers_custom__sc.cpp) = 79e2b0a54b151e76175f549747e3392accd0b4d9 diff --git a/databases/sqlrelay/patches/patch-ad b/databases/sqlrelay/patches/patch-ad index f2222dccc9f..319196367e9 100644 --- a/databases/sqlrelay/patches/patch-ad +++ b/databases/sqlrelay/patches/patch-ad @@ -1,13 +1,15 @@ -$NetBSD: patch-ad,v 1.3 2014/05/27 13:24:43 fhajny Exp $ +$NetBSD: patch-ad,v 1.4 2015/05/20 13:26:45 ryoon Exp $ We install init scripts ourselves. ---- Makefile.orig 2013-10-19 12:27:13.000000000 +0000 +--- Makefile.orig 2015-03-31 20:50:58.000000000 +0000 +++ Makefile -@@ -17,7 +17,6 @@ install: - $(MAKE) -C src install - $(MAKE) -C bin install - $(MAKE) -C etc install -- $(MAKE) -C init install - $(MAKE) -C man install - $(MAKE) -C doc install - $(MKINSTALLDIRS) $(libdir)/pkgconfig +@@ -20,9 +20,6 @@ install-bin: + install-etc: + cd etc $(AND) $(MAKE) install + +-install-init: +- cd init $(AND) $(MAKE) install +- + install-man: + cd man $(AND) $(MAKE) install + diff --git a/databases/sqlrelay/patches/patch-config.mk.in b/databases/sqlrelay/patches/patch-config.mk.in new file mode 100644 index 00000000000..44280131a5e --- /dev/null +++ b/databases/sqlrelay/patches/patch-config.mk.in @@ -0,0 +1,13 @@ +$NetBSD: patch-config.mk.in,v 1.1 2015/05/20 13:26:45 ryoon Exp $ + +--- config.mk.in.orig 2015-04-18 05:29:10.000000000 +0000 ++++ config.mk.in +@@ -778,7 +778,7 @@ MODULERENAME = $(top_builddir)/moduleren + + + # build directories +-INSTALLSUBDIRS = install-src install-bin install-etc install-init install-man install-doc install-pkgconfig ++INSTALLSUBDIRS = install-src install-bin install-etc install-man install-doc install-pkgconfig + UNINSTALLSUBDIRS = uninstall-src uninstall-bin uninstall-etc uninstall-init uninstall-man uninstall-doc uninstall-pkgconfig + + ifeq ($(SQLRELAY_ENABLE_SHARED),yes) diff --git a/databases/sqlrelay/patches/patch-configure b/databases/sqlrelay/patches/patch-configure index 8fcc182d003..78f432b93d2 100644 --- a/databases/sqlrelay/patches/patch-configure +++ b/databases/sqlrelay/patches/patch-configure @@ -1,9 +1,9 @@ -$NetBSD: patch-configure,v 1.2 2014/05/27 13:24:43 fhajny Exp $ +$NetBSD: patch-configure,v 1.3 2015/05/20 13:26:45 ryoon Exp $ Look for history/readline at proper places. ---- configure.orig 2014-03-26 14:50:53.000000000 +0000 +--- configure.orig 2015-04-08 22:16:40.000000000 +0000 +++ configure -@@ -17557,7 +17557,7 @@ fi +@@ -17567,7 +17567,7 @@ fi $as_echo_n "checking for history... " >&6; } @@ -12,7 +12,7 @@ Look for history/readline at proper places. NAME=history HEADER=readline/history.h LIBNAME=history -@@ -17893,7 +17893,7 @@ fi +@@ -17903,7 +17903,7 @@ fi $as_echo_n "checking for readline... " >&6; } @@ -21,7 +21,7 @@ Look for history/readline at proper places. NAME=readline HEADER=readline/readline.h LIBNAME=readline -@@ -18501,7 +18501,7 @@ rm -f core conftest.err conftest.$ac_obj +@@ -18511,7 +18511,7 @@ rm -f core conftest.err conftest.$ac_obj @@ -30,3 +30,12 @@ Look for history/readline at proper places. NAME=iconv HEADER=iconv.h LIBNAME=iconv +@@ -32389,7 +32389,7 @@ print "arch = " + print CONFIG["arch"] + print "\n" + print "ruby_version = " +-print Config::CONFIG["ruby_version"] ++print RbConfig::CONFIG["ruby_version"] + print "\n" + print "prefix = " + print CONFIG["prefix"].sub(drive, "") diff --git a/databases/sqlrelay/patches/patch-etc_Makefile b/databases/sqlrelay/patches/patch-etc_Makefile index 7eb7afeda5c..7f0049ddcd0 100644 --- a/databases/sqlrelay/patches/patch-etc_Makefile +++ b/databases/sqlrelay/patches/patch-etc_Makefile @@ -1,18 +1,24 @@ -$NetBSD: patch-etc_Makefile,v 1.1 2014/05/22 12:50:48 fhajny Exp $ +$NetBSD: patch-etc_Makefile,v 1.2 2015/05/20 13:26:45 ryoon Exp $ Install config file examples properly. ---- etc/Makefile.orig 2012-05-21 04:54:54.000000000 +0000 +--- etc/Makefile.orig 2015-03-16 04:08:11.000000000 +0000 +++ etc/Makefile -@@ -5,10 +5,8 @@ include ../config.mk - .PHONY: install uninstall - +@@ -5,12 +5,12 @@ include ../config.mk install: -- $(MKINSTALLDIRS) $(sysconfdir) -- $(INSTALL) -m 644 sqlrelay.conf.example $(sysconfdir) -- $(INSTALL) -m 644 sqlrelay.dtd $(sysconfdir) -- $(INSTALL) -m 644 sqlrelay.xsd $(sysconfdir) -+ $(INSTALL) -m 644 sqlrelay.dtd $(EXAMPLEDIR) -+ $(INSTALL) -m 644 sqlrelay.xsd $(EXAMPLEDIR) - $(INSTALL) -m 644 sqlrelay.conf.example $(EXAMPLEDIR)/sqlrelay.conf + $(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 ++ $(CP) sqlrelay.conf.example $(EXAMPLEDIR) ++ $(CHMOD) 644 $(EXAMPLEDIR)/sqlrelay.conf.example ++ $(CP) sqlrelay.dtd $(EXAMPLEDIR) ++ $(CHMOD) 644 $(EXAMPLEDIR)/sqlrelay.dtd ++ $(CP) sqlrelay.xsd $(EXAMPLEDIR) ++ $(CHMOD) 644 $(EXAMPLEDIR)/sqlrelay.xsd + $(CP) sqlrelay.conf.example $(EXAMPLEDIR)/sqlrelay.conf + $(CHMOD) 644 $(EXAMPLEDIR)/sqlrelay.conf - uninstall: diff --git a/databases/sqlrelay/patches/patch-init_rc.sqlrelay.in b/databases/sqlrelay/patches/patch-init_rc.sqlrelay.in deleted file mode 100644 index 728a3db1171..00000000000 --- a/databases/sqlrelay/patches/patch-init_rc.sqlrelay.in +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-init_rc.sqlrelay.in,v 1.1 2014/05/22 12:50:48 fhajny Exp $ - -Instance definition under PKG_SYSCONFDIR. ---- init/rc.sqlrelay.in.orig 2013-10-20 02:33:20.000000000 +0000 -+++ init/rc.sqlrelay.in -@@ -119,7 +119,7 @@ fi - - - # define instance file --instances=/etc/sqlrelay -+instances=${sysconfdir}/sqlrelay - if ( test -r "/etc/sysconfig/sqlrelay" ) - then - instances=/etc/sysconfig/sqlrelay diff --git a/databases/sqlrelay/patches/patch-src_api_php_sql__relay.cpp b/databases/sqlrelay/patches/patch-src_api_php_sql__relay.cpp deleted file mode 100644 index 4298ae682b8..00000000000 --- a/databases/sqlrelay/patches/patch-src_api_php_sql__relay.cpp +++ /dev/null @@ -1,48 +0,0 @@ -$NetBSD: patch-src_api_php_sql__relay.cpp,v 1.1 2014/11/17 19:00:39 joerg Exp $ - -Don't mess with system headers by pretending to be C or removing defines. -Just expect php.h to work. - ---- src/api/php/sql_relay.cpp.orig 2014-09-02 01:51:20.000000000 +0000 -+++ src/api/php/sql_relay.cpp -@@ -3,39 +3,7 @@ - - #include <sqlrelay/sqlrclient.h> - --#ifdef WIN32 -- #undef uid_t -- #undef gid_t -- #undef ssize_t -- #undef socklen_t -- #undef pid_t -- #undef mode_t -- #define PHP_WIN32 -- #define ZEND_WIN32 -- #define ZEND_DEBUG 0 -- #define ZTS 1 --#endif -- --extern "C" { -- #ifndef WIN32 -- #ifdef __cplusplus -- #undef __cplusplus -- #define cpluspluswasdefined -- #endif -- #ifndef HAVE_SOCKLEN_T -- #define HAVE_SOCKLEN_T -- #endif -- #ifndef _WCHAR_T_DEFINED_ -- #define _WCHAR_T_DEFINED_ -- #endif -- #endif -- #include <php.h> -- #ifndef WIN32 -- #ifdef cpluspluswasdefined -- #define __cplusplus -- #endif -- #endif --} -+#include <php.h> - - #include <config.h> - diff --git a/databases/sqlrelay/patches/patch-src_api_ruby_getcflags.rb b/databases/sqlrelay/patches/patch-src_api_ruby_getcflags.rb new file mode 100644 index 00000000000..b299156ac6f --- /dev/null +++ b/databases/sqlrelay/patches/patch-src_api_ruby_getcflags.rb @@ -0,0 +1,31 @@ +$NetBSD: patch-src_api_ruby_getcflags.rb,v 1.1 2015/05/20 13:26:45 ryoon Exp $ + +* Fix Ruby 2.2 build. + +--- src/api/ruby/getcflags.rb.orig 2011-07-16 00:49:53.000000000 +0000 ++++ src/api/ruby/getcflags.rb +@@ -6,19 +6,19 @@ require "mkmf" + drive = File::PATH_SEPARATOR == ";" ? /\A\w:/ : /\A/ + print "\n" + print "arch = " +-print CONFIG["arch"] ++print RbConfig::CONFIG["arch"] + print "\n" + print "sitearch = " +-print CONFIG["sitearch"] ++print RbConfig::CONFIG["sitearch"] + print "\n" + print "ruby_version = " +-print Config::CONFIG["ruby_version"] ++print RbConfig::CONFIG["ruby_version"] + print "\n" + print "prefix = " +-print CONFIG["prefix"].sub(drive, "") ++print RbConfig::CONFIG["prefix"].sub(drive, "") + print "\n" + print "exec_prefix = " +-print CONFIG["exec_prefix"].sub(drive, "") ++print RbConfig::CONFIG["exec_prefix"].sub(drive, "") + print "\n" + print "libdir = " + print $libdir.sub(drive, "") diff --git a/databases/sqlrelay/patches/patch-src_api_ruby_getsitearchdir.rb b/databases/sqlrelay/patches/patch-src_api_ruby_getsitearchdir.rb new file mode 100644 index 00000000000..c75105e2473 --- /dev/null +++ b/databases/sqlrelay/patches/patch-src_api_ruby_getsitearchdir.rb @@ -0,0 +1,31 @@ +$NetBSD: patch-src_api_ruby_getsitearchdir.rb,v 1.1 2015/05/20 13:26:45 ryoon Exp $ + +* Fix Ruby 2.2 build. + +--- src/api/ruby/getsitearchdir.rb.orig 2015-04-09 01:48:10.000000000 +0000 ++++ src/api/ruby/getsitearchdir.rb +@@ -1,19 +1,19 @@ + require "mkmf" + drive = File::PATH_SEPARATOR == ";" ? /\A\w:/ : /\A/ + print "arch = " +-print CONFIG["arch"] ++print RbConfig::CONFIG["arch"] + print "\n" + print "sitearch = " +-print CONFIG["sitearch"] ++print RbConfig::CONFIG["sitearch"] + print "\n" + print "ruby_version = " +-print Config::CONFIG["ruby_version"] ++print RbConfig::CONFIG["ruby_version"] + print "\n" + print "prefix = " +-print CONFIG["prefix"].sub(drive, "").sub("$(DESTDIR)","") ++print RbConfig::CONFIG["prefix"].sub(drive, "").sub("$(DESTDIR)","") + print "\n" + print "exec_prefix = " +-print CONFIG["exec_prefix"].sub(drive, "").sub("$(DESTDIR)","") ++print RbConfig::CONFIG["exec_prefix"].sub(drive, "").sub("$(DESTDIR)","") + print "\n" + print "libdir = " + print $libdir.sub(drive, "").sub("$(DESTDIR)","") |