[Midnightbsd-cvs] mports [16844] trunk/mail/sendmail/Makefile: fix more options

[laffer1 at midnightbsd.org]

Revision: 16844
          http://svnweb.midnightbsd.org/mports/?rev=16844
Author:   laffer1
Date:     2014-09-06 16:09:51 -0400 (Sat, 06 Sep 2014)
Log Message:
-----------
fix more options

Modified Paths:
--------------
    trunk/mail/sendmail/Makefile

Modified: trunk/mail/sendmail/Makefile
===================================================================
--- trunk/mail/sendmail/Makefile	2014-09-06 20:07:16 UTC (rev 16843)
+++ trunk/mail/sendmail/Makefile	2014-09-06 20:09:51 UTC (rev 16844)
@@ -107,13 +107,13 @@
 .if ${PORT_OPTIONS:MIPV6}
 SITE+=	${FILESDIR}/site.config.m4.ipv6
 .endif
-.if defined(SENDMAIL_WITH_SASL2)
+.if ${PORT_OPTIONS:MSASL}
 SITE+=	${FILESDIR}/site.config.m4.sasl2
 .endif
-.if ${PORT_OPTIONS:MSASL}
+.if ${PORT_OPTIONS:MLDAP}
 SITE+=	${FILESDIR}/site.config.m4.ldap
 .endif
-.if !defined(SENDMAIL_WITHOUT_MILTER)
+.if ${PORT_OPTIONS:MMILTER}
 SITE+=	${FILESDIR}/site.config.m4.milter
 .endif
 .if ${PORT_OPTIONS:MTLS}
@@ -129,8 +129,8 @@
 PLIST_SUB+=	ETCPORT=""
 .endif
 
-.if !defined(SENDMAIL_WITHOUT_MILTER)
-.if defined(SENDMAIL_WITH_SHARED_MILTER)
+.if ${PORT_OPTIONS:MMILTER}
+.if ${PORT_OPTIONS:MMILTER_SHARED}
 PLIST_SUB+=	MILTER_SHARED=""
 PLIST_SUB+=	MILTER_SOVER=${MILTER_SOVER}
 MAKE_ENV+=	MILTER_SOVER=${MILTER_SOVER}
@@ -151,7 +151,7 @@
 		-e "s=%%LOCALBASE%%=${LOCALBASE}=g" \
 		-e "s=%%PORTSDIR%%=${PORTSDIR}=g" \
 		${PKGDIR}/pkg-message > ${WRKSRC}/pkg-message
-.if !defined(SENDMAIL_WITHOUT_MILTER) && defined(SENDMAIL_WITH_SHARED_MILTER)
+.if ${PORT_OPTIONS:MMILTER} && ${PORT_OPTIONS:MMILTER_SHARED}
 	@${CP} -pR ${WRKSRC}/libmilter ${WRKSRC}/libsharedmilter
 	${CP} ${FILESDIR}/sharedlibrary.m4 \
 		${WRKSRC}/devtools/M4/UNIX/sharedlibrary.m4