Index: head/textproc/flex/Makefile
===================================================================
--- head/textproc/flex/Makefile	(revision 410796)
+++ head/textproc/flex/Makefile	(revision 410797)
@@ -1,45 +1,46 @@
 # $FreeBSD$
 
 PORTNAME=	flex
-PORTVERSION=	2.6.0
+PORTVERSION=	2.6.1
 CATEGORIES=	textproc
-MASTER_SITES=	SF/${PORTNAME}
+MASTER_SITES=	https://github.com/westes/flex/releases/download/v${PORTVERSION}/
 
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Fast lexical analyzer generator
 
 BUILD_DEPENDS=	help2man:${PORTSDIR}/misc/help2man \
 		gm4:${PORTSDIR}/devel/m4
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
-USES=		bison gmake libtool makeinfo tar:bzip2
+USES=		bison gmake libtool makeinfo tar:xz
 GNU_CONFIGURE=	yes
 # install flex header to its own dir to avoid conflict with system flex.
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/flex --disable-shared
 CONFIGURE_ENV=	M4=${LOCALBASE}/bin/gm4 MAKEINFO="makeinfo --no-split"
 INSTALL_TARGET=	install-strip
 
 INFO=		flex
+PORTDOCS=	*
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	DOCS EXAMPLES NLS
 OPTIONS_SUB=	yes
 NLS_USES=	gettext iconv
 NLS_CONFIGURE_ENABLE=	nls
 
 .include <bsd.port.options.mk>
 
 post-patch:	.SILENT
 	${REINPLACE_CMD} -Ee 's/tests//' \
 		-e '/mode=compile ..CC/s/\\$$/-fPIC -DPIC &/' \
 		${WRKSRC}/Makefile.in
 	${RM} -f ${WRKSRC}/doc/*.info*
 
 post-install:
 .if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${CP} -r ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}/
 	${RM} ${STAGEDIR}${EXAMPLESDIR}/Makefile.am
 .endif
 
 .include <bsd.port.mk>
Index: head/textproc/flex/distinfo
===================================================================
--- head/textproc/flex/distinfo	(revision 410796)
+++ head/textproc/flex/distinfo	(revision 410797)
@@ -1,2 +1,2 @@
-SHA256 (flex-2.6.0.tar.bz2) = 24e611ef5a4703a191012f80c1027dc9d12555183ce0ecd46f3636e587e9b8e9
-SIZE (flex-2.6.0.tar.bz2) = 1634276
+SHA256 (flex-2.6.1.tar.xz) = 2c7a412c1640e094cb058d9b2fe39d450186e09574bebb7aa28f783e3799103f
+SIZE (flex-2.6.1.tar.xz) = 835048
Index: head/textproc/flex/pkg-plist
===================================================================
--- head/textproc/flex/pkg-plist	(revision 410796)
+++ head/textproc/flex/pkg-plist	(revision 410797)
@@ -1,35 +1,29 @@
 bin/flex
 bin/flex++
 include/flex/FlexLexer.h
 lib/libfl.a
 lib/libfl_pic.a
 man/man1/flex.1.gz
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/ONEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/flex.pdf
 %%NLS%%share/locale/ca/LC_MESSAGES/flex.mo
 %%NLS%%share/locale/da/LC_MESSAGES/flex.mo
 %%NLS%%share/locale/de/LC_MESSAGES/flex.mo
 %%NLS%%share/locale/en@boldquot/LC_MESSAGES/flex.mo
 %%NLS%%share/locale/en@quot/LC_MESSAGES/flex.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/flex.mo
 %%NLS%%share/locale/es/LC_MESSAGES/flex.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/flex.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/flex.mo
 %%NLS%%share/locale/ga/LC_MESSAGES/flex.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/flex.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/flex.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/flex.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/flex.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/flex.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/flex.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/flex.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/flex.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/flex.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/flex.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/flex.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/flex.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/flex.mo