diff options
-rw-r--r-- | databases/sqlrelay/Makefile | 35 | ||||
-rw-r--r-- | databases/sqlrelay/PLIST | 38 | ||||
-rw-r--r-- | databases/sqlrelay/distinfo | 14 | ||||
-rw-r--r-- | databases/sqlrelay/options.mk | 15 | ||||
-rw-r--r-- | databases/sqlrelay/patches/patch-aa | 21 | ||||
-rw-r--r-- | databases/sqlrelay/patches/patch-ab | 21 | ||||
-rw-r--r-- | databases/sqlrelay/patches/patch-ac | 12 | ||||
-rw-r--r-- | databases/sqlrelay/patches/patch-init__netbsd__rc.d__sqlrelay.in | 37 | ||||
-rw-r--r-- | databases/sqlrelay/patches/patch-src__listener__sqlrlistener.h | 13 |
9 files changed, 123 insertions, 83 deletions
diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile index 10895ff409f..78d6dbe02dc 100644 --- a/databases/sqlrelay/Makefile +++ b/databases/sqlrelay/Makefile @@ -1,13 +1,13 @@ -# $NetBSD: Makefile,v 1.20 2011/06/10 21:57:06 obache Exp $ +# $NetBSD: Makefile,v 1.21 2011/11/02 13:59:29 fhajny Exp $ -DISTNAME= sqlrelay-0.37 -PKGREVISION= 4 +DISTNAME= sqlrelay-0.43 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sqlrelay/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://sqlrelay.sourceforge.net/ COMMENT= Enables pooling and sharing of database connections +LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2 PKG_DESTDIR_SUPPORT= user-destdir @@ -17,19 +17,20 @@ USE_TOOLS+= gmake USE_LIBTOOL= YES CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} -CONFIGURE_ARGS+= --disable-oracle -CONFIGURE_ARGS+= --disable-sybase +CONFIGURE_ARGS+= --localstatedir=${VARBASE} CONFIGURE_ARGS+= --disable-db2 -CONFIGURE_ARGS+= --disable-interbase +CONFIGURE_ARGS+= --disable-erlang +CONFIGURE_ARGS+= --disable-firebird +CONFIGURE_ARGS+= --disable-java CONFIGURE_ARGS+= --disable-mdbtools -CONFIGURE_ARGS+= --disable-msql +CONFIGURE_ARGS+= --disable-oracle +CONFIGURE_ARGS+= --disable-php CONFIGURE_ARGS+= --disable-python -CONFIGURE_ARGS+= --disable-zope CONFIGURE_ARGS+= --disable-ruby -CONFIGURE_ARGS+= --disable-java -CONFIGURE_ARGS+= --disable-php +CONFIGURE_ARGS+= --disable-sybase CONFIGURE_ARGS+= --disable-tcl -CONFIGURE_ARGS+= --disable-gtk +CONFIGURE_ARGS+= --disable-zope +CONFIGURE_ARGS+= --with-rudiments-prefix=${BUILDLINK_PREFIX.rudiments} MAKE_ENV+= EXAMPLESDIR=${EGDIR:Q} PKG_SYSCONFSUBDIR= sqlrelay @@ -39,13 +40,25 @@ CONF_FILES+= ${EGDIR}/sqlrelay.conf.example \ ${PKG_SYSCONFDIR}/sqlrelay.conf CONF_FILES+= ${EGDIR}/sqlrelay.dtd \ ${PKG_SYSCONFDIR}/sqlrelay.dtd +CONF_FILES+= ${EGDIR}/sqlrelay \ + ${PKG_SYSCONFDIR}/sqlrelay INSTALLATION_DIRS= ${PREFIX}/share/examples/rc.d +SQLR_DATA?= ${VARBASE}/sqlrelay +OWN_DIRS+= ${SQLR_DATA} +OWN_DIRS+= ${SQLR_DATA}/tmp +OWN_DIRS+= ${SQLR_DATA}/tmp/ipc +OWN_DIRS+= ${SQLR_DATA}/tmp/pids +OWN_DIRS+= ${SQLR_DATA}/tmp/sockets + RCD_SCRIPTS+= sqlrelay RCD_SCRIPT_SRC.sqlrelay= ${WRKSRC}/init/netbsd/rc.d/sqlrelay .include "options.mk" +post-install: + ${INSTALL_DATA} ${WRKSRC}/init/netbsd/sqlrelay ${DESTDIR}${EGDIR}/sqlrelay + .include "../../devel/rudiments/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/sqlrelay/PLIST b/databases/sqlrelay/PLIST index 4514edf09a2..b84c9fa3f90 100644 --- a/databases/sqlrelay/PLIST +++ b/databases/sqlrelay/PLIST @@ -1,24 +1,20 @@ -@comment $NetBSD: PLIST,v 1.7 2009/06/14 17:43:26 joerg Exp $ +@comment $NetBSD: PLIST,v 1.8 2011/11/02 13:59:29 fhajny Exp $ bin/backupschema bin/fields bin/query bin/sqlr-cachemanager ${PLIST.freetds}bin/sqlr-connection-freetds -${PLIST.freetds}bin/sqlr-connection-freetds-debug ${PLIST.mysql}bin/sqlr-connection-mysql -${PLIST.mysql}bin/sqlr-connection-mysql-debug ${PLIST.odbc}bin/sqlr-connection-odbc -${PLIST.odbc}bin/sqlr-connection-odbc-debug ${PLIST.pgsql}bin/sqlr-connection-postgresql -${PLIST.pgsql}bin/sqlr-connection-postgresql-debug +bin/sqlr-connection-router ${PLIST.sqlite}bin/sqlr-connection-sqlite -${PLIST.sqlite}bin/sqlr-connection-sqlite-debug bin/sqlr-export bin/sqlr-import bin/sqlr-listener -bin/sqlr-listener-debug bin/sqlr-scaler bin/sqlr-start +bin/sqlr-status bin/sqlr-stop bin/sqlrclient-config bin/sqlrclientwrapper-config @@ -36,18 +32,18 @@ lib/libmysql3sqlrelay.la lib/libmysql40sqlrelay.la lib/libmysql41sqlrelay.la lib/libmysql50sqlrelay.la +lib/libmysql51sqlrelay.la lib/libpqsqlrelay.la lib/libsqlrclient.la lib/libsqlrclientwrapper.la lib/libsqlrconnection.la -lib/libsqlrconnection_debug.la +${PLIST.odbc}lib/libsqlrodbc.la lib/libsqlrutil.la lib/pkgconfig/sqlrelay-c++.pc lib/pkgconfig/sqlrelay-c.pc man/man1/fields.1 man/man1/query.1 man/man1/query.py.1 -man/man1/sqlr-config-gtk.1 man/man1/sqlrsh.1 man/man8/sqlr-cachemanager.8 man/man8/sqlr-connection.8 @@ -94,23 +90,38 @@ share/doc/sqlrelay/css/styles.css share/doc/sqlrelay/dropin/mysql.html share/doc/sqlrelay/dropin/postgresql.html share/doc/sqlrelay/faq.html +share/doc/sqlrelay/gettingstarted/blackray.html share/doc/sqlrelay/gettingstarted/db2.html -share/doc/sqlrelay/gettingstarted/interbase.html -share/doc/sqlrelay/gettingstarted/msql.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/mssqlserver.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/slackware/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/oracle/linux/slackware/8/8i.html share/doc/sqlrelay/gettingstarted/oracle/linux/slackware/8/9i.html +share/doc/sqlrelay/gettingstarted/oracle/linux/suse/9.0/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/index.html share/doc/sqlrelay/installing.html share/doc/sqlrelay/introduction.html @@ -121,6 +132,8 @@ share/doc/sqlrelay/programming/binds.html share/doc/sqlrelay/programming/c++.html share/doc/sqlrelay/programming/c.html share/doc/sqlrelay/programming/java.html +share/doc/sqlrelay/programming/jdbc.html +share/doc/sqlrelay/programming/odbc.html share/doc/sqlrelay/programming/perl.html share/doc/sqlrelay/programming/perldbi.html share/doc/sqlrelay/programming/php.html @@ -142,5 +155,6 @@ share/doc/sqlrelay/running.html share/doc/sqlrelay/tuning.html share/doc/sqlrelay/windows.html share/examples/rc.d/sqlrelay +share/examples/sqlrelay/sqlrelay share/examples/sqlrelay/sqlrelay.conf.example share/examples/sqlrelay/sqlrelay.dtd diff --git a/databases/sqlrelay/distinfo b/databases/sqlrelay/distinfo index 4c8919ff14e..8b88e0f61e5 100644 --- a/databases/sqlrelay/distinfo +++ b/databases/sqlrelay/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.5 2009/09/09 14:38:58 joerg Exp $ +$NetBSD: distinfo,v 1.6 2011/11/02 13:59:29 fhajny Exp $ -SHA1 (sqlrelay-0.37.tar.gz) = cec442357f6644c8ac7f066fe974a25c9f315022 -RMD160 (sqlrelay-0.37.tar.gz) = 2cad89fe72d6700857280e385ab03c69cd584648 -Size (sqlrelay-0.37.tar.gz) = 1668069 bytes -SHA1 (patch-aa) = 0684b3382e64569ed222cb19df6e5a1a4a143061 -SHA1 (patch-ab) = c05dbc72d1077237efd1d01e48403a7caa38eff9 -SHA1 (patch-ac) = 58c456142b9026bd9f41460f5a602aec61fc70cb +SHA1 (sqlrelay-0.43.tar.gz) = f645332ff0dd14edd2e44643cda651d7c1c59abe +RMD160 (sqlrelay-0.43.tar.gz) = 88638f122467c859db2fc5c8fbf983416c7f05bd +Size (sqlrelay-0.43.tar.gz) = 1743456 bytes +SHA1 (patch-ac) = e69292a2674083ffd10424e73760a0810fd629d8 SHA1 (patch-ad) = a7e7047bcaf28de96a2baab527e4b1f607deb7c6 +SHA1 (patch-init__netbsd__rc.d__sqlrelay.in) = b10de222c99ab03a541c9a6a3929928c6936d0f4 +SHA1 (patch-src__listener__sqlrlistener.h) = 11f977c48b8e0a01779357475373af738c81d7f3 diff --git a/databases/sqlrelay/options.mk b/databases/sqlrelay/options.mk index 4bfb8431daf..cd717223248 100644 --- a/databases/sqlrelay/options.mk +++ b/databases/sqlrelay/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.6 2008/04/12 22:42:59 jlam Exp $ +# $NetBSD: options.mk,v 1.7 2011/11/02 13:59:29 fhajny Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.sqlrelay PKG_SUPPORTED_OPTIONS+= mysql pgsql sqlite odbc freetds perl @@ -8,6 +8,7 @@ PKG_SUPPORTED_OPTIONS+= mysql pgsql sqlite odbc freetds perl PLIST_VARS+= freetds mysql odbc perl pgsql sqlite .if !empty(PKG_OPTIONS:Mperl) +LICENSE+= AND artistic PERL5_PACKLIST= auto/SQLRelay/Connection/.packlist PERL5_PACKLIST+= auto/SQLRelay/Cursor/.packlist PERL5_PACKLIST+= auto/DBD/SQLRelay/.packlist @@ -16,6 +17,7 @@ CONFIGURE_ARGS+= --with-perl-site-arch=${PERL5_INSTALLVENDORARCH:Q} CONFIGURE_ARGS+= --with-perl-site-lib=${PERL5_INSTALLVENDORLIB:Q} CONFIGURE_ARGS+= --with-perl-install-man3-dir=${PERL5_INSTALLVENDORMAN3DIR:Q} +USE_TOOLS+= perl PLIST.perl= yes .include "../../lang/perl5/buildlink3.mk" @@ -27,7 +29,7 @@ CONFIGURE_ARGS+= --disable-perl .endif .if !empty(PKG_OPTIONS:Mmysql) -CONFIGURE_ARGS+= --with-mysql=${BUILDLINK_PREFIX.mysql-client:Q} +CONFIGURE_ARGS+= --with-mysql-prefix=${BUILDLINK_PREFIX.mysql-client:Q} PLIST.mysql= yes .include "../../mk/mysql.buildlink3.mk" .else @@ -35,7 +37,8 @@ CONFIGURE_ARGS+= --disable-mysql .endif .if !empty(PKG_OPTIONS:Mpgsql) -CONFIGURE_ARGS+= --with-postgresql=${PGSQL_PREFIX:Q} +LICENSE+= AND postgresql-license +CONFIGURE_ARGS+= --with-postgresql-prefix=${PGSQL_PREFIX:Q} PLIST.pgsql= yes .include "../../mk/pgsql.buildlink3.mk" .else @@ -43,7 +46,7 @@ CONFIGURE_ARGS+= --disable-postgresql .endif .if !empty(PKG_OPTIONS:Msqlite) -CONFIGURE_ARGS+= --with-sqlite=${BUILDLINK_PREFIX.sqlite3:Q} +CONFIGURE_ARGS+= --with-sqlite-prefix=${BUILDLINK_PREFIX.sqlite3:Q} PLIST.sqlite= yes .include "../../databases/sqlite3/buildlink3.mk" .else @@ -51,7 +54,7 @@ CONFIGURE_ARGS+= --disable-sqlite .endif .if !empty(PKG_OPTIONS:Modbc) -CONFIGURE_ARGS+= --with-odbc=${BUILDLINK_PREFIX.unixodbc:Q} +CONFIGURE_ARGS+= --with-odbc-prefix=${BUILDLINK_PREFIX.unixodbc:Q} PLIST.odbc= yes .include "../../databases/unixodbc/buildlink3.mk" .else @@ -59,7 +62,7 @@ CONFIGURE_ARGS+= --disable-odbc .endif .if !empty(PKG_OPTIONS:Mfreetds) -CONFIGURE_ARGS+= --with-freetds=${BUILDLINK_PREFIX.freetds:Q} +CONFIGURE_ARGS+= --with-freetds-prefix=${BUILDLINK_PREFIX.freetds:Q} PLIST.freetds= yes .include "../../databases/freetds/buildlink3.mk" .else diff --git a/databases/sqlrelay/patches/patch-aa b/databases/sqlrelay/patches/patch-aa deleted file mode 100644 index a2778cba99c..00000000000 --- a/databases/sqlrelay/patches/patch-aa +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2006/03/29 01:28:47 gavan Exp $ - ---- src/api/perl/Connection/Makefile.orig 2005-07-23 06:22:30.000000000 +0100 -+++ src/api/perl/Connection/Makefile -@@ -9,14 +9,14 @@ PERLOPTIMIZE = $(DESTDIR)$(shell eval "` - ifeq ($(OVERRIDEPERLSITEARCH),) - PERLSITEARCH = $(DESTDIR)$(shell eval "`$(PERL) -V:sitearch`"; export sitearch; echo $$sitearch | sed -e "s|UNKNOWN||g" ) - else --PERLSITEARCH = $(DESTDIR)$(PERLSITEARCH) -+PERLSITEARCH = $(DESTDIR)$(OVERRIDEPERLSITEARCH) - endif - PERL_INC = $(DESTDIR)$(shell eval "`$(PERL) -V:archlibexp`"; export archlibexp; echo "-I$$archlibexp/CORE" | sed -e "s|UNKNOWN||g" ) - PERL_LIB = $(DESTDIR)$(shell eval "`$(PERL) -V:privlibexp`"; export privlibexp; echo $$privlibexp | sed -e "s|UNKNOWN||g" ) - ifeq ($(OVERRIDEPERLINSTALLMAN3DIR),) - PERLINSTALLMAN3DIR = $(DESTDIR)$(shell eval "`$(PERL) -V:installman3dir`"; export installman3dir; echo $$installman3dir | sed -e "s|UNKNOWN||g" ) - else --PERLINSTALLMAN3DIR = $(DESTDIR)$(PERLINSTALLMAN3DIR) -+PERLINSTALLMAN3DIR = $(DESTDIR)$(OVERRIDEPERLINSTALLMAN3DIR) - endif - ifeq ($(OVERRIDEPERLMAN3EXT),) - PERLMAN3EXT = $(shell eval "`$(PERL) -V:man3ext`"; export man3ext; echo $$man3ext | sed -e "s|UNKNOWN||g" ) diff --git a/databases/sqlrelay/patches/patch-ab b/databases/sqlrelay/patches/patch-ab deleted file mode 100644 index 9c65c34615c..00000000000 --- a/databases/sqlrelay/patches/patch-ab +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2006/03/29 01:28:47 gavan Exp $ - ---- src/api/perl/Cursor/Makefile.orig 2005-07-23 06:22:30.000000000 +0100 -+++ src/api/perl/Cursor/Makefile -@@ -9,14 +9,14 @@ PERLOPTIMIZE = $(DESTDIR)$(shell eval "` - ifeq ($(OVERRIDEPERLSITEARCH),) - PERLSITEARCH = $(DESTDIR)$(shell eval "`$(PERL) -V:sitearch`"; export sitearch; echo $$sitearch | sed -e "s|UNKNOWN||g" ) - else --PERLSITEARCH = $(DESTDIR)$(PERLSITEARCH) -+PERLSITEARCH = $(DESTDIR)$(OVERRIDEPERLSITEARCH) - endif - PERL_INC = $(DESTDIR)$(shell eval "`$(PERL) -V:archlibexp`"; export archlibexp; echo "-I$$archlibexp/CORE" | sed -e "s|UNKNOWN||g" ) - PERL_LIB = $(DESTDIR)$(shell eval "`$(PERL) -V:privlibexp`"; export privlibexp; echo $$privlibexp | sed -e "s|UNKNOWN||g" ) - ifeq ($(OVERRIDEPERLINSTALLMAN3DIR),) - PERLINSTALLMAN3DIR = $(DESTDIR)$(shell eval "`$(PERL) -V:installman3dir`"; export installman3dir; echo $$installman3dir | sed -e "s|UNKNOWN||g" ) - else --PERLINSTALLMAN3DIR = $(DESTDIR)$(PERLINSTALLMAN3DIR) -+PERLINSTALLMAN3DIR = $(DESTDIR)$(OVERRIDEPERLINSTALLMAN3DIR) - endif - ifeq ($(OVERRIDEPERLMAN3EXT),) - PERLMAN3EXT = $(shell eval "`$(PERL) -V:man3ext`"; export man3ext; echo $$man3ext | sed -e "s|UNKNOWN||g" ) diff --git a/databases/sqlrelay/patches/patch-ac b/databases/sqlrelay/patches/patch-ac index 7dee8c2dfc7..22b088f6a64 100644 --- a/databases/sqlrelay/patches/patch-ac +++ b/databases/sqlrelay/patches/patch-ac @@ -1,14 +1,15 @@ -$NetBSD: patch-ac,v 1.2 2009/09/09 14:38:58 joerg Exp $ +$NetBSD: patch-ac,v 1.3 2011/11/02 13:59:29 fhajny Exp $ ---- etc/Makefile.orig 2005-02-24 02:52:16.000000000 +0000 +--- etc/Makefile.orig 2006-07-08 03:18:01.000000000 +0000 +++ etc/Makefile -@@ -5,10 +5,10 @@ include ../config.mk +@@ -5,12 +5,10 @@ include ../config.mk .PHONY: install uninstall install: - $(MKINSTALLDIRS) $(sysconfdir) - $(INSTALL) -m 644 sqlrelay.conf.example $(sysconfdir) - $(INSTALL) -m 644 sqlrelay.dtd $(sysconfdir) +- $(INSTALL) -m 644 sqlrelay.conf.example $(EXAMPLEDIR)/sqlrelay.conf + $(MKINSTALLDIRS) ${DESTDIR}$(EXAMPLESDIR) + $(INSTALL) -m 644 sqlrelay.conf.example ${DESTDIR}$(EXAMPLESDIR) + $(INSTALL) -m 644 sqlrelay.dtd ${DESTDIR}$(EXAMPLESDIR) @@ -16,5 +17,6 @@ $NetBSD: patch-ac,v 1.2 2009/09/09 14:38:58 joerg Exp $ uninstall: - $(RM) $(sysconfdir)/sqlrelay.conf.example - $(RM) $(sysconfdir)/sqlrelay.dtd -+ $(RM) $(EXAMPLESDIR)/sqlrelay.conf.example -+ $(RM) $(EXAMPLESDIR)/sqlrelay.dtd +- $(RM) $(EXAMPLEDIR)/sqlrelay.conf ++ $(RM) ${DESTDIR}$(EXAMPLESDIR)/sqlrelay.conf.example ++ $(RM) ${DESTDIR}$(EXAMPLESDIR)/sqlrelay.dtd diff --git a/databases/sqlrelay/patches/patch-init__netbsd__rc.d__sqlrelay.in b/databases/sqlrelay/patches/patch-init__netbsd__rc.d__sqlrelay.in new file mode 100644 index 00000000000..a2e692c05aa --- /dev/null +++ b/databases/sqlrelay/patches/patch-init__netbsd__rc.d__sqlrelay.in @@ -0,0 +1,37 @@ +$NetBSD: patch-init__netbsd__rc.d__sqlrelay.in,v 1.1 2011/11/02 13:59:29 fhajny Exp $ + +--- init/netbsd/rc.d/sqlrelay.in.orig 2007-05-29 20:09:18.000000000 +0000 ++++ init/netbsd/rc.d/sqlrelay.in +@@ -31,7 +31,7 @@ cleanup(){ + if ( test -r "$i" ) + then + PID=`cat $i` +- if ( test -z "`ps -p $PID | egrep -E 'sqlr-cachemana|sqlr-connectio|sqlr-listener'`" ) ++ if ( test -z "`ps -p $PID | egrep -E 'sqlr-cachemana|sqlr-connectio|sqlr-listener|sqlr-scaler'`" ) + then + echo "$PID is not sqlr! removing pidfile ..." + rm $i +@@ -42,9 +42,9 @@ cleanup(){ + + start(){ + echo -n $"Starting SQL Relay: " +- if ( test -r "/etc/sqlrelay" ); then ++ if ( test -r "@sysconfdir@/sqlrelay" ); then + launched=0 +- for connid in `grep -v ^# /etc/sqlrelay`; do ++ for connid in `grep -v ^# @sysconfdir@/sqlrelay`; do + echo + echo -n $"Launching instance with id '${connid}':" + sqlr-start -id ${connid} 0<&- 1>&- 2>&- +@@ -69,9 +69,9 @@ start(){ + + stop(){ + echo -n $"Stopping SQL Relay: " +- if ( test -r "/etc/sqlrelay" ); then ++ if ( test -r "@sysconfdir@/sqlrelay" ); then + launched=0 +- for connid in `grep -v ^# /etc/sqlrelay`; do ++ for connid in `grep -v ^# @sysconfdir@/sqlrelay`; do + echo + echo -n $"Launching instance with id '${connid}':" + sqlr-stop ${connid} 0<&- 1>&- 2>&- diff --git a/databases/sqlrelay/patches/patch-src__listener__sqlrlistener.h b/databases/sqlrelay/patches/patch-src__listener__sqlrlistener.h new file mode 100644 index 00000000000..cb647c19eb5 --- /dev/null +++ b/databases/sqlrelay/patches/patch-src__listener__sqlrlistener.h @@ -0,0 +1,13 @@ +$NetBSD: patch-src__listener__sqlrlistener.h,v 1.1 2011/11/02 13:59:29 fhajny Exp $ + +--- src/listener/sqlrlistener.h.orig 2011-06-28 20:38:49.000000000 +0000 ++++ src/listener/sqlrlistener.h +@@ -26,6 +26,8 @@ + + #include <defines.h> + ++#include <cstring> ++ + #ifdef RUDIMENTS_NAMESPACE + using namespace rudiments; + #endif |