Index: math/gmp/Makefile
===================================================================
--- math/gmp/Makefile	(revision 520720)
+++ math/gmp/Makefile	(working copy)
@@ -12,12 +12,18 @@ COMMENT=	Free library for arbitrary precision arit
 
 LICENSE=	LGPL3
 
-OPTIONS_DEFINE=	CPU_OPTS
+USES=		libtool tar:xz
+
+OPTIONS_DEFINE=	CPU_OPTS INFO
+OPTIONS_DEFAULT=INFO
+
 CPU_OPTS_DESC=	Enable assembly optimizations for your CPU
 
-USES=		libtool makeinfo tar:xz
+INFO_INFO=	gmp
+INFO_CONFIGURE_ENV= MAKEINFOFLAGS=--no-split
+INFO_USES=	makeinfo
+
 HAS_CONFIGURE=	yes
-CONFIGURE_ENV=	MAKEINFO="${MAKEINFO} --no-split"
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--infodir=${PREFIX}/${INFO_PATH} \
 		--mandir=${PREFIX}/man \
@@ -25,8 +31,6 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 MAKE_JOBS_UNSAFE=yes
 USE_LDCONFIG=	yes
 
-INFO=		gmp
-
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check