diff options
| -rw-r--r-- | mail/postfix/Makefile | 10 | ||||
| -rw-r--r-- | mk/bsd.pkg.defaults.mk | 12 | ||||
| -rw-r--r-- | mk/bsd.pkg.obsolete.mk | 6 |
3 files changed, 16 insertions, 12 deletions
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile index 6d59509e696..0a4cef305d5 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.52 2001/12/05 15:00:46 agc Exp $ +# $NetBSD: Makefile,v 1.53 2002/01/31 21:20:34 jlam Exp $ DISTNAME= postfix-20010228-pl08 PKGNAME= postfix-20010228pl8 @@ -26,7 +26,7 @@ BUILD_DEFS+= POSTFIX_USE_INET6 .endif .if defined(POSTFIX_USE_PCRE) && ${POSTFIX_USE_PCRE} == "YES" \ - || defined(POSTFIX_USE_SASL_AUTH) && ${POSTFIX_USE_SASL_AUTH} == "YES" + || defined(USE_SASL) && ${USE_SASL} == "YES" CCARGS= -I${LOCALBASE}/include AUXLIBS= -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib MAKE_ENV+= AUXLIBS="${AUXLIBS}" CCARGS="${CCARGS}" @@ -39,14 +39,14 @@ AUXLIBS+= -lpcre BUILD_DEFS+= POSTFIX_USE_PCRE .endif -.if defined(POSTFIX_USE_SASL_AUTH) && ${POSTFIX_USE_SASL_AUTH} == "YES" +.if defined(USE_SASL) && ${USE_SASL} == "YES" DEPENDS+= cyrus-sasl:../../security/cyrus-sasl CCARGS+= -DUSE_SASL_AUTH AUXLIBS+= -lsasl PLIST_SRC+= ${WRKDIR}/PLIST.sasl MESSAGE_SRC+= ${PKGDIR}/MESSAGE.sasl MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} -BUILD_DEFS+= POSTFIX_USE_SASL_AUTH +BUILD_DEFS+= USE_SASL .endif PLIST_SRC+= ${PKGDIR}/PLIST @@ -79,7 +79,7 @@ pre-install: ${CHOWN} ${ROOT_USER}:${ROOT_GROUP} ${PREFIX}/share/postfix ${PREFIX}/libexec/postfix ${CHMOD} 755 ${PREFIX}/share/postfix ${PREFIX}/libexec/postfix -${RM} -f ${WRKSRC}/conf/*.orig -.if defined(POSTFIX_USE_SASL_AUTH) && ${POSTFIX_USE_SASL_AUTH} == "YES" +.if defined(USE_SASL) && ${USE_SASL} == "YES" echo "pwcheck_method: sasldb" > ${WRKDIR}/smtpd.conf ${INSTALL_DATA} ${WRKDIR}/smtpd.conf ${PREFIX}/lib/sasl echo lib/sasl/smtpd.conf > ${WRKDIR}/PLIST.sasl diff --git a/mk/bsd.pkg.defaults.mk b/mk/bsd.pkg.defaults.mk index 41d3c971565..91474273330 100644 --- a/mk/bsd.pkg.defaults.mk +++ b/mk/bsd.pkg.defaults.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.defaults.mk,v 1.34 2002/01/21 17:31:02 zuntum Exp $ +# $NetBSD: bsd.pkg.defaults.mk,v 1.35 2002/01/31 21:18:37 jlam Exp $ # # A file providing defaults for pkgsrc and the packages collection. @@ -1020,11 +1020,6 @@ PILRC_USE_GTK?= YES # Possible: YES, not defined # Default: not defined -#POSTFIX_USE_SASL_AUTH=YES -# Add support for SMTP authentication with cyrus-sasl -# Possible: YES, not defined -# Default: not defined - #POSTFIX_VERP=YES # Add support for Variable Envelope Return Paths. # Possible: YES, not defined @@ -1236,6 +1231,11 @@ USE_IDEA?= NO # Possible: YES, or NO. # Default: not defined. +#USE_SASL=YES +# Used to specify optional support for SASL authentication +# Possible: YES, not defined +# Default: not defined + USE_SJ3?= YES # Used in kinput2 to enable SJ3 kana-kanji converter support. # Possible: YES, or NO. diff --git a/mk/bsd.pkg.obsolete.mk b/mk/bsd.pkg.obsolete.mk index c9804eede51..794b9d88450 100644 --- a/mk/bsd.pkg.obsolete.mk +++ b/mk/bsd.pkg.obsolete.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.obsolete.mk,v 1.6 2001/12/26 21:20:26 jlam Exp $ +# $NetBSD: bsd.pkg.obsolete.mk,v 1.7 2002/01/31 21:18:38 jlam Exp $ # # This file holds make(1) logic to allow obsolete or deprecated variables # still to be used. These may eventually disappear over time as the contents @@ -29,6 +29,10 @@ PKG_SYSCONFDIR.php?= ${PHP_CONFDIR} PKG_SYSCONFDIR.vtun?= ${VTUN_SYSCONFDIR} .endif +.if defined(POSTFIX_USE_SASL_AUTH) +USE_SASL= YES +.endif + .if defined(SAMBA_WITH_CUPS) USE_CUPS= YES .endif |