devel/rudiments: update 0.57.0 -> 1.0.2

databases/sqlrelay: update 0.67.0 -> 1.0.0

Recommended reading:
 http://software.firstworks.com/2016/12/benchmarking-sql-relay-100.html

 http://software.firstworks.com/2016/12/rudiments-100-release-announcement.html
 http://software.firstworks.com/2016/12/rudiments-102-release-announcement.html
 http://software.firstworks.com/2016/12/sql-relay.html

10 files changed, 79 insertions, 58 deletions

diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile
index 564e8732c5d0..f5fdfb9e1b2c 100644
--- a/databases/sqlrelay/Makefile
+++ b/databases/sqlrelay/Makefile
@@ -11,10 +11,12 @@ COMMENT=	Persistent DB connection pooling/proxying/load balancing system
 
 LICENSE=	LGPL20
 
-LIB_DEPENDS=	librudiments.so:devel/rudiments
+LIB_DEPENDS=	librudiments.so:devel/rudiments \
+		libkrb5.so:security/krb5 \
+		libcurl.so:ftp/curl
 
 WANT_GNOME=	yes
-USES=		gmake libtool pathfix python
+USES=		gmake libtool pathfix python readline
 PATHFIX_MAKEFILEIN=	Makefile
 CPPFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
@@ -46,17 +48,17 @@ TOSTRIP=	bin/sqlr-start \
 		bin/sqlr-pwdenc \
 		bin/sqlr-status \
 		bin/sqlrsh \
-		lib/libsqlrodbc.so.2.0.0 \
-		lib/libsqlrutil.so.2.0.0 \
-		lib/libsqlrclient.so.2.0.0 \
-		lib/libsqlrclientwrapper.so.2.0.0 \
-		lib/libpqsqlrelay.so.2.0.0 \
-		lib/libmysql3sqlrelay.so.2.0.0 \
-		lib/libmysql40sqlrelay.so.2.0.0 \
-		lib/libmysql41sqlrelay.so.2.0.0 \
-		lib/libmysql50sqlrelay.so.2.0.0 \
-		lib/libmysql51sqlrelay.so.2.0.0 \
-		lib/libsqlrserver.so.2.0.0 \
+		lib/libsqlrodbc.so.4.0.0 \
+		lib/libsqlrutil.so.4.0.0 \
+		lib/libsqlrclient.so.4.0.0 \
+		lib/libsqlrclientwrapper.so.4.0.0 \
+		lib/libpqsqlrelay.so.4.0.0 \
+		lib/libmysql3sqlrelay.so.4.0.0 \
+		lib/libmysql40sqlrelay.so.4.0.0 \
+		lib/libmysql41sqlrelay.so.4.0.0 \
+		lib/libmysql50sqlrelay.so.4.0.0 \
+		lib/libmysql51sqlrelay.so.4.0.0 \
+		lib/libsqlrserver.so.4.0.0 \
 		libexec/sqlrelay/sqlrauth_database.so \
 		libexec/sqlrelay/sqlrauth_krb_userlist.so \
 		libexec/sqlrelay/sqlrauth_proxied.so \
@@ -73,6 +75,7 @@ TOSTRIP=	bin/sqlr-start \
 		libexec/sqlrelay/sqlrlogger_custom_sc.so \
 		libexec/sqlrelay/sqlrlogger_debug.so \
 		libexec/sqlrelay/sqlrlogger_slowqueries.so \
+		libexec/sqlrelay/sqlrnotification_events.so \
 		libexec/sqlrelay/sqlrparser_default.so \
 		libexec/sqlrelay/sqlrprotocol_sqlrclient.so \
 		libexec/sqlrelay/sqlrpwdenc_crypt.so \
@@ -81,6 +84,11 @@ TOSTRIP=	bin/sqlr-start \
 		libexec/sqlrelay/sqlrquery_sqlrcmdcstat.so \
 		libexec/sqlrelay/sqlrquery_sqlrcmdgstat.so \
 		libexec/sqlrelay/sqlrresultsettranslation_reformatdatetime.so \
+		libexec/sqlrelay/sqlrresultsettranslation_test.so \
+		libexec/sqlrelay/sqlrrouter_clientiplist.so \
+		libexec/sqlrelay/sqlrrouter_regex.so \
+		libexec/sqlrelay/sqlrrouter_userlist.so \
+		libexec/sqlrelay/sqlrschedule_cron_userlist.so \
 		libexec/sqlrelay/sqlrtranslation_normalize.so
 
 .include "${.CURDIR}/Makefile.common"
diff --git a/databases/sqlrelay/Makefile.common b/databases/sqlrelay/Makefile.common
index 590fe8893d58..d80ab7845974 100644
--- a/databases/sqlrelay/Makefile.common
+++ b/databases/sqlrelay/Makefile.common
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 SQLRELAY_PORTNAME=	sqlrelay
-SQLRELAY_PORTVERSION=	0.67.0
+SQLRELAY_PORTVERSION=	1.0.0
 
 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 5f3204253444..bae89620dfce 100644
--- a/databases/sqlrelay/distinfo
+++ b/databases/sqlrelay/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479760331
-SHA256 (sqlrelay-0.67.0.tar.gz) = 1121685bbe43b292885a6d89f2f7f1efaaf7cc4bd05baa591e2c1e72d9ba6e6f
-SIZE (sqlrelay-0.67.0.tar.gz) = 4241603
+TIMESTAMP = 1484807374
+SHA256 (sqlrelay-1.0.0.tar.gz) = a62e1479f428381b8f8e3ed34c8b4d3223fbe86aff1ef29f305b53c482f50f8b
+SIZE (sqlrelay-1.0.0.tar.gz) = 4194484
diff --git a/databases/sqlrelay/pkg-plist b/databases/sqlrelay/pkg-plist
index 663df5b1af67..afe48ecee0a5 100644
--- a/databases/sqlrelay/pkg-plist
+++ b/databases/sqlrelay/pkg-plist
@@ -65,42 +65,42 @@ include/sqlrelay/sqlrclientwrapper.h
 include/sqlrelay/sqlrserver.h
 include/sqlrelay/sqlrutil.h
 lib/libmysql3sqlrelay.so
-lib/libmysql3sqlrelay.so.3
-lib/libmysql3sqlrelay.so.3.0.0
+lib/libmysql3sqlrelay.so.4
+lib/libmysql3sqlrelay.so.4.0.0
 lib/libmysql40sqlrelay.so
-lib/libmysql40sqlrelay.so.3
-lib/libmysql40sqlrelay.so.3.0.0
+lib/libmysql40sqlrelay.so.4
+lib/libmysql40sqlrelay.so.4.0.0
 lib/libmysql41sqlrelay.so
-lib/libmysql41sqlrelay.so.3
-lib/libmysql41sqlrelay.so.3.0.0
+lib/libmysql41sqlrelay.so.4
+lib/libmysql41sqlrelay.so.4.0.0
 lib/libmysql50sqlrelay.so
-lib/libmysql50sqlrelay.so.3
-lib/libmysql50sqlrelay.so.3.0.0
+lib/libmysql50sqlrelay.so.4
+lib/libmysql50sqlrelay.so.4.0.0
 lib/libmysql51sqlrelay.so
-lib/libmysql51sqlrelay.so.3
-lib/libmysql51sqlrelay.so.3.0.0
+lib/libmysql51sqlrelay.so.4
+lib/libmysql51sqlrelay.so.4.0.0
 lib/libpqsqlrelay.so
-lib/libpqsqlrelay.so.3
-lib/libpqsqlrelay.so.3.0.0
+lib/libpqsqlrelay.so.4
+lib/libpqsqlrelay.so.4.0.0
 lib/libsqlrclient.a
 lib/libsqlrclient.so
-lib/libsqlrclient.so.3
-lib/libsqlrclient.so.3.0.0
+lib/libsqlrclient.so.4
+lib/libsqlrclient.so.4.0.0
 lib/libsqlrclientwrapper.a
 lib/libsqlrclientwrapper.so
-lib/libsqlrclientwrapper.so.3
-lib/libsqlrclientwrapper.so.3.0.0
+lib/libsqlrclientwrapper.so.4
+lib/libsqlrclientwrapper.so.4.0.0
 %%ODBC%%lib/libsqlrodbc.so
-%%ODBC%%lib/libsqlrodbc.so.3
-%%ODBC%%lib/libsqlrodbc.so.3.0.0
+%%ODBC%%lib/libsqlrodbc.so.4
+%%ODBC%%lib/libsqlrodbc.so.4.0.0
 lib/libsqlrserver.a
 lib/libsqlrserver.so
-lib/libsqlrserver.so.3
-lib/libsqlrserver.so.3.0.0
+lib/libsqlrserver.so.4
+lib/libsqlrserver.so.4.0.0
 lib/libsqlrutil.a
 lib/libsqlrutil.so
-lib/libsqlrutil.so.3
-lib/libsqlrutil.so.3.0.0
+lib/libsqlrutil.so.4
+lib/libsqlrutil.so.4.0.0
 libdata/pkgconfig/sqlrelay-c++.pc
 libdata/pkgconfig/sqlrelay-c.pc
 libexec/sqlrelay/sqlrauth_database.so
diff --git a/devel/rudiments/Makefile b/devel/rudiments/Makefile
index 0a4046e83233..0fa9248d6f46 100644
--- a/devel/rudiments/Makefile
+++ b/devel/rudiments/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	rudiments
-PORTVERSION=	0.57.0
+PORTVERSION=	1.0.2
 CATEGORIES=	devel
 MASTER_SITES=	SF
 
@@ -11,8 +11,11 @@ COMMENT=	C++ class library for daemons, clients, servers, and more
 
 LICENSE=	LGPL20
 
+LIB_DEPENDS=	libgssapi_krb5.so:security/krb5 \
+		libcurl.so:ftp/curl
+
 GNU_CONFIGURE=	yes
-USES=		libtool pathfix pkgconfig shebangfix
+USES=		libtool pathfix pkgconfig readline shebangfix ssl
 PATHFIX_MAKEFILEIN=	Makefile
 SHEBANG_FILES=	doc/programming/insert.pl
 USE_LDCONFIG=	yes
@@ -31,6 +34,6 @@ SSL_CONFIGURE_ON=	--with-ssl-includes=-I${OPENSSLINC} \
 			--with-ssl-libs=-L${OPENSSLLIB}
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/librudiments.so.3.0.0
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/librudiments.so.4.0.2
 
 .include <bsd.port.mk>
diff --git a/devel/rudiments/distinfo b/devel/rudiments/distinfo
index 488aa5f5e041..a3c52f735e43 100644
--- a/devel/rudiments/distinfo
+++ b/devel/rudiments/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479759164
-SHA256 (rudiments-0.57.0.tar.gz) = 7697a5f419a636407b755cc2559ef81e6ee3b33762e877b7ca4566c5f40bdf8d
-SIZE (rudiments-0.57.0.tar.gz) = 2172318
+TIMESTAMP = 1484806695
+SHA256 (rudiments-1.0.2.tar.gz) = 3303cb070991d565350fd835ed6eb27b5b12ede88a981bcb3d8d15cc46a4b351
+SIZE (rudiments-1.0.2.tar.gz) = 2226447
diff --git a/devel/rudiments/files/patch-Makefile b/devel/rudiments/files/patch-Makefile
index 242e3b042695..29716d1a4e87 100644
--- a/devel/rudiments/files/patch-Makefile
+++ b/devel/rudiments/files/patch-Makefile
@@ -1,4 +1,4 @@
---- Makefile.orig	2016-10-03 12:37:06 UTC
+--- Makefile.orig	2017-01-19 06:26:09 UTC
 +++ Makefile
 @@ -17,9 +17,6 @@ install:
  	cd bin $(AND) $(MAKE) install
@@ -10,11 +10,11 @@
  	$(MKINSTALLDIRS) $(prefix)/libdata/pkgconfig
  	$(CP) rudiments.pc $(prefix)/libdata/pkgconfig
  	$(CHMOD) 644 $(prefix)/libdata/pkgconfig/rudiments.pc
-@@ -30,7 +27,6 @@ uninstall:
- 	cd bin $(AND) $(MAKE) uninstall
+@@ -31,7 +28,6 @@ uninstall:
  	cd doc $(AND) $(MAKE) uninstall
  	cd man $(AND) $(MAKE) uninstall
--	$(RMTREE) $(licensedir)
  	$(RM) $(prefix)/libdata/pkgconfig/rudiments.pc
+-	$(RMTREE) $(licensedir)
  
  distclean: clean
+ 	$(RM) config.mk config.cache config.h config.log config.status features.mk libtool rudiments.pc include/Makefile include/rudiments/private/config.h include/rudiments/private/config.h.in~ bin/rudiments-config src/Makefile msvc/rudiments.opensdf msvc/rudiments.sdf msvc/rudiments.suo
diff --git a/devel/rudiments/files/patch-configure b/devel/rudiments/files/patch-configure
index 0f73640eb2ef..9c2b9efbdba6 100644
--- a/devel/rudiments/files/patch-configure
+++ b/devel/rudiments/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2016-03-26 17:20:08 UTC
+--- configure.orig	2016-12-26 04:11:00 UTC
 +++ configure
-@@ -9284,7 +9284,7 @@ $as_echo_n "checking whether the $compil
+@@ -9595,7 +9595,7 @@ $as_echo_n "checking whether the $compil
    hardcode_minus_L=no
    hardcode_shlibpath_var=unsupported
    inherit_rpath=no
@@ -9,7 +9,7 @@
    module_cmds=
    module_expsym_cmds=
    old_archive_from_new_cmds=
-@@ -12248,7 +12248,7 @@ hardcode_automatic_CXX=no
+@@ -12844,7 +12844,7 @@ hardcode_automatic_CXX=no
  inherit_rpath_CXX=no
  module_cmds_CXX=
  module_expsym_cmds_CXX=
@@ -18,7 +18,7 @@
  old_archive_cmds_CXX=$old_archive_cmds
  reload_flag_CXX=$reload_flag
  reload_cmds_CXX=$reload_cmds
-@@ -15767,6 +15767,9 @@ case $host_os in
+@@ -16486,6 +16486,9 @@ case $host_os in
  	*mingw32* )
  		WERROR=""
  		;;
diff --git a/devel/rudiments/files/patch-src_Makefile.in b/devel/rudiments/files/patch-src_Makefile.in
index a27afe5a56fe..5336ace9cefd 100644
--- a/devel/rudiments/files/patch-src_Makefile.in
+++ b/devel/rudiments/files/patch-src_Makefile.in
@@ -1,4 +1,4 @@
---- src/Makefile.in.orig	2016-02-06 03:58:09 UTC
+--- src/Makefile.in.orig	2016-12-18 06:50:16 UTC
 +++ src/Makefile.in
 @@ -11,7 +11,7 @@ LOBJS = @LOBJS@
  .SUFFIXES: .lo
@@ -10,7 +10,7 @@
  .cpp.obj:
  	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(COMPILE) $<
 @@ -22,7 +22,7 @@ clean:
- 	$(LTCLEAN) $(RM) *.lo *.o *.obj *.$(LIBEXT) *.lib *.exp *.idb *.pdb *.manifest
+ 	$(LTCLEAN) $(RM) *.lo *.o *.obj *.$(LIBEXT) *.lib *.exp *.idb *.pdb *.manifest *.ii
  
  librudiments.$(LIBEXT): $(SRCS) $(LOBJS)
 -	$(LTLINK) $(LINK) $(OUT)$@ $(LOBJS) $(LDFLAGS) $(LIBS) $(LINKFLAGS)
diff --git a/devel/rudiments/pkg-plist b/devel/rudiments/pkg-plist
index 5e4678004c3c..f9fdc8da608e 100644
--- a/devel/rudiments/pkg-plist
+++ b/devel/rudiments/pkg-plist
@@ -1,4 +1,5 @@
 bin/rudiments-config
+include/rudiments/avltree.h
 include/rudiments/bytebuffer.h
 include/rudiments/bytestring.h
 include/rudiments/character.h
@@ -22,6 +23,7 @@ include/rudiments/filedescriptor.h
 include/rudiments/filesystem.h
 include/rudiments/groupentry.h
 include/rudiments/gss.h
+include/rudiments/hash.h
 include/rudiments/hostentry.h
 include/rudiments/inetsocketclient.h
 include/rudiments/inetsocketserver.h
@@ -29,10 +31,15 @@ include/rudiments/inetsocketutil.h
 include/rudiments/linkedlist.h
 include/rudiments/listener.h
 include/rudiments/logger.h
+include/rudiments/md5.h
 include/rudiments/memorymap.h
 include/rudiments/memorypool.h
 include/rudiments/parameterstring.h
 include/rudiments/permissions.h
+include/rudiments/private/avltree.h
+include/rudiments/private/avltreeincludes.h
+include/rudiments/private/avltreeinlines.h
+include/rudiments/private/avltreenode.h
 include/rudiments/private/bytebuffer.h
 include/rudiments/private/bytebufferincludes.h
 include/rudiments/private/bytestringincludes.h
@@ -84,6 +91,7 @@ include/rudiments/private/gsscontext.h
 include/rudiments/private/gsscredentials.h
 include/rudiments/private/gssincludes.h
 include/rudiments/private/gssmechanism.h
+include/rudiments/private/hashincludes.h
 include/rudiments/private/hostentry.h
 include/rudiments/private/hostentryincludes.h
 include/rudiments/private/inetsocketclient.h
@@ -97,17 +105,19 @@ include/rudiments/private/linkedlist.h
 include/rudiments/private/linkedlistincludes.h
 include/rudiments/private/linkedlistinlines.h
 include/rudiments/private/linkedlistnode.h
-include/rudiments/private/linkedlistutilinlines.h
 include/rudiments/private/listener.h
 include/rudiments/private/listenerincludes.h
 include/rudiments/private/logdestination.h
 include/rudiments/private/logger.h
 include/rudiments/private/loggerincludes.h
+include/rudiments/private/md5.h
+include/rudiments/private/md5includes.h
 include/rudiments/private/memorymap.h
 include/rudiments/private/memorymapincludes.h
 include/rudiments/private/memorypool.h
 include/rudiments/private/memorypoolincludes.h
 include/rudiments/private/new.h
+include/rudiments/private/nodeinlines.h
 include/rudiments/private/parameterstring.h
 include/rudiments/private/parameterstringincludes.h
 include/rudiments/private/permissions.h
@@ -215,9 +225,9 @@ include/rudiments/xmldom.h
 include/rudiments/xmldomevents.h
 include/rudiments/xmldomnode.h
 include/rudiments/xmlsax.h
-lib/librudiments.so.3
-lib/librudiments.so.3.0.0
 lib/librudiments.a
 lib/librudiments.so
+lib/librudiments.so.4
+lib/librudiments.so.4.0.2
 libdata/pkgconfig/rudiments.pc
 man/man1/rudiments-config.1.gz