Index: head/net/axa/Makefile
===================================================================
--- head/net/axa/Makefile	(revision 482914)
+++ head/net/axa/Makefile	(revision 482915)
@@ -1,62 +1,61 @@
 # $FreeBSD$
 
 PORTNAME=	axa
-PORTVERSION=	2.1.0
+PORTVERSION=	2.2.0
 CATEGORIES=	net dns
 MASTER_SITES=	FARSIGHT LOCAL/truckman/farsight
 
 MAINTAINER=	truckman@FreeBSD.org
 COMMENT=	AXA library and tools
 
 LICENSE=	APACHE20 PD
 LICENSE_COMB=	multi
 LICENSE_FILE_APACHE20=	${WRKSRC}/copyright
 LICENSE_FILE_PD=	${WRKSRC}/license_pd
 
 BUILD_DEPENDS=	bash:shells/bash \
 		sie-nmsg>0:net/sie-nmsg
-LIB_DEPENDS=	libcheck.so:devel/check \
+LIB_DEPENDS=	liblmdb.so:databases/lmdb \
+		libcheck.so:devel/check \
 		libprotobuf-c.so:devel/protobuf-c \
 		libnmsg.so:net/nmsg \
 		libwdns.so:dns/wdns \
 		libyajl.so:devel/yajl
 RUN_DEPENDS=	sie-nmsg>0:net/sie-nmsg
 
 USES=		autoreconf gmake libedit libtool pathfix pkgconfig shebangfix \
 		ssl
 
 GNU_CONFIGURE=	yes
 CONFIGURE_SHELL=	${LOCALBASE}/bin/bash
 USE_LDCONFIG=	yes
-SHEBANG_FILES=	cert_tools/axa_link_certs.in
+SHEBANG_FILES=	tools/axa_link_certs.in
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS DOXYGEN
 OPTIONS_DEFAULT=DOXYGEN
 
 ALL_TARGET=	all
 INSTALL_TARGET=	install-strip
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOXYGEN_ALL_TARGET=	html-local
 DOXYGEN_IMPLIES=	DOCS
 
 LDFLAGS+=	-lm
 
 .include <bsd.port.pre.mk>
 
-.if ${SSL_DEFAULT} == base
-CONFIGURE_ENV+=	libcrypto_CFLAGS="-I${OPENSSLINC}"		\
-		libcrypto_LIBS="${OPENSSLLIB}/libcrypto.so"	\
-		libssl_CFLAGS="-I${OPENSSLINC}"			\
-		libssl_LIBS="${OPENSSLLIB}/libssl.so"
-.endif
+CONFIGURE_ENV+=	libcrypto_CFLAGS="-I${OPENSSLINC}"	\
+		libcrypto_LIBS="-lcrypto"		\
+		libssl_CFLAGS="-I${OPENSSLINC}"		\
+		libssl_LIBS="-lssl"
 
 post-extract:
 	(${ECHO} "For libmy/b64_encode.c:" ; \
 	 ${SED} -ne "1,/\*\//p" ${WRKSRC}/libmy/b64_encode.c ) > ${LICENSE_FILE_PD}
 
 post-install-DOXYGEN-on:
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.post.mk>
Index: head/net/axa/distinfo
===================================================================
--- head/net/axa/distinfo	(revision 482914)
+++ head/net/axa/distinfo	(revision 482915)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1538155875
-SHA256 (axa-2.1.0.tar.gz) = 80ab8b0272c8d41ee09e96c4eb5334197caffd33ba9f6e4433789d471945bfea
-SIZE (axa-2.1.0.tar.gz) = 572634
+TIMESTAMP = 1540359102
+SHA256 (axa-2.2.0.tar.gz) = d309b64e3661c0f063f785f55eac5fa0a2de2ee87c70b61920b417459076f3fd
+SIZE (axa-2.2.0.tar.gz) = 577610
Index: head/net/axa/pkg-plist
===================================================================
--- head/net/axa/pkg-plist	(revision 482914)
+++ head/net/axa/pkg-plist	(revision 482915)
@@ -1,37 +1,40 @@
 bin/axa_link_certs
 bin/axa_make_cert
 bin/axa_server_cert
+bin/axa_tsindextool
 bin/radtool
 bin/radtunnel
 bin/sratool
 bin/sratunnel
 %%ETCDIR%%/fields
 include/axa/axa.h
 include/axa/axa_endian.h
 include/axa/bits.h
 include/axa/client.h
 include/axa/client_config.h
 include/axa/dns_walk.h
 include/axa/fields.h
 include/axa/json.h
+include/axa/mdb.h
 include/axa/strbuf.h
 include/axa/open_nmsg_out.h
 include/axa/protocol.h
 include/axa/socket.h
 include/axa/trie.h
 include/axa/version.h
 include/axa/wire.h
 include/axa/yajl_shortcuts.h
 include/libmy/b64_encode.h
 lib/libaxa.a
 lib/libaxa.so
 lib/libaxa.so.1
-lib/libaxa.so.1.0.0
+lib/libaxa.so.1.1.0
 libdata/pkgconfig/libaxa.pc
 man/man1/radtool.1.gz
 man/man1/radtunnel.1.gz
 man/man1/sratool.1.gz
 man/man1/sratunnel.1.gz
 man/man8/axa_link_certs.8.gz
 man/man8/axa_make_cert.8.gz
 man/man8/axa_server_cert.8.gz
+man/man8/axa_tsindextool.8.gz