4 files changed, 46 insertions, 17 deletions

diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile
index a6f24eb34f37..f93341310c2e 100644
--- a/databases/sqlrelay/Makefile
+++ b/databases/sqlrelay/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	${SQLRELAY_PORTNAME}
 PORTVERSION=	${SQLRELAY_PORTVERSION}
-PORTREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	http://www.firstworks.com/downloads/sqlrelay/
 
@@ -17,6 +16,7 @@ LIB_DEPENDS=	rudiments.0:${PORTSDIR}/devel/rudiments \
 		xml2.5:${PORTSDIR}/textproc/libxml2 \
 		iconv.3:${PORTSDIR}/converters/libiconv
 
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
@@ -136,10 +136,14 @@ post-extract:
 	${LN} -s ${LOCALBASE}/lib ${WRKDIR}/prefixes/libxml/lib
 
 post-patch:
-	${PERL} -i -p \
-		-e 's,/usr/local\b,${PREFIX},g;' \
-		-e 's,\bgtk-config\b,${GTK_CONFIG:T},g;' \
+	${REINPLACE_CMD} -E \
+		-e 's,/usr/local[[:>:]],${PREFIX},g;' \
+		-e 's,[[:<:]]gtk-config[[:>:]],${GTK_CONFIG:T},g;' \
 			${WRKSRC}/configure
+	${REINPLACE_CMD} -E \
+		-e 's,\.so\.\$$\(SQLR_VERSION\),\.so\.$$(basename $$(SQLR_VERSION)),g;' \
+			${WRKSRC}/src/api/c/src/Makefile \
+			${WRKSRC}/src/api/c++/src/Makefile
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/databases/sqlrelay/Makefile.common b/databases/sqlrelay/Makefile.common
index 58eb316ea2ed..fde7aea263d2 100644
--- a/databases/sqlrelay/Makefile.common
+++ b/databases/sqlrelay/Makefile.common
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 SQLRELAY_PORTNAME=	sqlrelay
-SQLRELAY_PORTVERSION=	0.30
+SQLRELAY_PORTVERSION=	0.32
 
 SQLRELAY_PORTDIR=	${PORTSDIR}/databases/${SQLRELAY_PORTNAME}
 SQLRELAY_WRKSRC_CMD=	cd ${SQLRELAY_PORTDIR} && ${MAKE} -V WRKSRC
diff --git a/databases/sqlrelay/distinfo b/databases/sqlrelay/distinfo
index d388b8835bef..5ad372af6aba 100644
--- a/databases/sqlrelay/distinfo
+++ b/databases/sqlrelay/distinfo
@@ -1 +1 @@
-MD5 (sqlrelay-0.30.tar.gz) = 5a68befd1a6f993a9ed5c7e0cd630fb3
+MD5 (sqlrelay-0.32.tar.gz) = 711f1edc83a61644715462e78976586d
diff --git a/databases/sqlrelay/pkg-plist b/databases/sqlrelay/pkg-plist
index 52823a8fe9c2..a930cc6ab670 100644
--- a/databases/sqlrelay/pkg-plist
+++ b/databases/sqlrelay/pkg-plist
@@ -16,21 +16,27 @@ bin/sqlr-stop
 bin/sqlrsh
 etc/sqlrelay.conf.example
 etc/sqlrelay.dtd
-include/private/bindvar.h
-include/private/column.h
-include/private/field.h
-include/private/row.h
-include/private/sqlrconnection.h
-include/private/sqlrcursor.h
-include/private/sqlrdefines.h
-include/private/sqlrincludes.h
-include/sqlrclient.h
-include/sqlrclientwrapper.h
+include/sqlrelay/private/bindvar.h
+include/sqlrelay/private/column.h
+include/sqlrelay/private/row.h
+include/sqlrelay/private/sqlrconnection.h
+include/sqlrelay/private/sqlrcursor.h
+include/sqlrelay/private/sqlrdefines.h
+include/sqlrelay/private/sqlrincludes.h
+include/sqlrelay/sqlrclient.h
+include/sqlrelay/sqlrclientwrapper.h
+@dirrm include/sqlrelay/private
+@dirrm include/sqlrelay
 lib/libsqlrclient.a
+lib/libsqlrclient.so
 lib/libsqlrclient.so.0
+lib/libsqlrclient_p.a
 lib/libsqlrclientwrapper.a
+lib/libsqlrclientwrapper.so
 lib/libsqlrclientwrapper.so.0
+lib/libsqlrclientwrapper_p.a
 @dirrm sqlrelay/tmp
+@dirrm sqlrelay/debug
 @dirrm sqlrelay/cache
 @dirrm sqlrelay
 %%PORTDOCS%%share/doc/sqlrelay/api/c++/sqlrclient.h.html
@@ -54,10 +60,25 @@ lib/libsqlrclientwrapper.so.0
 %%PORTDOCS%%share/doc/sqlrelay/api/python/PySQLRClient.py.html
 %%PORTDOCS%%share/doc/sqlrelay/api/python/PySQLRDB.py.html
 %%PORTDOCS%%share/doc/sqlrelay/api/ruby/ruby.html
+%%PORTDOCS%%share/doc/sqlrelay/api/ruby/rubydbi.html
 %%PORTDOCS%%share/doc/sqlrelay/clientapis.html
 %%PORTDOCS%%share/doc/sqlrelay/configuring.html
 %%PORTDOCS%%share/doc/sqlrelay/connections.html
 %%PORTDOCS%%share/doc/sqlrelay/css/styles.css
+%%PORTDOCS%%share/doc/sqlrelay/gettingstarted/db2.html
+%%PORTDOCS%%share/doc/sqlrelay/gettingstarted/interbase.html
+%%PORTDOCS%%share/doc/sqlrelay/gettingstarted/lago.html
+%%PORTDOCS%%share/doc/sqlrelay/gettingstarted/msql.html
+%%PORTDOCS%%share/doc/sqlrelay/gettingstarted/mssqlserver.html
+%%PORTDOCS%%share/doc/sqlrelay/gettingstarted/mysql.html
+%%PORTDOCS%%share/doc/sqlrelay/gettingstarted/oracle.html
+%%PORTDOCS%%share/doc/sqlrelay/gettingstarted/oracle/805.html
+%%PORTDOCS%%share/doc/sqlrelay/gettingstarted/oracle/817.html
+%%PORTDOCS%%share/doc/sqlrelay/gettingstarted/postgresql.html
+%%PORTDOCS%%share/doc/sqlrelay/gettingstarted/sqlite.html
+%%PORTDOCS%%share/doc/sqlrelay/gettingstarted/sybase.html
+%%PORTDOCS%%share/doc/sqlrelay/gettingstarted/sybase/11.0.3.3.html
+%%PORTDOCS%%share/doc/sqlrelay/gettingstarted/sybase/11.9.2.html
 %%PORTDOCS%%share/doc/sqlrelay/index.html
 %%PORTDOCS%%share/doc/sqlrelay/installing.html
 %%PORTDOCS%%share/doc/sqlrelay/introduction.html
@@ -69,11 +90,12 @@ lib/libsqlrclientwrapper.so.0
 %%PORTDOCS%%share/doc/sqlrelay/programming/c.html
 %%PORTDOCS%%share/doc/sqlrelay/programming/java.html
 %%PORTDOCS%%share/doc/sqlrelay/programming/perl.html
-%%PORTDOCS%%share/doc/sqlrelay/programming/perldbd.html
+%%PORTDOCS%%share/doc/sqlrelay/programming/perldbi.html
 %%PORTDOCS%%share/doc/sqlrelay/programming/php.html
 %%PORTDOCS%%share/doc/sqlrelay/programming/python.html
 %%PORTDOCS%%share/doc/sqlrelay/programming/pythondb.html
 %%PORTDOCS%%share/doc/sqlrelay/programming/ruby.html
+%%PORTDOCS%%share/doc/sqlrelay/programming/rubydbi.html
 %%PORTDOCS%%share/doc/sqlrelay/programming/zope.html
 %%PORTDOCS%%share/doc/sqlrelay/programming/zope/instance.gif
 %%PORTDOCS%%share/doc/sqlrelay/programming/zope/management.gif
@@ -86,6 +108,9 @@ lib/libsqlrclientwrapper.so.0
 %%PORTDOCS%%share/doc/sqlrelay/running.html
 %%PORTDOCS%%@dirrm share/doc/sqlrelay/programming/zope
 %%PORTDOCS%%@dirrm share/doc/sqlrelay/programming
+%%PORTDOCS%%@dirrm share/doc/sqlrelay/gettingstarted/sybase
+%%PORTDOCS%%@dirrm share/doc/sqlrelay/gettingstarted/oracle
+%%PORTDOCS%%@dirrm share/doc/sqlrelay/gettingstarted
 %%PORTDOCS%%@dirrm share/doc/sqlrelay/css
 %%PORTDOCS%%@dirrm share/doc/sqlrelay/api/ruby
 %%PORTDOCS%%@dirrm share/doc/sqlrelay/api/python