- update to 1.0.Alpha19.0

- use OPTIONS_SUB
- use OPT_CONFIGURE_ENABLE

3 files changed, 21 insertions, 32 deletions

diff --git a/mail/meta1/Makefile b/mail/meta1/Makefile
index d9fa482eca81..48471e75f11d 100644
--- a/mail/meta1/Makefile
+++ b/mail/meta1/Makefile
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	meta1
-PORTVERSION=	1.0.0a.18.0
-DISTVERSION=	1.0.Alpha18.0
+PORTVERSION=	1.0.0a.19.0
+DISTVERSION=	1.0.Alpha19.0
 CATEGORIES=	mail ipv6
-MASTER_SITES=	http://www.MeTA1.org/download/.alpha/dns/
+MASTER_SITES=	http://www.MeTA1.org/download/.alpha/amd64/
 PKGNAMESUFFIX?=	${TLS_SUFFIX}${SASL_SUFFIX}${BERKELEYDB_SUFFIX}${PMILTER_SUFFIX}${PKGNAMESUFFIX2}
 
 MAINTAINER=	dinoex@FreeBSD.org
@@ -50,6 +50,8 @@ NOLOGIN_CMD?=	/usr/sbin/nologin
 
 OPTIONS_DEFINE=	BDB PMILTER DKIM MSP SASL2 SASL2AUTHD TLS
 OPTIONS_DEFAULT=	BDB PMILTER DKIM SASL2 TLS
+NO_OPTIONS_SORT=yes
+OPTIONS_SUB=	yes
 
 BDB_DESC=	External Berkeley DB support
 PMILTER_DESC=	Adds policy milter support
@@ -58,6 +60,16 @@ MSP_DESC=	Enable mail submision program
 SASL2_DESC=	Adds SASL2 support
 SASL2AUTHD_DESC=	Enable plaintext authentication via SASL2
 
+PMILTER_CONFIGURE_ENABLE=	pmilter
+DKIM_CONFIGURE_ENABLE=	DKIM
+MSP_CONFIGURE_ENABLE=	msp
+SASL2_LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+SASL2_CONFIGURE_ENABLE=	SASL
+SASL2_CONFIGURE_ON=	--with-sasl-incdir=${LOCALBASE}/include \
+			--with-sasl-libdir=${LOCALBASE}/lib
+SASL2AUTHD_RUN_DEPENDS=	${LOCALBASE}/sbin/saslauthd:${PORTSDIR}/security/cyrus-sasl2-saslauthd
+TLS_CONFIGURE_ENABLE=	TLS
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MBDB}
@@ -75,50 +87,27 @@ PLIST_SUB+=	WITH_BDBINT=""
 
 .if ${PORT_OPTIONS:MPMILTER}
 USE_OPENSSL=	yes
-CONFIGURE_ARGS+=	--enable-pmilter
 .else
 PMILTER_SUFFIX?=	-nopmilter
-CONFIGURE_ARGS+=	--disable-pmilter
-.endif
-
-.if ${PORT_OPTIONS:MDKIM}
-CONFIGURE_ARGS+=       --enable-DKIM
-.else
-CONFIGURE_ARGS+=       --disable-DKIM
 .endif
 
 .if ${PORT_OPTIONS:MMSP}
-CONFIGURE_ARGS+=       --enable-msp
 MAN8+=	sendmail.8
-PLIST_SUB+=	WITH_MSP=""
 CONFLICTS+=	courier-0.* postfix-1.* postfix-2.* smail-3.* zmailer-2.* opensmtpd-* sendmail-*
-.else
-CONFIGURE_ARGS+=       --disable-msp
-PLIST_SUB+=	WITH_MSP="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MSASL2}
-LIB_DEPENDS+=	sasl2:${PORTSDIR}/security/cyrus-sasl2
-CONFIGURE_ARGS+=	--enable-SASL
-CONFIGURE_ARGS+=	--with-sasl-incdir=${LOCALBASE}/include
-CONFIGURE_ARGS+=	--with-sasl-libdir=${LOCALBASE}/lib
-.else
+.if ! ${PORT_OPTIONS:MSASL2}
 SASL_SUFFIX?=	-nosasl
-CONFIGURE_ARGS+=	--disable-SASL
 .endif
 
 .if ${PORT_OPTIONS:MSASL2AUTHD}
 .if empty(PORT_OPTIONS:MSASL2)
 IGNORE=		Option SASL2AUTHD needs option SASL2
 .endif
-RUN_DEPENDS+=	${LOCALBASE}/sbin/saslauthd:${PORTSDIR}/security/cyrus-sasl2-saslauthd
 .endif
 
-.if ${PORT_OPTIONS:MTLS}
-CONFIGURE_ARGS+=	--enable-TLS
-.else
+.if ! ${PORT_OPTIONS:MTLS}
 TLS_SUFFIX?=	-notls
-CONFIGURE_ARGS+=	--disable-TLS
 .endif
 
 post-patch:
@@ -186,7 +175,7 @@ post-install:
 .endfor
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
-	@cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
+	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/mail/meta1/distinfo b/mail/meta1/distinfo
index 814b01fb7298..7fcd8387390a 100644
--- a/mail/meta1/distinfo
+++ b/mail/meta1/distinfo
@@ -1,2 +1,2 @@
-SHA256 (meta1-1.0.Alpha18.0.tar.gz) = f301bd84b82097513918de29940e656450187c4ea4f6c5880d73c40e4c040280
-SIZE (meta1-1.0.Alpha18.0.tar.gz) = 4878113
+SHA256 (meta1-1.0.Alpha19.0.tar.gz) = d2f62d73c8fcced25e51778e600e5968b17df3ae01cbf7697eef3e9e1b3135dc
+SIZE (meta1-1.0.Alpha19.0.tar.gz) = 4880492
diff --git a/mail/meta1/pkg-plist b/mail/meta1/pkg-plist
index d022a00c4dab..c2c34921b283 100644
--- a/mail/meta1/pkg-plist
+++ b/mail/meta1/pkg-plist
@@ -67,7 +67,7 @@ sbin/greyprint
 sbin/greyrm
 sbin/mcp
 sbin/noroot
-%%WITH_MSP%%sbin/sendmail
+%%MSP%%sbin/sendmail
 sbin/sm.check.sh
 sbin/sm.setup.sh
 sbin/statit