Index: sysutils/anvil/Makefile
===================================================================
--- sysutils/anvil/Makefile
+++ sysutils/anvil/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	anvil
 PORTVERSION=	0.0.11
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	dvl@FreeBSD.org
@@ -16,22 +17,24 @@
 GROUPS=	anvil
 
 SUB_FILES+=	cert-shifter.conf.sample cert-puller.conf.sample pkg-install pkg-message
+SUB_LIST=	FETCH_TOOL=${FETCH_TOOL}
 
 NO_BUILD=	yes
 
-OPTIONS_SINGLE=	SG1
-OPTIONS_SINGLE_SG1=	 FETCH CURL WGET
-OPTIONS_DEFAULT=	FETCH
+OPTIONS_SINGLE=	FETCH_TOOL
+OPTIONS_SINGLE_FETCH_TOOL=	 FETCH CURL WGET
+
 FETCH_DESC=	Use fetch
 CURL_DESC=	Use curl, not fetch
 WGET_DESC=	Use wget, not fetch
 
+OPTIONS_DEFAULT=	FETCH
 CURL_RUN_DEPENDS=	curl:ftp/curl
 WGET_RUN_DEPENDS=	wget:ftp/wget
 
-FETCH_FETCH_TOOL=	fetch
-CURL_FETCH_TOOL=	curl
-WGET_FETCH_TOOL=	wget
+FETCH_VARS=	FETCH_TOOL=fetch
+CURL_VARS=	FETCH_TOOL=curl
+WGET_VARS=	FETCH_TOOL=wget
 
 do-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}