Import of pkgsrc-2016Q3

This commit is contained in:
2016-10-14 07:49:11 +02:00
committed by Lionel Sambuc
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949749 additions and 377083 deletions

View File

@@ -1,6 +1,7 @@
# $NetBSD: Makefile,v 1.44 2015/09/02 12:39:33 fhajny Exp $
# $NetBSD: Makefile,v 1.48 2016/07/09 06:38:03 wiz Exp $
COMMENT= Database connection pooling middleware and API
PKGREVISION= 1
.include "../../databases/sqlrelay/Makefile.common"
@@ -16,7 +17,7 @@ CONFIGURE_ARGS+= --disable-db2 --disable-erlang --disable-firebird \
INSTALL_MAKE_FLAGS+= EXAMPLEDIR=${DESTDIR}${EGDIR}
CONF_FILES+= ${EGDIR}/sqlrelay.conf ${PKG_SYSCONFDIR}/sqlrelay.conf
CONF_FILES+= ${EGDIR}/sqlrelay.dtd ${PKG_SYSCONFDIR}/sqlrelay.dtd
CONF_FILES+= ${EGDIR}/sqlrelay.xsd ${PKG_SYSCONFDIR}/sqlrelay.xsd
SQLR_USER?= sqlrelay
SQLR_GROUP?= ${SQLR_USER}
@@ -43,6 +44,11 @@ SUBST_SED.user+= -e '/runasgroup/s/nobody/${SQLR_GROUP}/'
SUBST_SED.user+= -e '/RUNASUSER/s/nobody/${SQLR_USER}/'
SUBST_SED.user+= -e '/RUNASGROUP/s/nobody/${SQLR_GROUP}/'
OPSYSVARS+= SOEXT
SOEXT.Darwin= bundle
SOEXT.*= so
PLIST_SUBST+= SOEXT=${SOEXT}
FILES_SUBST+= SQLR_USER=${SQLR_USER}
FILES_SUBST+= SQLR_GROUP=${SQLR_GROUP}
FILES_SUBST+= SQLR_DATA=${SQLR_DATA}
@@ -51,11 +57,4 @@ RCD_SCRIPTS+= sqlrelay sqlrcachemanager
RCD_SCRIPT_SRC.sqlrelay= ${WRKSRC}/init/rc.sqlrelay
RCD_SCRIPT_SRC.sqlrcachemanager= ${WRKSRC}/init/rc.sqlrcachemanager
.include "../../mk/compiler.mk"
.if !empty(PKGSRC_COMPILER:Mclang)
_WRAP_EXTRA_ARGS.CXX+= -Wno-error=unused-private-field -Wno-error=mismatched-tags
CWRAPPERS_APPEND.cxx+= -Wno-error=unused-private-field -Wno-error=mismatched-tags
.endif
.include "../../mk/bsd.pkg.mk"

View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.10 2015/09/02 12:39:33 fhajny Exp $
# $NetBSD: Makefile.common,v 1.12 2016/07/01 17:02:39 fhajny Exp $
# used by databases/p5-sqlrelay/Makefile
# used by databases/php-sqlrelay/Makefile
# used by databases/py-sqlrelay/Makefile
@@ -11,7 +11,7 @@
# used by databases/sqlrelay-sqlite/Makefile
# used by databases/sqlrelay/Makefile
DISTNAME= sqlrelay-0.63
DISTNAME= sqlrelay-0.65.0
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sqlrelay/}
@@ -45,9 +45,6 @@ _WRAP_EXTRA_ARGS.CXX+= -Wno-error=overloaded-virtual
CWRAPPERS_APPEND.cxx+= -Wno-error=overloaded-virtual
.endif
.include "../../devel/pcre/buildlink3.mk"
.include "../../devel/rudiments/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/readline.buildlink3.mk"

View File

@@ -1,12 +1,10 @@
@comment $NetBSD: PLIST,v 1.14 2015/09/02 12:39:33 fhajny Exp $
@comment $NetBSD: PLIST,v 1.17 2016/07/01 17:02:39 fhajny Exp $
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
@@ -15,91 +13,92 @@ bin/sqlrclient-config
bin/sqlrclientwrapper-config
bin/sqlrserver-config
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/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/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/private/sqlrutilincludes.h
include/sqlrelay/sqlrclient.h
include/sqlrelay/sqlrclientwrapper.h
include/sqlrelay/sqlrserver.h
include/sqlrelay/sqlrutil.h
lib/libmysql3${PKGNAME}.so.1
lib/libmysql3${PKGNAME}.so.1.0.0
lib/libmysql3sqlrelay.so
lib/libmysql40${PKGNAME}.so.1
lib/libmysql40${PKGNAME}.so.1.0.0
lib/libmysql3sqlrelay.so.2
lib/libmysql3sqlrelay.so.2.0.0
lib/libmysql40sqlrelay.so
lib/libmysql41${PKGNAME}.so.1
lib/libmysql41${PKGNAME}.so.1.0.0
lib/libmysql40sqlrelay.so.2
lib/libmysql40sqlrelay.so.2.0.0
lib/libmysql41sqlrelay.so
lib/libmysql50${PKGNAME}.so.1
lib/libmysql50${PKGNAME}.so.1.0.0
lib/libmysql41sqlrelay.so.2
lib/libmysql41sqlrelay.so.2.0.0
lib/libmysql50sqlrelay.so
lib/libmysql51${PKGNAME}.so.1
lib/libmysql51${PKGNAME}.so.1.0.0
lib/libmysql50sqlrelay.so.2
lib/libmysql50sqlrelay.so.2.0.0
lib/libmysql51sqlrelay.so
lib/libpq${PKGNAME}.so.1
lib/libpq${PKGNAME}.so.1.0.0
lib/libmysql51sqlrelay.so.2
lib/libmysql51sqlrelay.so.2.0.0
lib/libpqsqlrelay.so
lib/libpqsqlrelay.so.2
lib/libpqsqlrelay.so.2.0.0
lib/libsqlrclient.la
lib/libsqlrclientwrapper.la
lib/libsqlrserver.la
lib/libsqlrutil.la
lib/pkgconfig/sqlrelay-c++.pc
lib/pkgconfig/sqlrelay-c.pc
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/sqlrresultsettranslation_reformatdatetime.so
libexec/sqlrelay/sqlrtranslation_normalize.so
man/man1/sqlr-fields.1
man/man1/sqlr-query.1
libexec/sqlrelay/sqlrauth_database.${SOEXT}
libexec/sqlrelay/sqlrauth_krb_userlist.${SOEXT}
libexec/sqlrelay/sqlrauth_proxied.${SOEXT}
libexec/sqlrelay/sqlrauth_sqlrelay.${SOEXT}
libexec/sqlrelay/sqlrauth_tls_userlist.${SOEXT}
libexec/sqlrelay/sqlrauth_userlist.${SOEXT}
libexec/sqlrelay/sqlrconfig_xmldom.${SOEXT}
libexec/sqlrelay/sqlrconnection_router.${SOEXT}
libexec/sqlrelay/sqlrfilter_patterns.${SOEXT}
libexec/sqlrelay/sqlrfilter_regex.${SOEXT}
libexec/sqlrelay/sqlrfilter_string.${SOEXT}
libexec/sqlrelay/sqlrlogger_custom_nw.${SOEXT}
libexec/sqlrelay/sqlrlogger_custom_sc.${SOEXT}
libexec/sqlrelay/sqlrlogger_debug.${SOEXT}
libexec/sqlrelay/sqlrlogger_slowqueries.${SOEXT}
libexec/sqlrelay/sqlrparser_default.${SOEXT}
libexec/sqlrelay/sqlrprotocol_sqlrclient.${SOEXT}
libexec/sqlrelay/sqlrpwdenc_crypt.${SOEXT}
libexec/sqlrelay/sqlrpwdenc_md5.${SOEXT}
libexec/sqlrelay/sqlrpwdenc_rot.${SOEXT}
libexec/sqlrelay/sqlrquery_sqlrcmdcstat.${SOEXT}
libexec/sqlrelay/sqlrquery_sqlrcmdgstat.${SOEXT}
libexec/sqlrelay/sqlrresultsettranslation_reformatdatetime.${SOEXT}
libexec/sqlrelay/sqlrtranslation_normalize.${SOEXT}
man/man1/sqlr-export.1
man/man1/sqlr-import.1
man/man1/sqlrsh.1
man/man8/sqlr-cachemanager.8
man/man8/sqlr-connection.8
man/man8/sqlr-listener.8
man/man8/sqlr-pwdenc.8
man/man8/sqlr-scaler.8
man/man8/sqlr-start.8
man/man8/sqlr-status.8
man/man8/sqlr-stop.8
share/doc/sqlrelay/admin/configguide.html
share/doc/sqlrelay/admin/configreference.html
share/doc/sqlrelay/admin/installing.html
share/doc/sqlrelay/admin/loadbalfailover.html
share/doc/sqlrelay/admin/oraclentier.html
share/doc/sqlrelay/admin/prerequisites.html
share/doc/sqlrelay/admin/router.html
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/arrowdown.png
share/doc/sqlrelay/api/ado.net/html/arrowright.png
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
@@ -128,9 +127,12 @@ 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/doc.png
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/folderclosed.png
share/doc/sqlrelay/api/ado.net/html/folderopen.png
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
@@ -158,6 +160,7 @@ 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/splitbar.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
@@ -166,6 +169,8 @@ 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/arrowdown.png
share/doc/sqlrelay/api/c++/html/arrowright.png
share/doc/sqlrelay/api/c++/html/bc_s.png
share/doc/sqlrelay/api/c++/html/bdwn.png
share/doc/sqlrelay/api/c++/html/classes.html
@@ -179,10 +184,14 @@ share/doc/sqlrelay/api/c++/html/dir_0912e6c65b091fa41da70873249342a4.html
share/doc/sqlrelay/api/c++/html/dir_440cbb352fefbdb83d89768c287ae784.html
share/doc/sqlrelay/api/c++/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html
share/doc/sqlrelay/api/c++/html/dir_da61e3e9a357748887e3ca8d7c5a0c16.html
share/doc/sqlrelay/api/c++/html/dir_df9c11e719b8a1decaf23932e3bc215f.html
share/doc/sqlrelay/api/c++/html/doc.png
share/doc/sqlrelay/api/c++/html/doxygen.css
share/doc/sqlrelay/api/c++/html/doxygen.png
share/doc/sqlrelay/api/c++/html/dynsections.js
share/doc/sqlrelay/api/c++/html/files.html
share/doc/sqlrelay/api/c++/html/folderclosed.png
share/doc/sqlrelay/api/c++/html/folderopen.png
share/doc/sqlrelay/api/c++/html/ftv2blank.png
share/doc/sqlrelay/api/c++/html/ftv2cl.png
share/doc/sqlrelay/api/c++/html/ftv2doc.png
@@ -207,6 +216,7 @@ share/doc/sqlrelay/api/c++/html/nav_f.png
share/doc/sqlrelay/api/c++/html/nav_g.png
share/doc/sqlrelay/api/c++/html/nav_h.png
share/doc/sqlrelay/api/c++/html/open.png
share/doc/sqlrelay/api/c++/html/splitbar.png
share/doc/sqlrelay/api/c++/html/sqlrclient_8h_source.html
share/doc/sqlrelay/api/c++/html/sync_off.png
share/doc/sqlrelay/api/c++/html/sync_on.png
@@ -215,19 +225,26 @@ share/doc/sqlrelay/api/c++/html/tab_b.png
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/arrowdown.png
share/doc/sqlrelay/api/c/html/arrowright.png
share/doc/sqlrelay/api/c/html/bc_s.png
share/doc/sqlrelay/api/c/html/bdwn.png
share/doc/sqlrelay/api/c/html/closed.png
share/doc/sqlrelay/api/c/html/dir_364b2640bd7349a10e593fb505dc3717.html
share/doc/sqlrelay/api/c/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html
share/doc/sqlrelay/api/c/html/dir_759bf2703135d3cee912a827a7fe4121.html
share/doc/sqlrelay/api/c/html/dir_7bb915b94a9886845d4043db4913a3c0.html
share/doc/sqlrelay/api/c/html/dir_b9c8ab2e387146131f9b9e79af70de42.html
share/doc/sqlrelay/api/c/html/dir_da61e3e9a357748887e3ca8d7c5a0c16.html
share/doc/sqlrelay/api/c/html/dir_e8d73255ec7feed8fb64227e7a4ab864.html
share/doc/sqlrelay/api/c/html/dir_faf22fd1ab495b8361a309ea8c224c7c.html
share/doc/sqlrelay/api/c/html/doc.png
share/doc/sqlrelay/api/c/html/doxygen.css
share/doc/sqlrelay/api/c/html/doxygen.png
share/doc/sqlrelay/api/c/html/dynsections.js
share/doc/sqlrelay/api/c/html/files.html
share/doc/sqlrelay/api/c/html/folderclosed.png
share/doc/sqlrelay/api/c/html/folderopen.png
share/doc/sqlrelay/api/c/html/ftv2blank.png
share/doc/sqlrelay/api/c/html/ftv2cl.png
share/doc/sqlrelay/api/c/html/ftv2doc.png
@@ -253,7 +270,9 @@ share/doc/sqlrelay/api/c/html/nav_g.png
share/doc/sqlrelay/api/c/html/nav_h.png
share/doc/sqlrelay/api/c/html/open.png
share/doc/sqlrelay/api/c/html/private_2sqlrclientwrapper_8h_source.html
share/doc/sqlrelay/api/c/html/splitbar.png
share/doc/sqlrelay/api/c/html/sqlrclientwrapper_8h_source.html
share/doc/sqlrelay/api/c/html/sqlrclientwrapperincludes_8h_source.html
share/doc/sqlrelay/api/c/html/sync_off.png
share/doc/sqlrelay/api/c/html/sync_on.png
share/doc/sqlrelay/api/c/html/tab_a.png
@@ -263,6 +282,8 @@ 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/arrowdown.png
share/doc/sqlrelay/api/cs/html/arrowright.png
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
@@ -275,9 +296,12 @@ 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/doc.png
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/folderclosed.png
share/doc/sqlrelay/api/cs/html/folderopen.png
share/doc/sqlrelay/api/cs/html/ftv2blank.png
share/doc/sqlrelay/api/cs/html/ftv2cl.png
share/doc/sqlrelay/api/cs/html/ftv2doc.png
@@ -304,6 +328,7 @@ 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/splitbar.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
@@ -570,8 +595,8 @@ share/doc/sqlrelay/features/connectionpooling.html
share/doc/sqlrelay/features/databases.html
share/doc/sqlrelay/features/dbabstractionlayers.html
share/doc/sqlrelay/features/dropinreplacementlibs.html
share/doc/sqlrelay/features/ha.html
share/doc/sqlrelay/features/languages.html
share/doc/sqlrelay/features/loadbalancing.html
share/doc/sqlrelay/features/multirowfetches.html
share/doc/sqlrelay/features/proxying.html
share/doc/sqlrelay/features/queryfiltering.html
@@ -603,6 +628,7 @@ share/doc/sqlrelay/images/i386-linux-uclibc-thumb.png
share/doc/sqlrelay/images/i386-linux-uclibc.png
share/doc/sqlrelay/images/ibm.png
share/doc/sqlrelay/images/iodbc.png
share/doc/sqlrelay/images/loadbalancer.png
share/doc/sqlrelay/images/mdbtools.png
share/doc/sqlrelay/images/minix-thumb.png
share/doc/sqlrelay/images/minix.png
@@ -632,6 +658,8 @@ share/doc/sqlrelay/images/redhat62-sparc-thumb.png
share/doc/sqlrelay/images/redhat62-sparc.png
share/doc/sqlrelay/images/replicated-disproportionate.png
share/doc/sqlrelay/images/replicated.png
share/doc/sqlrelay/images/router.png
share/doc/sqlrelay/images/rrdns.png
share/doc/sqlrelay/images/sco-osr6-i386-thumb.png
share/doc/sqlrelay/images/sco-osr6-i386.png
share/doc/sqlrelay/images/sqlite.png
@@ -679,7 +707,6 @@ 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.conf
share/examples/sqlrelay/sqlrelay.conf.example
share/examples/sqlrelay/sqlrelay.dtd
share/examples/sqlrelay/sqlrelay.xsd
share/licenses/sqlrelay/COPYING
@pkgdir share/examples/sqlrelay/sqlrelay.conf.d

View File

@@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.1 2014/05/22 12:50:48 fhajny Exp $
# $NetBSD: buildlink3.mk,v 1.4 2016/07/01 17:02:39 fhajny Exp $
BUILDLINK_TREE+= sqlrelay
@@ -6,12 +6,10 @@ BUILDLINK_TREE+= sqlrelay
SQLRELAY_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.sqlrelay+= sqlrelay>=0.43
BUILDLINK_ABI_DEPENDS.sqlrelay+= sqlrelay>=0.65
BUILDLINK_PKGSRCDIR.sqlrelay?= ../../databases/sqlrelay
.include "../../devel/pcre/buildlink3.mk"
.include "../../devel/rudiments/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/readline.buildlink3.mk"
.endif # SQLRELAY_BUILDLINK3_MK

View File

@@ -1,14 +1,14 @@
$NetBSD: distinfo,v 1.17 2015/09/21 17:46:36 fhajny Exp $
$NetBSD: distinfo,v 1.20 2016/07/01 17:02:39 fhajny Exp $
SHA1 (sqlrelay-0.63.tar.gz) = b71f8967269fee4bd7b0e50699276f2f01ee2a5a
RMD160 (sqlrelay-0.63.tar.gz) = 381311a698a70e96aa92dfecf4910dc942e4a3fb
Size (sqlrelay-0.63.tar.gz) = 3422788 bytes
SHA1 (sqlrelay-0.65.0.tar.gz) = 7649fc14a95009ffaeb56f12abe70e526c4eb099
RMD160 (sqlrelay-0.65.0.tar.gz) = f83b9372da1283bd35f62761c522c0cdd25dd536
SHA512 (sqlrelay-0.65.0.tar.gz) = 7d5d18dbfd7b0c4bb39466489726c2d401b08e2c63af13c9bfb75f9c6839b7ac86caf3d03e3152cb73cf86d03b2de2f5880b41c40ffb5ef6c357886fb2aedcf7
Size (sqlrelay-0.65.0.tar.gz) = 3970412 bytes
SHA1 (patch-ad) = cc4a94941ec737abede98bdd7b19bc902f755609
SHA1 (patch-config.mk.in) = 297ac15bc1d59bdff7236107df8b5ad7b03737e5
SHA1 (patch-config.mk.in) = 22e8459f49e20529289e1a99b10cebaa449af0c0
SHA1 (patch-configure) = 29bc9087fc814d0879c99b2772632a3034bec502
SHA1 (patch-etc_Makefile) = 128102a3eaaeba96425060f82dc8e5e94edeabd0
SHA1 (patch-src_api_nodejs_sqlrelay.cpp) = 61ae166cbb384d32dd1d2c500cce82e54a228c05
SHA1 (patch-src_api_php_sql__relay.cpp) = d589837f05e86d614bc3b71bc0459ae786193d88
SHA1 (patch-etc_Makefile) = 28e9cac18314f1fc725603d47cb92ec6e54d7c63
SHA1 (patch-src_api_php_sql__relay.cpp) = 9e33260f4e4331874187e5b30db17d4478710385
SHA1 (patch-src_api_ruby_getcflags.rb) = 033e26ef03db4851f493d831c37ec947662d47ee
SHA1 (patch-src_api_ruby_getsitearchdir.rb) = 603c66ed45f854b833eefbcdbd58e41465fb8120
SHA1 (patch-src_loggers_custom__sc.cpp) = 79e2b0a54b151e76175f549747e3392accd0b4d9

View File

@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
<service_bundle type="manifest" name="@SMF_NAME@">
<service_bundle type="manifest" name="export">
<service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
<dependency name="network" grouping="require_all" restart_on="error" type="service">
<service_fmri value="svc:/milestone/network:default" />
@@ -32,7 +32,6 @@
<exec_method type="method" name="start" exec="@PREFIX@/bin/sqlr-cachemanager" timeout_seconds="3600" />
<exec_method type="method" name="stop" exec=":kill" timeout_seconds="3600" />
</instance>
<stability value="Evolving" />
<template>
<common_name>
<loctext xml:lang="C">SQL Relay</loctext>

View File

@@ -1,13 +1,14 @@
$NetBSD: patch-config.mk.in,v 1.2 2015/09/02 12:39:33 fhajny Exp $
$NetBSD: patch-config.mk.in,v 1.3 2016/07/01 17:02:39 fhajny Exp $
--- config.mk.in.orig 2015-08-24 07:39:39.000000000 +0000
We install init scripts ourselves.
--- config.mk.in.orig 2016-03-24 00:59:48.000000000 +0000
+++ config.mk.in
@@ -861,7 +861,7 @@ MODULERENAME = $(top_builddir)/moduleren
@@ -921,7 +921,7 @@ MODULERENAME = $(top_builddir)/moduleren
# build directories
-INSTALLSUBDIRS = install-src install-bin install-etc install-init install-man install-doc install-license install-pkgconfig
+INSTALLSUBDIRS = install-src install-bin install-etc install-man install-doc install-license install-pkgconfig
UNINSTALLSUBDIRS = uninstall-src uninstall-bin uninstall-etc uninstall-init uninstall-man uninstall-doc uninstall-license uninstall-pkgconfig
ifeq ($(SQLRELAY_ENABLE_SHARED),yes)
-INSTALLSUBDIRS = install-src install-bin install-etc install-init install-license
+INSTALLSUBDIRS = install-src install-bin install-etc install-license
ifeq ($(ENABLE_CPP),yes)
INSTALLSUBDIRS += install-pkgconfig
endif

View File

@@ -1,24 +1,16 @@
$NetBSD: patch-etc_Makefile,v 1.2 2015/05/20 13:26:45 ryoon Exp $
$NetBSD: patch-etc_Makefile,v 1.3 2016/07/01 17:02:39 fhajny Exp $
Install config file examples properly.
--- etc/Makefile.orig 2015-03-16 04:08:11.000000000 +0000
--- etc/Makefile.orig 2016-01-28 19:28:21.000000000 +0000
+++ etc/Makefile
@@ -5,12 +5,12 @@ 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
+ $(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
@@ -3,8 +3,8 @@ top_builddir = ..
include ../config.mk
install:
- $(MKINSTALLDIRS) $(sysconfdir)/$(SQLRELAY).conf.d
- $(CP) sqlrelay.xsd $(sysconfdir)/$(SQLRELAY).xsd
+ $(MKINSTALLDIRS) $(EXAMPLEDIR)/$(SQLRELAY).conf.d
+ $(CP) sqlrelay.xsd $(EXAMPLEDIR)/$(SQLRELAY).xsd
$(MKINSTALLDIRS) $(EXAMPLEDIR)
$(CP) sqlrelay.conf $(EXAMPLEDIR)/$(SQLRELAY).conf
$(CHMOD) 644 $(EXAMPLEDIR)/$(SQLRELAY).conf

View File

@@ -1,24 +0,0 @@
$NetBSD: patch-src_api_nodejs_sqlrelay.cpp,v 1.1 2015/09/21 17:46:36 fhajny Exp $
Add support for nodejs>=4.0.0.
--- src/api/nodejs/sqlrelay.cpp.orig 2015-07-05 02:55:20.000000000 +0000
+++ src/api/nodejs/sqlrelay.cpp
@@ -13,7 +13,7 @@ using namespace v8;
using namespace node;
// macros to deal with differences between major versions of node.js
-#if NODE_MINOR_VERSION >= 12
+#if NODE_MAJOR_VERSION >= 4 || ( NODE_MAJOR_VERSION < 1 && NODE_MINOR_VERSION >= 12 )
#define RET void
#define ARGS FunctionCallbackInfo<Value>
@@ -84,7 +84,7 @@ using namespace node;
#define toString(arg) ((arg->IsNull())?NULL:*(String::Utf8Value(arg)))
#define toArray(arg) Handle<Array>::Cast(arg);
-#if NODE_MINOR_VERSION >= 12
+#if NODE_MAJOR_VERSION >= 4 || ( NODE_MAJOR_VERSION < 1 && NODE_MINOR_VERSION >= 12 )
#define throwWrongNumberOfArguments() isolate->ThrowException(Exception::TypeError(newString("Wrong number of arguments")))
#define throwInvalidArgumentType() isolate->ThrowException(Exception::TypeError(newString("Invalid argument type")))
#else

View File

@@ -1,13 +1,23 @@
$NetBSD: patch-src_api_php_sql__relay.cpp,v 1.3 2015/07/05 12:52:39 joerg Exp $
$NetBSD: patch-src_api_php_sql__relay.cpp,v 1.4 2016/07/01 17:02:39 fhajny Exp $
--- src/api/php/sql_relay.cpp.orig 2015-07-05 10:40:12.000000000 +0000
--- src/api/php/sql_relay.cpp.orig 2016-03-13 19:20:25.000000000 +0000
+++ src/api/php/sql_relay.cpp
@@ -16,29 +16,7 @@
@@ -24,39 +24,15 @@
#define ZTS 1
#endif
-extern "C" {
- #ifndef WIN32
-
- // On some platforms (solaris), stdio.h must be included prior
- // to including math.h or FILE will get redefined.
- #include <stdio.h>
-
- // php.h ultimately includes math.h and on some platforms,
- // __cplusplus to be defined when including it. Manually
- // including it prior to including php.h solves this problem.
- #include <math.h>
-
- #ifdef __cplusplus
- #undef __cplusplus
- #define cpluspluswasdefined
@@ -29,6 +39,14 @@ $NetBSD: patch-src_api_php_sql__relay.cpp,v 1.3 2015/07/05 12:52:39 joerg Exp $
- #endif
- #endif
-}
+// On some platforms (solaris), stdio.h must be included prior
+// to including math.h or FILE will get redefined.
+#include <stdio.h>
+
+// php.h ultimately includes math.h and on some platforms,
+// __cplusplus to be defined when including it. Manually
+// including it prior to including php.h solves this problem.
+#include <math.h>
+#include <php.h>
#include <config.h>