Index: head/mail/sa-utils/Makefile
===================================================================
--- head/mail/sa-utils/Makefile	(revision 452172)
+++ head/mail/sa-utils/Makefile	(revision 452173)
@@ -1,40 +1,35 @@
 # Created by: Matthew Seaman
 # $FreeBSD$
 
 PORTNAME=	sa-utils
 PORTVERSION=	0.04
 CATEGORIES=	mail
 MASTER_SITES=	# none
 DISTFILES=	# none
 
 MAINTAINER=	matthew@FreeBSD.org
 COMMENT=	SpamAssassin nightly periodic maintenance
 
 RUN_DEPENDS=	sa-update:mail/spamassassin
 
 OPTIONS_DEFINE=	SACOMPILE
 SACOMPILE_DESC=	Enable sa-compile support
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 SUB_FILES=	sa-utils
 
 PERIODIC_DAILY=	etc/periodic/daily
 
 PLIST_FILES=	${PERIODIC_DAILY}/sa-utils
 
-.include <bsd.port.options.mk>
+OPTIONS_SUB=	yes
 
-.if ${PORT_OPTIONS:MSACOMPILE}
-RUN_DEPENDS+=	re2c>=0.12.0:devel/re2c
-SUB_LIST+=	SACOMPILE=YES
-.else
-SUB_LIST+=	SACOMPILE=NO
-.endif
+SACOMPILE_RUN_DEPENDS=	re2c>=0.12.0:devel/re2c
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${PERIODIC_DAILY}/
 	${INSTALL_SCRIPT} ${WRKDIR}/sa-utils \
 	    ${STAGEDIR}${PREFIX}/${PERIODIC_DAILY}/sa-utils
 
 .include <bsd.port.mk>