Index: branches/2016Q4/dns/c-ares/Makefile
===================================================================
--- branches/2016Q4/dns/c-ares/Makefile	(revision 424257)
+++ branches/2016Q4/dns/c-ares/Makefile	(revision 424258)
@@ -1,44 +1,44 @@
 # Created by: roam@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	c-ares
-PORTVERSION=	1.11.0
+PORTVERSION=	1.12.0
 CATEGORIES=	dns
 MASTER_SITES=	http://c-ares.haxx.se/download/ \
 		http://obsd.isc.org/pub/OpenBSD/distfiles/ \
 		http://mirrors.rit.edu/zi/
 
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	Asynchronous DNS resolver library
 
 LICENSE=	MIT
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-werror
 INSTALL_TARGET=	install-strip
 SSP_UNSAFE=	Refuses -l in LDFLAGS
 USES=		libtool pathfix compiler:c++11-lang
 USE_LDCONFIG=	yes
 
 PROGRAMS=	acountry adig ahost
 
 OPTIONS_DEFINE=		CONFIG_INFO DEBUG HIDE_SYMBOLS OPTIMIZED_CFLAGS
 OPTIONS_DEFAULT=	CONFIG_INFO HIDE_SYMBOLS
 
 CONFIG_INFO_DESC=	Add the ares_config_info patch
 HIDE_SYMBOLS_DESC=	Hide internal library symbols
 OPTIMIZED_CFLAGS_DESC=	Build with compiler optimizations
 
 CONFLICTS=		ares-1.*
 
 MAKE_JOBS_UNSAFE=	yes
 
 CONFIG_INFO_EXTRA_PATCHES=	${FILESDIR}/ares-config-info.patch
 DEBUG_CONFIGURE_ENABLE=	debug
 HIDE_SYMBOLS_CONFIGURE_ENABLE=	symbol-hiding
 OPTIMIZED_CFLAGS_CONFIGURE_ENABLE=	optimize
 
 post-install:
 	${INSTALL_PROGRAM} ${PROGRAMS:S@^@${WRKSRC}/.libs/@} ${STAGEDIR}${PREFIX}/bin/
 
 .include <bsd.port.mk>
Index: branches/2016Q4/dns/c-ares/distinfo
===================================================================
--- branches/2016Q4/dns/c-ares/distinfo	(revision 424257)
+++ branches/2016Q4/dns/c-ares/distinfo	(revision 424258)
@@ -1,2 +1,3 @@
-SHA256 (c-ares-1.11.0.tar.gz) = b3612e6617d9682928a1d50c1040de4db6519f977f0b25d40cf1b632900b3efd
-SIZE (c-ares-1.11.0.tar.gz) = 1102531
+TIMESTAMP = 1476509937
+SHA256 (c-ares-1.12.0.tar.gz) = 8692f9403cdcdf936130e045c84021665118ee9bfea905d1a76f04d4e6f365fb
+SIZE (c-ares-1.12.0.tar.gz) = 1769879
Index: branches/2016Q4/dns/c-ares/pkg-plist
===================================================================
--- branches/2016Q4/dns/c-ares/pkg-plist	(revision 424257)
+++ branches/2016Q4/dns/c-ares/pkg-plist	(revision 424258)
@@ -1,65 +1,65 @@
 bin/acountry
 bin/adig
 bin/ahost
 include/ares.h
 include/ares_build.h
 include/ares_rules.h
 include/ares_dns.h
 include/ares_version.h
 lib/libcares.a
 lib/libcares.so
 lib/libcares.so.2
-lib/libcares.so.2.1.0
+lib/libcares.so.2.2.0
 libdata/pkgconfig/libcares.pc
 man/man3/ares_cancel.3.gz
 man/man3/ares_create_query.3.gz
 man/man3/ares_destroy.3.gz
 man/man3/ares_destroy_options.3.gz
 man/man3/ares_dup.3.gz
 man/man3/ares_expand_name.3.gz
 man/man3/ares_expand_string.3.gz
 man/man3/ares_fds.3.gz
 man/man3/ares_free_data.3.gz
 man/man3/ares_free_hostent.3.gz
 man/man3/ares_free_string.3.gz
 man/man3/ares_get_servers.3.gz
 man/man3/ares_get_servers_ports.3.gz
 man/man3/ares_gethostbyaddr.3.gz
 man/man3/ares_gethostbyname.3.gz
 man/man3/ares_gethostbyname_file.3.gz
 man/man3/ares_getnameinfo.3.gz
 man/man3/ares_getsock.3.gz
 man/man3/ares_inet_ntop.3.gz
 man/man3/ares_inet_pton.3.gz
 man/man3/ares_init.3.gz
 man/man3/ares_init_options.3.gz
 man/man3/ares_library_cleanup.3.gz
 man/man3/ares_library_init.3.gz
 man/man3/ares_mkquery.3.gz
 man/man3/ares_parse_a_reply.3.gz
 man/man3/ares_parse_aaaa_reply.3.gz
 man/man3/ares_parse_mx_reply.3.gz
 man/man3/ares_parse_naptr_reply.3.gz
 man/man3/ares_parse_ns_reply.3.gz
 man/man3/ares_parse_ptr_reply.3.gz
 man/man3/ares_parse_soa_reply.3.gz
 man/man3/ares_parse_srv_reply.3.gz
 man/man3/ares_parse_txt_reply.3.gz
 man/man3/ares_process.3.gz
 man/man3/ares_query.3.gz
 man/man3/ares_save_options.3.gz
 man/man3/ares_search.3.gz
 man/man3/ares_send.3.gz
 man/man3/ares_set_local_dev.3.gz
 man/man3/ares_set_local_ip4.3.gz
 man/man3/ares_set_local_ip6.3.gz
 man/man3/ares_set_servers.3.gz
 man/man3/ares_set_servers_csv.3.gz
 man/man3/ares_set_servers_ports.3.gz
 man/man3/ares_set_servers_ports_csv.3.gz
 man/man3/ares_set_socket_callback.3.gz
 man/man3/ares_set_socket_configure_callback.3.gz
 man/man3/ares_set_sortlist.3.gz
 man/man3/ares_strerror.3.gz
 man/man3/ares_timeout.3.gz
 man/man3/ares_version.3.gz
Index: branches/2016Q4
===================================================================
--- branches/2016Q4	(revision 424257)
+++ branches/2016Q4	(revision 424258)

Property changes on: branches/2016Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r424257