Index: Makefile
===================================================================
--- Makefile	(revision 320275)
+++ Makefile	(working copy)
@@ -24,6 +24,8 @@
 USES=		iconv ncurses
 GNU_CONFIGURE=	yes
 
+OPTIONS_SUB=	yes
+
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-term-lib="ncursesw ncurses" --with-tcsetpgrp \
@@ -54,41 +56,24 @@
 PORTEXAMPLES=	zlogin zshenv zshrc
 SHELLS=		/etc/shells
 
+OPTIONS_SUB=	yes
+
+GDBM_LIB_DEPENDS=	gdbm.4:${PORTSDIR}/databases/gdbm
+GDBM_CONFIGURE_ENABLE=	gdbm
+PCRE_LIB_DEPENDS=	pcre.3:${PORTSDIR}/devel/pcre
+PCRE_CONFIGURE_ENABLE=	pcre
+MEM_CONFIGURE_ENABLE=	zsh-mem
+SECURE_FREE_CONFIGURE_ENABLE=	zsh-secure-free
+MAILDIR_CONFIGURE_ENABLE=	maildir-support
+DEBUG_CONFIGURE_ENABLE=		zsh-debug
+MULTIBYTE_CONFIGURE_ENABLE=	multibyte
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
 DISTFILES+=	${DISTNAME}-doc${EXTRACT_SUFX}:doc
 .endif
 
-.if ${PORT_OPTIONS:MGDBM}
-LIB_DEPENDS+=		gdbm.4:${PORTSDIR}/databases/gdbm
-PLIST_SUB+=		GDBM=""
-.else
-CONFIGURE_ARGS+=	--disable-gdbm
-PLIST_SUB+=		GDBM="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPCRE}
-CONFIGURE_ARGS+=	--enable-pcre
-LIB_DEPENDS+=		pcre.3:${PORTSDIR}/devel/pcre
-PLIST_SUB+=		PCRE=""
-.else
-CONFIGURE_ARGS+=	--disable-pcre
-PLIST_SUB+=		PCRE="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MMEM}
-CONFIGURE_ARGS+=	--enable-zsh-mem
-.endif
-
-.if ${PORT_OPTIONS:MSECURE_FREE}
-CONFIGURE_ARGS+=	--enable-zsh-secure-free
-.endif
-
-.if ${PORT_OPTIONS:MMAILDIR}
-CONFIGURE_ARGS+=	--enable-maildir-support
-.endif
-
 .if ${PORT_OPTIONS:MSTATIC}
 LDFLAGS+=	-static
 CONFIGURE_ARGS+=	--disable-dynamic
@@ -98,18 +83,6 @@
 PLIST_SUB+=		SHARED=""
 .endif
 
-.if ${PORT_OPTIONS:MDEBUG}
-CONFIGURE_ARGS+=	--enable-zsh-debug
-.else
-CONFIGURE_ARGS+=	--disable-zsh-debug
-.endif
-
-.if ${PORT_OPTIONS:MMULTIBYTE}
-CONFIGURE_ARGS+=	--enable-multibyte
-.else
-CONFIGURE_ARGS+=	--disable-multibyte
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e '/LIBS/s/-lrt//' ${WRKSRC}/configure
 	@${SED} -i "" -e "s,link=dynamic,link=either," \