Index: devel/m4/Makefile
===================================================================
--- devel/m4/Makefile	(revision 520720)
+++ devel/m4/Makefile	(working copy)
@@ -14,23 +14,32 @@
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-OPTIONS_DEFINE=	LIBSIGSEGV EXAMPLES
+USES=		tar:xz
+
+OPTIONS_DEFINE=	INFO EXAMPLES LIBSIGSEGV
+OPTIONS_DEFAULT=INFO
 LIBSIGSEGV_DESC=Use alternative page fault handler (GNU libsigsegv)
 
 CONFIGURE_ARGS=	--program-prefix=g
-CONFIGURE_ENV=	MAKEINFO="${MAKEINFO} --no-split"
 GNU_CONFIGURE=	yes
-USES=		makeinfo tar:xz
 
 EXAMPLESDIR=	${PREFIX}/share/examples/gm4
-INFO=		m4
 
+INFO_CONFIGURE_ENV=MAKEINFO="${MAKEINFO} --no-split"
+INFO_EXTRA_PATCHES={PATCHDIR}/extra-patch-doc-m4.texi
+INFO_INFO=	m4
+INFO_USES=	makeinfo
+
 LIBSIGSEGV_CONFIGURE_OFF=	--without-libsigsegv-prefix
 LIBSIGSEGV_CONFIGURE_ON=	--with-libsigsegv-prefix=${LOCALBASE}
 LIBSIGSEGV_LIB_DEPENDS=		libsigsegv.so:devel/libsigsegv
 
+.include <bsd.port.options.mk>
+
 post-patch:
+.if ${PORT_OPTIONS:MINFO}
 	@${REINPLACE_CMD} -e '/^* M4: / s|M4|G&|' ${WRKSRC}/doc/m4.texi
+.endif
 	@${REINPLACE_CMD} -e '/^install-exec-am: / s| .*||' ${WRKSRC}/lib/Makefile.in
 
 post-install-EXAMPLES-on:
Index: devel/m4/files/extra-patch-doc-m4.texi
===================================================================
--- devel/m4/files/extra-patch-doc-m4.texi	(nonexistent)
+++ devel/m4/files/extra-patch-doc-m4.texi	(working copy)
@@ -0,0 +1,10 @@
+--- doc/m4.texi.orig	2016-12-31 22:34:38 UTC
++++ doc/m4.texi
+@@ -1,6 +1,7 @@
+ \input texinfo @c -*- texinfo -*-
+ @comment ========================================================
+ @comment %**start of header
++@documentencoding ISO-8859-1
+ @setfilename m4.info
+ @include version.texi
+ @settitle GNU M4 @value{VERSION} macro processor

Property changes on: devel/m4/files/extra-patch-doc-m4.texi
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: devel/m4/files/patch-doc-m4.texi
===================================================================
--- devel/m4/files/patch-doc-m4.texi	(revision 520720)
+++ devel/m4/files/patch-doc-m4.texi	(nonexistent)
@@ -1,10 +0,0 @@
---- doc/m4.texi.orig	2016-12-31 22:34:38 UTC
-+++ doc/m4.texi
-@@ -1,6 +1,7 @@
- \input texinfo @c -*- texinfo -*-
- @comment ========================================================
- @comment %**start of header
-+@documentencoding ISO-8859-1
- @setfilename m4.info
- @include version.texi
- @settitle GNU M4 @value{VERSION} macro processor

Property changes on: devel/m4/files/patch-doc-m4.texi
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property