Updated databases/sqlrelay to 0.43

pkgsrc changes:
* Added LICENSE to package and options
* Pre-create neede volatile directories
* Improve the NetBSD rc.d script

0.43
* updated ruby code build to take sitearch into account during includes
* updated ruby code to map STR2CSTR to StringValuePtr for ruby 1.9
* updated to use rudiments' updated signalclasses
* replaced calls to fork() and exit() with process class calls
* updated ruby detection in configure script
* added a test for Python.h to the configure script
* updated tcl detection
* updated db2 detection
* added sed command to remove -arch args from perl build (for osx)
* added charset support for all db's who's client libraries support them
* updated detection of various languages and db's on various platforms
* added getting started with odbc doc
* updated faq with info about result sets from stored procedures

0.42
* fixed a bug causing cursor id's not to get set for some db's
* updated configure script to look for client64 in addition to client
  for oracle intantclient on x86_64
* added setTimeout to all API's
* applied some patches from Alexey Leontev
* bumped BINDVARLENGTH up to 64
* applied Renat Sabitov's scaler -debug patch and 11g configure patch
* applied Stephan van Egmond's sqlrsh history patch
* added configure test for gmake, use it to find ruby.h
* applied mingang@taobao.com's scaler patch for -debug
* added getting started notes for Oracle 11.2 on Fedora Core 12
* added test for mdb_sql_run_query and code to use it if it's there
* fixed a bug that caused ping to fail after reconnecting to sybase
* added configure test for xsubpp
* fixed perl dbi inout bind problem
* fixed code that was adding a NULL terminator to oracle clob values
* applied several patches from Renat Sabitov
* applied dynamic cursor patch from Cal Heldenbrand
* applied Claudio Freire's normalized matching and xmlparsing patches
* fixed sqlite connection to use sqlite3_malloc/free
* update freetds connection to get tds version with ct_config if
  TDS_VERSION_NO doesn't exist
* applied a fix for a bug that could cause a crash when a cursor is reused
* fixed a shutdown race condition in connection daemons
* moved common startup/shutdown code for connection daemons up into
  static methods/variables of the sqlrconnection_svr class
* fixed a crash in the oracle connection daemon where OCIHandleFree was
  getting called on define handles that weren't created by OCIHandleAlloc
* removed rebuild target from Makefiles
* updated tests
* refactored main() method for connections
* added searches for ruby1.8, ruby19 and ruby1.9 in configure script
* fixed a bug that caused addresses="" to cause the sqlr-listener not to start
* added entries to FAQ about oracle instantclient and ubunu /bin/dash
* updated postgresql tests to use bpchar rather than char(20) for
  fetching results of stored procedure
* renamed interbase.create.sh to firebird.create.sh
* fixed a bug that could overrun the postgresql bind array
* fixed bug that caused connection daemon sockets to be double-freed on
  shutdown after a suspended session
* precision/scale in output bind buffers is initialized now
* debugstring buffers are no longer build when debug is turned off
* fixed id vs. index bug when requesting a cursor and binding a cursor
* refactored JNI code a bit, fixed getIntField/getLongField problem that
  caused problems on 64-bit machines
* applied patch to make python api return decimals and integers, not
  just strings, refactored some of it
* fixed dump tran docs in getting started with sybase to use sa
* updated sybase connection to use length of cursor name rather than
  CS_NULLTERM to work around an odd, inconsistent bug that would
  cause the connection to hang sometimes
* connections not spawned by scaler don't signal on the semaphore used
  by the scaler to wait for a connection to start now
* updated bind var docs
* updated faq
* fixed a bug where binding an oracle cursor didn't reset some values
  and would cause subsequent cursor binds to fail
* added note to docs about configuring sybase to dump transactions at each
  checkpoint
* applied Renat Sabitov's patch to kill scaler-started connections which fail
  to signal on sem(8) because they either crashed or got hung up trying
  to start
* fixed a bug in the mysql drop-in lib that could cause the client to run out
  of cursors
* added a mapping between sqlite3_free and sqlite_freemem
* added a fix for a race condition in the scaler
* fixed a postgresql bind memory leak
* applied Renat's ruby DESTDIR patch and updated helper scripts to
  remove $(DESTDIR) from all the variables that it outputs
* applied Renat's patch to handle semaphore failures in forked listeners
  during shutdown
* applied Renat's patch to move connection counting for scaler-spawned
  connections entirely into scaler itself
* applied Renat's patch to reap children more regularly and refactored it
  a little
* fixed distclean to remove perl .pm files
* changed maxsessioncount default to 0, updated docs, examples

0.41
* added configure test for ruby.h
* added a couple of new functions to the mysql drop-in library
* updated mysql drop-in lib docs explaining how to use with PHP
* added documentation for timequeries params
* if SQLConnectW isn't supported, ODBC driver uses non-unicode calls
* added maxsessioncount parameter and connections use it to override
  ttl and bleed off
* applied Renat Sabitov's output bind patch
* added mysql last_insert_id() note to FAQ
* made it so oracle_home doesn't need to be set if oracle_sid is
  specified in tnsnames.ora format

0.40
* fixed readline detection in configure script
* fixed an uninitialized variable in sqlr-import
* changed clientSession() to call endSessionCommand() instead of endSession()
  so endSessionInternal() would be called every time
* fixed debug option in sqlr-import and sqlr-export
* fixed postgresql typemangling=no option
* set dbversion to unknown if sp_version wasn't found in freetds/sybase
* output bind variables' null indicator is reset now
* updated postgresql typemangling
* included Jesse Wagner's oracle 11g acsite patch
* added +1 to inbindvars[i].valuesize for CLOB's to make sure the NULL
  terminator is included
* postgresql connection uses PQparameterStatus if PQserverVersion doesn't
  exist and runs "select version()" if PQparameterStatus doesn't exist;
  to get the db version
* added mysql-5.1 drop-in replacement lib
* fixed a bug that caused result set data not to be cleaned up before a cursor
  is reused as a bind cursor
* changed string bind length to uint32_t from uint16_t
* added clearBinds() call after executeQuery() in perl dbi driver
* began work on an ODBC driver
* added serverVersion and clientVersion methods
* incorporated Alfred Fazio's python api patches
* fixed a bug where cursors might not get aborted when a client disconnects
* made shared memory segment group-readable
* applied Renaud Amar's HAVE_MYSQL_OPT_RECONNECT patch
* added ODBC driver to spec file
* added DESTDIR= to .pc files
* made freetds use single-quote for escape character, other db's use backslash
* made sqlr-export/import use &##; for non-printable characters, &, < and >
* fixed scaler; supports -localstatedir option properly now
* fixed many it's -> its typos in the documentation
* changed debug so that only one binary is built and it's selected at runtime
* integrated erlang api
* added -localstatedir to sqlr-stop
* fixed mysql (with statement api) relogin problems
* removed non-functional config app
* added Oracle 11g on fc9 document
* added ASE 15.0.2 installation doc
* made it possible to only bind to port, not socket
* added test for tdsver.h

0.39
* removed oracle7 support
* added OCI_OBJECT to oracle environment init
* added some more error codes to oracle's dead connection test
* connections don't decrement connection count when they fail to log in now :)
* added -silent option to connections that scaler uses so they don't spew
  login errors if the db is down
* fixed a bug that disabled scaling if maxlisteners was -1 (the default, which
  means no maximum)
* freetds, db2 connection don't detach before logging in any more
* added reloginatstart config parameter
* fixed sendLob for oracle<8i
* applied Johnny Luong's postgresql drop-in lib patch
* applied Jason McClellen's perl dbi raise-error patch
* sybase/freetds use CS_SEVERITY instead of msgp->severity now
* added 64 bit sybase tests
* postgresql only uses PQexecPrepared if PQprepare also exists
* set LANG=POSIX before running ruby/make so sed's would work on non-us
  locales
* documented how to use mysql stored procedure output parameters
* applied james@thoughtpatterns.com's perl null bind patch
* applied Tim Bunce's perl dbi driver patch
* suppress error message of cat $ORACLE_HOME/lib/sysliblist in configure
  script
* added support for stored procedures which return result sets to sybase
  connection
* added support for stored procedures which return result sets to freetds
  connection but it doesn't actually return anything
* documented how to use sybase stored procedure result sets
* fixed a bug that caused zope to get an exception when result sets are empty
* configure looks for instantclient if it can't find anything in
  ORACLE_HOME, added --with-oracle-instantclient-prefix option
* added sybase ASE 15 install doc
* fixed a bug that caused the router connection to return a max of 10 rows
* applied Chris Coyle's mysql auto-reconnect patch
* modified countBindVariables to exclude :'s and @'s if it finds $'s or ?'s
* applied some of Tim Bunce's DBI patches
* added pid cleanup to init script similar to patch supplied by Ragnar Rova
* added validBind() method which will return whether a bind
  variable is in the query or not
* fixed Yeb Havinga's db-tier authentication bug
* added timequeries option
* added support for Oracle OS-authentication
* added some new FAQ's
* mysql connection calls commit() before running the first query after
  each new client connection
* fixed a crash in the router involving "fake begin's"
* documented msql transaction weirdness and db2 relogin issues
* added /opt/csw to configure script search path
* improved filtering out of -x arguments in perl/ruby make commands
* added -lruby, -lperl, -lpython, etc for OS X

0.38
* implemented mysql_stmt function support in mysql connection
* fixed mysql_autocommit detection
* fixed missing self before __getRow and __getRowRange in python db driver
* implemented query filtering and routing
* interbase/firebird dead-db/relogin works now
* added test for 0 length result set to PySQLRDB's fetchmany method
* added mysql_config sanity test to configure script
* NULL's are escaped in fake input BLOB binds now
* query router works pretty well now
* applied Sharpinskiy Dmitry's odbc unicode patch
* integrated Devananda's statistics gathering code
* added support for mysql stored procedures
* integrated Devananda's mysql result set updates
* sqlrelay.conf.example installed as $datadir/examples/sqlrelay.conf now
* integrated Andreas Behr's listener crash patch
* removed erroneous reference to sqlrcon_errormessage in php pear db
* another multibyte clob fix
* added "delimiter" command to sqlrsh to change delimiter from ; to whatever
* removed msql support
* added db2 9.1 installation doc
* added firebird 2.0 installation docs
* router connection overrides authtier=database
* fixed a bug where clients would hang if they requested a cursor when
  none were available
* added some additional mdb 5 checks to configure script
* added iconv const char parameter check to configure script
* the main listener doesn't listen for clients until all of the connections
  have started now
* added notes about tcp_tw_recycle/tcp_tw_reuse in tuning doc
* ping causes the connection to relogin if it returns false now
* added iconv include/library find to configure script
* fixed sqlrlistener so forked listeners don't remove the pid file
* switched oracle 8 column size variable type from sb4 to ub2
* if maxqueuelength>maxlisteners then scaling isn't used

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