--- Makefile	(revision 536967)
+++ Makefile	(working copy)
@@ -62,8 +62,8 @@ 
 OPTIONS_DEFINE=		OPENMP POPPLER VISIO CDR DBUS WPG GVFS NLS
 OPTIONS_DEFAULT=	POPPLER VISIO CDR WPG GM
 OPTIONS_DEFAULT_amd64=	OPENMP
-OPTIONS_SINGLE=		IMAGICK
-OPTIONS_SINGLE_IMAGICK=	IMAGICK6 GM
+OPTIONS_RADIO=		IMAGICK
+OPTIONS_RADIO_IMAGICK=	IMAGICK6 GM
 OPTIONS_SUB=		yes
 
 CDR_DESC=		Support for CorelDRAW graphics
@@ -100,6 +100,7 @@ 
 IMAGICK6_CMAKE_BOOL=	WITH_IMAGE_MAGICK
 GM_DESC=		Use GraphicsMagick
 GM_LIB_DEPENDS=		libGraphicsMagick.so:graphics/GraphicsMagick
+GM_CMAKE_BOOL=		WITH_GRAPHICS_MAGICK
 
 NLS_CMAKE_BOOL=		WITH_NLS
 NLS_USES=		gettext