Index: branches/2018Q3/www/links/Makefile
===================================================================
--- branches/2018Q3/www/links/Makefile	(revision 479104)
+++ branches/2018Q3/www/links/Makefile	(revision 479105)
@@ -1,105 +1,107 @@
 # Created by: Michael Vasilenko <acid@stu.cn.ua>
 # $FreeBSD$
 
 PORTNAME=	links
-DISTVERSION=	2.14
-PORTREVISION=	1
+DISTVERSION=	2.16
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://links.twibright.com/download/
 
 MAINTAINER=	portmaster@BSDforge.com
 COMMENT=	Lynx-like text WWW browser
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 CONFLICTS=	links-0* links-hacked-[0-9]* links1-[0-9]*
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ssl --without-pmshell --without-atheos \
 		--without-gpm --without-fb --without-windows
 
 USES=		cpe localbase:ldflags ssl gettext-runtime
 
 CPE_VENDOR=	twibright
 
 PLIST_FILES=	bin/links man/man1/links.1.gz
 
-OPTIONS_DEFINE=	CIPHERSTRING DIRECTFB IPV6 NLS SVG SVGALIB THREADS TRANS \
+OPTIONS_DEFINE=	BROTLI CIPHERSTRING DIRECTFB IPV6 NLS SVG SVGALIB THREADS TRANS \
 		UTF8 X11
 OPTIONS_DEFAULT=	UTF8 X11
 
+BROTLI_LIB_DEPENDS=	libbrotlidec.so:archivers/brotli
+BROTLI_CONFIGURE_WITH=	brotli
+
 CIPHERSTRING_DESC=	Select the OpenSSL ciphers used via CIPHERSTRING
 DIRECTFB_DESC=		DirectFB graphics support
 TRANS_DESC=		Hack for background transparency
 
 DIRECTFB_LIB_DEPENDS=	libdirectfb.so:devel/directfb
 DIRECTFB_CONFIGURE_WITH=directfb
 
 IPV6_CONFIGURE_WITH=	ipv6
 
 NLS_USES=		gettext-runtime
 NLS_CONFIGURE_ENABLE=	gettext-runtime
 
 SVG_CONFIGURE_WITH=	librsvg
 SVG_USE=		gnome=librsvg2,glib20,gdkpixbuf2,cairo
 
 SVGALIB_LIB_DEPENDS=	libvga.so:graphics/svgalib
 SVGALIB_CONFIGURE_WITH=	svgalib
 
 THREADS_CFLAGS=	-DHAVE_PTHREADS
 THREADS_LDFLAGS=-pthread
 
 TRANS_EXTRA_PATCHES=	${FILESDIR}/extra-terminal.c.diff
 
 UTF8_CONFIGURE_ENABLE=	utf8
 
 X11_USE=		xorg=x11,xproto
 X11_LIB_DEPENDS=	libevent.so:devel/libevent \
 			libfontconfig.so:x11-fonts/fontconfig
 X11_CONFIGURE_WITH=	x
 X11_PLIST_FILES=	share/pixmaps/links.xpm
 
 .include <bsd.port.options.mk>
 
 #CIPHERSTRING must be a valid OpenSSL cipher string(see ciphers(1)):
 CIPHERSTRING?=	HIGH:!SSLv2:!aNULL:!eNULL:@STRENGTH
 
 .if ${PORT_OPTIONS:MDIRECTFB} || ${PORT_OPTIONS:MSVGALIB} || ${PORT_OPTIONS:MX11}
 LIB_DEPENDS+=	libpng.so:graphics/png \
 		libtiff.so:graphics/tiff
 USES+=		jpeg
 CONFIGURE_ARGS+=	--enable-graphics
 .else
 .if ${PORT_OPTIONS:MSVG}
 IGNORE=	option SVG requires one of DIRECTFB, SVGALIB, or X11
 .endif
 CONFIGURE_ARGS+=	--disable-graphics --without-libjpeg --without-libtiff
 .endif
 
 .if ${PORT_OPTIONS:MX11}
 DESKTOP_ENTRIES="links" \
 		"Lynx-like text WWW browser" \
 		"${PREFIX}/share/pixmaps/links.xpm" \
 		"links -g" \
 		"Network;WebBrowser;" \
 		false
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e "s!/etc/!${PREFIX}/etc/!" ${WRKSRC}/os_dep.h
 	@${REINPLACE_CMD} -e "/LIBS=/{s/-lpthread/-pthread/;s/-ldl//;}" \
 		${WRKSRC}/configure
 .if ${PORT_OPTIONS:MCIPHERSTRING}
 	@${REINPLACE_CMD} -e '/SSL_CTX_set_options/ \
-	s/;/; SSL_CTX_set_cipher_list(context, "${CIPHERSTRING}");/' \
+	s/;/; SSL_CTX_set_cipher_list(ctx, "${CIPHERSTRING}");/' \
 		${WRKSRC}/https.c
 .endif
 
 .if ${PORT_OPTIONS:MX11}
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/graphics/links.xpm ${STAGEDIR}${PREFIX}/share/pixmaps/links.xpm
 .endif
 
 .include <bsd.port.mk>
Index: branches/2018Q3/www/links/distinfo
===================================================================
--- branches/2018Q3/www/links/distinfo	(revision 479104)
+++ branches/2018Q3/www/links/distinfo	(revision 479105)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1515181008
-SHA256 (links-2.14.tar.gz) = 22fa8dcb5a60b8ffd611de31ebd4c79edce472637a3554bab401795da91d4387
-SIZE (links-2.14.tar.gz) = 7142389
+TIMESTAMP = 1535040129
+SHA256 (links-2.16.tar.gz) = 83ab4557d9b121570384d1bd27adf16f962b9b007bac5780ae094e6fff6b3d62
+SIZE (links-2.16.tar.gz) = 7365133
Index: branches/2018Q3
===================================================================
--- branches/2018Q3	(revision 479104)
+++ branches/2018Q3	(revision 479105)

Property changes on: branches/2018Q3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r479089