Index: head/textproc/flex/Makefile
===================================================================
--- head/textproc/flex/Makefile	(revision 528942)
+++ head/textproc/flex/Makefile	(revision 528943)
@@ -1,46 +1,44 @@
 # $FreeBSD$
 
 PORTNAME=	flex
 PORTVERSION=	2.6.4
-PORTREVISION=	1
-CATEGORIES=	textproc
+PORTREVISION=	2
+CATEGORIES=	textproc devel
 MASTER_SITES=	https://github.com/westes/flex/releases/download/v${PORTVERSION}/
 
 MAINTAINER=	mandree@FreeBSD.org
 COMMENT=	Fast lexical analyzer generator
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	help2man:misc/help2man \
-		gm4:devel/m4
-RUN_DEPENDS=	gm4:devel/m4
+BUILD_DEPENDS=	help2man:misc/help2man
 
-USES=		bison gmake libtool makeinfo
+USES=		bison:alias gmake libtool makeinfo
 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"
+CONFIGURE_ENV=	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
 
 post-patch:	.SILENT
 	${REINPLACE_CMD} -Ee 's/tests//' \
 		-e '/mode=compile ..CC/s/\\$$/-fPIC -DPIC &/' \
 		${WRKSRC}/Makefile.in
 	${RM} ${WRKSRC}/doc/*.info*
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${CP} -r ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}/
 	${RM} ${STAGEDIR}${EXAMPLESDIR}/Makefile.am
 
 .include <bsd.port.mk>