aboutsummaryrefslogtreecommitdiffstats
path: root/databases/sqlrelay
diff options
context:
space:
mode:
Diffstat (limited to 'databases/sqlrelay')
-rw-r--r--databases/sqlrelay/Makefile21
-rw-r--r--databases/sqlrelay/Makefile.common2
-rw-r--r--databases/sqlrelay/distinfo4
-rw-r--r--databases/sqlrelay/files/patch-Makefile21
-rw-r--r--databases/sqlrelay/pkg-plist53
5 files changed, 67 insertions, 34 deletions
diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile
index 60ded16720a8..a3a9749b4726 100644
--- a/databases/sqlrelay/Makefile
+++ b/databases/sqlrelay/Makefile
@@ -9,6 +9,8 @@ MASTER_SITES= SF
MAINTAINER= pi@FreeBSD.org
COMMENT= Persistent DB connection pooling/proxying/load balancing system
+LICENSE= LGPL20
+
LIB_DEPENDS= librudiments.so:${PORTSDIR}/devel/rudiments
WANT_GNOME= yes
@@ -19,6 +21,7 @@ CONFIGURE_ARGS= ${SQLRELAY_CONFIGURE_ARGS} \
--disable-tcl \
--disable-java \
--disable-msql \
+ --disable-nodejs \
--disable-perl \
--disable-php \
--disable-python \
@@ -43,6 +46,7 @@ TOSTRIP= bin/sqlr-start \
bin/sqlr-pwdenc \
bin/sqlr-status \
bin/sqlrsh \
+ lib/libsqlrodbc-${SQLRELAY_PORTVERSION}.so.1.0.0 \
lib/libsqlrutil-${SQLRELAY_PORTVERSION}.so.1.0.0 \
lib/libsqlrclient-${SQLRELAY_PORTVERSION}.so.1.0.0 \
lib/libsqlrclientwrapper-${SQLRELAY_PORTVERSION}.so.1.0.0 \
@@ -53,9 +57,13 @@ TOSTRIP= bin/sqlr-start \
lib/libmysql50sqlrelay-${SQLRELAY_PORTVERSION}.so.1.0.0 \
lib/libmysql51sqlrelay-${SQLRELAY_PORTVERSION}.so.1.0.0 \
lib/libsqlrserver-${SQLRELAY_PORTVERSION}.so.1.0.0 \
- libexec/sqlrelay/sqlrauth_default.so \
+ 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 \
@@ -66,7 +74,9 @@ TOSTRIP= bin/sqlr-start \
libexec/sqlrelay/sqlrpwdenc_md5.so \
libexec/sqlrelay/sqlrpwdenc_rot.so \
libexec/sqlrelay/sqlrquery_sqlrcmdcstat.so \
- libexec/sqlrelay/sqlrquery_sqlrcmdgstat.so
+ libexec/sqlrelay/sqlrquery_sqlrcmdgstat.so \
+ libexec/sqlrelay/sqlrresultsettranslation_reformatdatetime.so \
+ libexec/sqlrelay/sqlrtranslation_normalize.so
.include "${.CURDIR}/Makefile.common"
@@ -82,6 +92,7 @@ LIB_DEPENDS+= libgdbm.so:${PORTSDIR}/databases/gdbm \
libsqlite3.so:${PORTSDIR}/databases/sqlite3
CONFIGURE_ARGS+= --with-gdbm-prefix="${LOCALBASE}" \
--with-sqlite-prefix="${LOCALBASE}"
+TOSTRIP+= libexec/sqlrelay/sqlrconnection_sqlite.so
.else
CONFIGURE_ARGS+= --without-gdbm-prefix \
--disable-sqlite
@@ -98,6 +109,7 @@ CONFIGURE_ARGS+= --disable-mysql
.if ${PORT_OPTIONS:MFIREBIRD}
USE_FIREBIRD= yes
CONFIGURE_ARGS+= --with-firebird-prefix="${LOCALBASE}"
+TOSTRIP+= libexec/sqlrelay/sqlrconnection_firebird.so
.else
CONFIGURE_ARGS+= --disable-firebird
.endif
@@ -105,6 +117,7 @@ CONFIGURE_ARGS+= --disable-firebird
.if ${PORT_OPTIONS:MPGSQL}
USES+= pgsql
CONFIGURE_ARGS+= --with-postgresql-prefix="${LOCALBASE}"
+TOSTRIP+= libexec/sqlrelay/sqlrconnection_postgresql.so
.else
CONFIGURE_ARGS+= --disable-postgresql
.endif
@@ -112,13 +125,15 @@ CONFIGURE_ARGS+= --disable-postgresql
.if ${PORT_OPTIONS:MODBC}
LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC
CONFIGURE_ARGS+= --with-odbc-prefix="${LOCALBASE}"
+TOSTRIP+= libexec/sqlrelay/sqlrconnection_odbc.so
.else
CONFIGURE_ARGS+= --disable-odbc
.endif
.if ${PORT_OPTIONS:MFREETDS}
-LIB_DEPENDS+= libtds.so:${PORTSDIR}/databases/freetds
+LIB_DEPENDS+= libtdsodbc.so:${PORTSDIR}/databases/freetds
CONFIGURE_ARGS+= --with-freetds-prefix="${LOCALBASE}"
+TOSTRIP+= libexec/sqlrelay/sqlrconnection_freetds.so
.else
CONFIGURE_ARGS+= --disable-freetds
.endif
diff --git a/databases/sqlrelay/Makefile.common b/databases/sqlrelay/Makefile.common
index ae74a655698a..9ea3cddfe306 100644
--- a/databases/sqlrelay/Makefile.common
+++ b/databases/sqlrelay/Makefile.common
@@ -1,7 +1,7 @@
# $FreeBSD$
SQLRELAY_PORTNAME= sqlrelay
-SQLRELAY_PORTVERSION= 0.60
+SQLRELAY_PORTVERSION= 0.62
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 a863bc9d599b..53f07b68ce13 100644
--- a/databases/sqlrelay/distinfo
+++ b/databases/sqlrelay/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sqlrelay-0.60.tar.gz) = aa7dc9a11d99d51f4104ee0e5d5040b1bb16034878303336aec75933d12ce06a
-SIZE (sqlrelay-0.60.tar.gz) = 3224288
+SHA256 (sqlrelay-0.62.tar.gz) = fd4f590ce73aef39030a7a37984b25c8235ae5a04050a7b9c43ec73e791d7d93
+SIZE (sqlrelay-0.62.tar.gz) = 3462899
diff --git a/databases/sqlrelay/files/patch-Makefile b/databases/sqlrelay/files/patch-Makefile
index 9a4135433cc1..e5b34a14f234 100644
--- a/databases/sqlrelay/files/patch-Makefile
+++ b/databases/sqlrelay/files/patch-Makefile
@@ -1,13 +1,18 @@
---- Makefile.orig 2015-03-31 20:50:58 UTC
+--- Makefile.orig 2015-08-05 21:07:34 UTC
+++ Makefile
-@@ -30,11 +30,11 @@ install-doc:
+@@ -30,16 +30,13 @@ install-doc:
cd doc $(AND) $(MAKE) install
+ install-license:
+- $(MKINSTALLDIRS) $(licensedir)
+- $(CP) COPYING $(licensedir)
+- $(CHMOD) 0644 $(licensedir)/COPYING
+
install-pkgconfig:
- $(MKINSTALLDIRS) $(libdir)/pkgconfig
-- $(CP) sqlrelay-c.pc $(libdir)/pkgconfig/sqlrelay-c.pc
+- $(CP) sqlrelay-c.pc $(libdir)/pkgconfig
- $(CHMOD) 0644 $(libdir)/pkgconfig/sqlrelay-c.pc
-- $(CP) sqlrelay-c++.pc $(libdir)/pkgconfig/sqlrelay-c++.pc
+- $(CP) sqlrelay-c++.pc $(libdir)/pkgconfig
- $(CHMOD) 0644 $(libdir)/pkgconfig/sqlrelay-c++.pc
+ $(MKINSTALLDIRS) $(prefix)/libdata/pkgconfig
+ $(CP) sqlrelay-c.pc $(prefix)/libdata/pkgconfig/sqlrelay-c.pc
@@ -17,3 +22,11 @@
uninstall: $(UNINSTALLSUBDIRS)
$(RMTREE) $(libexecdir)
+@@ -63,7 +60,6 @@ uninstall-doc:
+ cd doc $(AND) $(MAKE) uninstall
+
+ uninstall-license:
+- $(RMTREE) $(licensedir)
+
+ uninstall-pkgconfig:
+ $(RM) $(libdir)/pkgconfig/sqlrelay-c.pc \
diff --git a/databases/sqlrelay/pkg-plist b/databases/sqlrelay/pkg-plist
index de3ef931353e..703824d97c56 100644
--- a/databases/sqlrelay/pkg-plist
+++ b/databases/sqlrelay/pkg-plist
@@ -43,52 +43,57 @@ include/sqlrelay/sqlrclientwrapper.h
include/sqlrelay/sqlrserver.h
include/sqlrelay/sqlrutil.h
lib/libmysql3sqlrelay.so
-lib/libmysql3sqlrelay-0.60.so.1
-lib/libmysql3sqlrelay-0.60.so.1.0.0
+lib/libmysql3sqlrelay-0.62.so.1
+lib/libmysql3sqlrelay-0.62.so.1.0.0
lib/libmysql40sqlrelay.so
-lib/libmysql40sqlrelay-0.60.so.1
-lib/libmysql40sqlrelay-0.60.so.1.0.0
+lib/libmysql40sqlrelay-0.62.so.1
+lib/libmysql40sqlrelay-0.62.so.1.0.0
lib/libmysql41sqlrelay.so
-lib/libmysql41sqlrelay-0.60.so.1
-lib/libmysql41sqlrelay-0.60.so.1.0.0
+lib/libmysql41sqlrelay-0.62.so.1
+lib/libmysql41sqlrelay-0.62.so.1.0.0
lib/libmysql50sqlrelay.so
-lib/libmysql50sqlrelay-0.60.so.1
-lib/libmysql50sqlrelay-0.60.so.1.0.0
+lib/libmysql50sqlrelay-0.62.so.1
+lib/libmysql50sqlrelay-0.62.so.1.0.0
lib/libmysql51sqlrelay.so
-lib/libmysql51sqlrelay-0.60.so.1
-lib/libmysql51sqlrelay-0.60.so.1.0.0
+lib/libmysql51sqlrelay-0.62.so.1
+lib/libmysql51sqlrelay-0.62.so.1.0.0
lib/libpqsqlrelay.so
-lib/libpqsqlrelay-0.60.so.1
-lib/libpqsqlrelay-0.60.so.1.0.0
+lib/libpqsqlrelay-0.62.so.1
+lib/libpqsqlrelay-0.62.so.1.0.0
lib/libsqlrclient.a
lib/libsqlrclient.so
-lib/libsqlrclient-0.60.so.1
-lib/libsqlrclient-0.60.so.1.0.0
+lib/libsqlrclient-0.62.so.1
+lib/libsqlrclient-0.62.so.1.0.0
lib/libsqlrclientwrapper.a
lib/libsqlrclientwrapper.so
-lib/libsqlrclientwrapper-0.60.so.1
-lib/libsqlrclientwrapper-0.60.so.1.0.0
-%%ODBC%%lib/libsqlrodbc.a
+lib/libsqlrclientwrapper-0.62.so.1
+lib/libsqlrclientwrapper-0.62.so.1.0.0
%%ODBC%%lib/libsqlrodbc.so
-%%ODBC%%lib/libsqlrodbc-0.60.so.1
-%%ODBC%%lib/libsqlrodbc-0.60.so.1.0.0
+%%ODBC%%lib/libsqlrodbc-0.62.so.1
+%%ODBC%%lib/libsqlrodbc-0.62.so.1.0.0
lib/libsqlrserver.a
lib/libsqlrserver.so
-lib/libsqlrserver-0.60.so.1
-lib/libsqlrserver-0.60.so.1.0.0
+lib/libsqlrserver-0.62.so.1
+lib/libsqlrserver-0.62.so.1.0.0
lib/libsqlrutil.a
lib/libsqlrutil.so
-lib/libsqlrutil-0.60.so.1
-lib/libsqlrutil-0.60.so.1.0.0
+lib/libsqlrutil-0.62.so.1
+lib/libsqlrutil-0.62.so.1.0.0
libdata/pkgconfig/sqlrelay-c++.pc
libdata/pkgconfig/sqlrelay-c.pc
+libexec/sqlrelay/sqlrauth_database.so
+libexec/sqlrelay/sqlrauth_userlist.so
+libexec/sqlrelay/sqlrfilter_patterns.so
+libexec/sqlrelay/sqlrfilter_regex.so
+libexec/sqlrelay/sqlrfilter_string.so
+libexec/sqlrelay/sqlrresultsettranslation_reformatdatetime.so
+libexec/sqlrelay/sqlrtranslation_normalize.so
%%FIREBIRD%%libexec/sqlrelay/sqlrconnection_firebird.so
%%FREETDS%%libexec/sqlrelay/sqlrconnection_freetds.so
%%MYSQL%%libexec/sqlrelay/sqlrconnection_mysql.so
%%ODBC%%libexec/sqlrelay/sqlrconnection_odbc.so
%%PGSQL%%libexec/sqlrelay/sqlrconnection_postgresql.so
%%SQLITE3%%libexec/sqlrelay/sqlrconnection_sqlite.so
-libexec/sqlrelay/sqlrauth_default.so
libexec/sqlrelay/sqlrauth_sqlrelay.so
libexec/sqlrelay/sqlrconnection_router.so
libexec/sqlrelay/sqlrlogger_custom_nw.so