Index: head/mail/anubis/Makefile
===================================================================
--- head/mail/anubis/Makefile	(revision 405476)
+++ head/mail/anubis/Makefile	(revision 405477)
@@ -1,136 +1,109 @@
 # Created by: ijliao
 # $FreeBSD$
 
 PORTNAME=	anubis
 PORTVERSION=	4.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	GNU
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Outgoing SMTP mail processor
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-OPTIONS_DEFINE=	NLS EXAMPLES GUILE GPGME GNUTLS GSASL \
-		GDBM MYSQL PGSQL PCRE PAM SOCKS LIBWRAP
-OPTIONS_DEFAULT=GUILE GPGME GNUTLS GSASL
-NO_OPTIONS_SORT=yes
-
-GPGME_DESC=	GnuPG support via GPGME
-GSASL_DESC=	GSASL support (required for databases)
-GDBM_DESC=	GDBM backend
-SOCKS_DESC=	SOCKS proxy support
-
 USES=		autoreconf charsetfix cpe makeinfo pkgconfig shebangfix
 CHARSETFIX_MAKEFILEIN=	gnulib.mk
 CPE_VENDOR=	gnu
 SHEBANG_FILES=	contrib/msg2smtp.pl
 USE_RC_SUBR=	anubis
 GNU_CONFIGURE=	yes
 
 INFO=		anubis
 PORTEXAMPLES=	1anubisrc 2anubisrc
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_JOBS_UNSAFE=	yes
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=		NLS EXAMPLES GUILE GNUPG GNUTLS GSASL \
+			LIBWRAP PCRE PAM SOCKS
+OPTIONS_GROUP=		DB
+OPTIONS_GROUP_DB=	GDBM MYSQL PGSQL
+OPTIONS_DEFAULT=	GUILE GNUPG GNUTLS GSASL
+OPTIONS_SUB=		yes
+NO_OPTIONS_SORT=	yes
 
-# Default requirement for anubis rc script
-_REQUIRE=	mail
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext iconv
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
+.if !exists(/usr/include/tcpd.h)
+OPTIONS_EXCLUDE+=	LIBWRAP
 .endif
-
-.if ${PORT_OPTIONS:MGUILE}
-LIB_DEPENDS+=	libguile.so:${PORTSDIR}/lang/guile
-PORTEXAMPLES+=	anubis.scm anubisrc.guile
-PLIST_SUB+=	GUILE=""
-.else
-CONFIGURE_ARGS+=--without-guile
-PLIST_SUB+=	GUILE="@comment "
+.if !exists(/usr/lib/libpam.so)
+OPTIONS_EXCLUDE+=	PAM
 .endif
 
-.if ${PORT_OPTIONS:MGPGME}
-LIB_DEPENDS+=	libgpgme.so:${PORTSDIR}/security/gpgme
-.else
-CONFIGURE_ARGS+=--without-gpgme
-.endif
+GDBM_DESC=		GDBM backend
+GDBM_IMPLIES=		GSASL
+GDBM_LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm
+GDBM_CONFIGURE_WITH=	gdbm
 
-.if ${PORT_OPTIONS:MGNUTLS}
-LIB_DEPENDS+=	libgnutls.so:${PORTSDIR}/security/gnutls
-.else
-CONFIGURE_ARGS+=--without-gnutls
-.endif
+GNUPG_LIB_DEPENDS=	libgpgme.so:${PORTSDIR}/security/gpgme
+GNUPG_CONFIGURE_WITH=	gpgme
 
-.if ${PORT_OPTIONS:MGSASL} || ${PORT_OPTIONS:MGDBM} || ${PORT_OPTIONS:MMYSQL} || ${PORT_OPTIONS:MPGSQL}
-LIB_DEPENDS+=	libgsasl.so:${PORTSDIR}/security/gsasl
-PLIST_SUB+=	GSASL=""
-.else
-CONFIGURE_ARGS+=--without-gsasl
-PLIST_SUB+=	GSASL="@comment "
-.endif
+GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_CONFIGURE_WITH=	gnutls
 
-.if ${PORT_OPTIONS:MGDBM}
-LIB_DEPENDS+=	libgdbm.so:${PORTSDIR}/databases/gdbm
-CONFIGURE_ARGS+=--with-gdbm
-.endif
+GSASL_DESC=		GSASL support (required for databases)
+GSASL_LIB_DEPENDS=	libgsasl.so:${PORTSDIR}/security/gsasl
+GSASL_CONFIGURE_WITH=	gsasl
 
-.if ${PORT_OPTIONS:MMYSQL}
-USE_MYSQL=	yes
-CONFIGURE_ARGS+=--with-mysql
-_REQUIRE+=	mysql
-.endif
+GUILE_LIB_DEPENDS=	libguile.so:${PORTSDIR}/lang/guile
+GUILE_CONFIGURE_WITH=	guile
+GUILE_PORTEXAMPLES=	anubis.scm anubisrc.guile
 
-.if ${PORT_OPTIONS:MPGSQL}
-USES+=	pgsql
-CONFIGURE_ARGS+=--with-postgres
-_REQUIRE+=	postgresql
-.endif
+LIBWRAP_CONFIGURE_WITH=	tcp-wrappers
 
-.if ${PORT_OPTIONS:MPCRE}
-LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre
-CONFIGURE_ARGS+=--with-pcre
-.endif
+MYSQL_IMPLIES=		GSASL
+MYSQL_USE=		MYSQL=yes
+MYSQL_CONFIGURE_WITH=	mysql
+MYSQL_VARS=		REQUIRE+=mysql
 
-.if ${PORT_OPTIONS:MPAM} && exists(/usr/lib/libpam.so)
-CONFIGURE_ARGS+=--with-pam
-PORTEXAMPLES+=	pam
-.endif
+NLS_USES=		gettext iconv
+NLS_CONFIGURE_ENABLE=	nls
 
-.if ${PORT_OPTIONS:MLIBWRAP} && exists(/usr/include/tcpd.h)
-CONFIGURE_ARGS+=--with-tcp-wrappers
-.endif
+PAM_CONFIGURE_WITH=	pam
+PAM_PORTEXAMPLES=	pam
 
-.if ${PORT_OPTIONS:MSOCKS}
-CONFIGURE_ARGS+=--with-socks-proxy
-.endif
+PCRE_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+PCRE_CONFIGURE_WITH=	pcre
 
-SUB_LIST+=	REQUIRE="${_REQUIRE}"
+PGSQL_IMPLIES=		GSASL
+PGSQL_USES=		pgsql
+PGSQL_CONFIGURE_WITH=	postgres
+PGSQL_VARS=		REQUIRE+=postgresql
 
+SOCKS_DESC=		SOCKS proxy support
+SOCKS_CONFIGURE_WITH=	socks-proxy
+
+.include <bsd.port.options.mk>
+
+# Default requirement for anubis rc script
+REQUIRE+=	mail
+SUB_LIST+=	REQUIRE="${REQUIRE}"
+
 post-patch:
 	@${REINPLACE_CMD} -e "s|/etc|${PREFIX}/etc|g" ${WRKSRC}/src/headers.h
 
-post-install:
-.if ${PORT_OPTIONS:MEXAMPLES}
+post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/*rc ${STAGEDIR}${EXAMPLESDIR}
-.   if ${PORT_OPTIONS:MGUILE}
+.if ${PORT_OPTIONS:MGUILE}
 	cd ${WRKSRC}/examples && \
-		${INSTALL_DATA} anubis.scm anubisrc.guile ${STAGEDIR}${EXAMPLESDIR}
-.   endif
-.   if ${PORT_OPTIONS:MPAM}
+		${INSTALL_DATA} ${GUILE_PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
+.endif
+.if ${PORT_OPTIONS:MPAM}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/pam
 	${INSTALL_DATA} ${WRKSRC}/examples/pam/anubis* ${STAGEDIR}${EXAMPLESDIR}/pam
-.   endif
 .endif
 
 .include <bsd.port.mk>