--- dnscrypt-proxy/Makefile	2016-07-12 22:03:52 UTC
+++ dnscrypt-proxy/Makefile	
@@ -2,8 +2,7 @@ 
 # $FreeBSD: head/dns/dnscrypt-proxy/Makefile 418449 2016-07-12 22:03:52Z marino $
 
 PORTNAME=	dnscrypt-proxy
-PORTVERSION=	1.6.1
-PORTREVISION=	2
+PORTVERSION=	1.7.0
 CATEGORIES=	dns
 MASTER_SITES=	http://download.dnscrypt.org/dnscrypt-proxy/ \
 		http://www.dns-lab.com/downloads/dnscrypt-proxy/
@@ -16,30 +15,36 @@ 
 
 LIB_DEPENDS=	libsodium.so:security/libsodium
 
+USERS=		_dnscrypt-proxy
+
 GNU_CONFIGURE=	yes
 USES=		execinfo gmake
 
-OPTIONS_DEFINE=	DOCS
-OPTIONS_SINGLE=	RCWHICH
-OPTIONS_SINGLE_RCWHICH=	RCSINGLE RCMULTI
-RCWHICH_DESC=	rc script to use:
-RCSINGLE_DESC=	use default rc script for single daemon
-RCMULTI_DESC=	use experimental rc script for multiple instances
-OPTIONS_DEFAULT=RCSINGLE
-
-.include <bsd.port.options.mk>
+INSTALL_TARGET=	install-strip
 
-.if ${PORT_OPTIONS:MRCMULTI}
-USE_RC_SUBR=	${PORTNAME}_multi
-SUB_FILES=	pkg-message_multi
-.else
-USE_RC_SUBR=	${PORTNAME}
-SUB_FILES=	pkg-message
-.endif
+PORTDOCS=	AUTHORS ChangeLog INSTALL NEWS README* THANKS
 
-USERS=		_dnscrypt-proxy
+OPTIONS_DEFINE=	DOCS PLUGINS PLUGINS_RELAXED PLUGINS_ROOT
+OPTIONS_SINGLE=	RCWHICH
+OPTIONS_SINGLE_RCWHICH=	RCSINGLE RCMULTI
+OPTIONS_DEFAULT=	PLUGINS RCSINGLE
+OPTIONS_SUB=	yes
 
-PORTDOCS=	AUTHORS ChangeLog INSTALL NEWS README* THANKS
+PLUGINS_CONFIGURE_ENABLE=	plugins
+PLUGINS_LIB_DEPENDS=	libltdl.so:devel/libltdl \
+		libldns.so:dns/ldns
+PLUGINS_USES=	libtool
+PLUGINS_RELAXED_DESC=	Allow loading plugins owned by other users
+PLUGINS_RELAXED_CONFIGURE_ENABLE=	relaxed-plugins-permissions
+PLUGINS_ROOT_DESC=	Only load plugins sitting in the default plugins directory
+PLUGINS_ROOT_CONFIGURE_ENABLE=	plugins-root
+RCWHICH_DESC=	Rc script to use:
+RCSINGLE_DESC=	Use default rc script for single daemon
+RCSINGLE_VARS=	USE_RC_SUBR=${PORTNAME}
+RCSINGLE_SUB_FILES=	pkg-message
+RCMULTI_DESC=	Use experimental rc script for multiple instances
+RCMULTI_VARS=	USE_RC_SUBR=${PORTNAME}_multi
+RCMULTI_SUB_FILES=	pkg-message_multi
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
--- dnscrypt-proxy/distinfo	2016-02-10 00:04:04 UTC
+++ dnscrypt-proxy/distinfo	
@@ -1,2 +1,3 @@ 
-SHA256 (dnscrypt-proxy-1.6.1.tar.gz) = c519012a66f3ee30be02113d1e0139be08ccd2ec45ca4102eac35be731a65340
-SIZE (dnscrypt-proxy-1.6.1.tar.gz) = 1721006
+TIMESTAMP = 1469962250
+SHA256 (dnscrypt-proxy-1.7.0.tar.gz) = be9827f66401f38fd4bdb372046eff9b5802ab5f3d188878a0dcd7bd20074c09
+SIZE (dnscrypt-proxy-1.7.0.tar.gz) = 1714401
--- dnscrypt-proxy/files/patch-src_proxy_edns.c	2016-02-10 00:04:04 UTC
+++ dnscrypt-proxy/files/patch-src_proxy_edns.c	
@@ -1,34 +0,0 @@ 
-# Origin: https://github.com/jedisct1/dnscrypt-proxy/commit/a193c6ff1ca2b24bb283f0d64bf8f5faefc0def1
-# Subject: Repair edns0 support
-
---- src/proxy/edns.c.orig	2016-02-02 15:42:19 UTC
-+++ src/proxy/edns.c
-@@ -10,7 +10,7 @@
- #include "dnscrypt_proxy.h"
- #include "edns.h"
- 
--#define DNS_MAX_HOSTNAME_LEN 255U
-+#define DNS_MAX_HOSTNAME_LEN 256U
- 
- static int
- _skip_name(const uint8_t * const dns_packet, const size_t dns_packet_len,
-@@ -26,9 +26,6 @@ _skip_name(const uint8_t * const dns_pac
-     }
-     for (;;) {
-         name_component_len = dns_packet[offset];
--        if (name_component_len == 0U) {
--            break;
--        }
-         if ((name_component_len & 0xC0) == 0xC0) {
-             name_component_len = 1U;
-         }
-@@ -40,6 +37,9 @@ _skip_name(const uint8_t * const dns_pac
-             return -1;
-         }
-         offset += name_component_len + 1U;
-+        if (name_component_len == 0U) {
-+            break;
-+        }
-     }
-     if (offset >= dns_packet_len) {
-         return -1;
--- dnscrypt-proxy/pkg-plist	2015-08-27 15:15:20 UTC
+++ dnscrypt-proxy/pkg-plist	
@@ -1,6 +1,15 @@ 
+bin/hostip
+%%PLUGINS%%include/dnscrypt/plugin.h
+%%PLUGINS%%include/dnscrypt/private.h
+%%PLUGINS%%include/dnscrypt/version.h
+%%PLUGINS%%lib/dnscrypt-proxy/libdcplugin_example.so
+%%PLUGINS%%lib/dnscrypt-proxy/libdcplugin_example_ldns_aaaa_blocking.so
+%%PLUGINS%%lib/dnscrypt-proxy/libdcplugin_example_ldns_blocking.so
+%%PLUGINS%%lib/dnscrypt-proxy/libdcplugin_example_ldns_opendns_deviceid.so
+%%PLUGINS%%lib/dnscrypt-proxy/libdcplugin_example_ldns_opendns_set_client_ip.so
+%%PLUGINS%%lib/dnscrypt-proxy/libdcplugin_example_logging.so
 man/man8/dnscrypt-proxy.8.gz
 man/man8/hostip.8.gz
 sbin/dnscrypt-proxy
-bin/hostip
 %%DATADIR%%/dnscrypt-resolvers.csv
 %%DATADIR%%/minisign.pub