diff options
| author | jlam <jlam@pkgsrc.org> | 2008-04-12 22:42:57 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2008-04-12 22:42:57 +0000 |
| commit | 841dfa0e7aaa6a0f0cce2901291d1d938dd0fc0a (patch) | |
| tree | fdd67c81079412bf94013749a954125434a9baca /mail/cyrus-imapd | |
| parent | 6874584eae20f517f70816571f6d4ac696db16b3 (diff) | |
| download | pkgsrc-841dfa0e7aaa6a0f0cce2901291d1d938dd0fc0a.tar.gz | |
Convert to use PLIST_VARS instead of manually passing "@comment "
through PLIST_SUBST to the plist module.
Diffstat (limited to 'mail/cyrus-imapd')
| -rw-r--r-- | mail/cyrus-imapd/Makefile | 12 | ||||
| -rw-r--r-- | mail/cyrus-imapd/PLIST | 10 |
2 files changed, 10 insertions, 12 deletions
diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile index 53184063db0..25ab51d47ef 100644 --- a/mail/cyrus-imapd/Makefile +++ b/mail/cyrus-imapd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.75 2008/01/18 05:08:22 tnn Exp $ +# $NetBSD: Makefile,v 1.76 2008/04/12 22:43:03 jlam Exp $ DISTNAME= cyrus-imapd-2.2.13 PKGREVISION= 5 @@ -74,12 +74,11 @@ CONFIGURE_ARGS+= --without-krb CONFIGURE_ARGS+= --disable-gssapi .endif +PLIST_VARS+= ldap .if !empty(PKG_OPTIONS:Mldap) CONFIGURE_ARGS+= --with-ldap=${BUILDLINK_PREFIX.openldap-client} +PLIST.ldap= yes . include "../../databases/openldap-client/buildlink3.mk" -PLIST_SUBST+= LDAP= -.else -PLIST_SUBST+= LDAP="@comment " .endif .if exists(/usr/bin/compile_et) @@ -99,15 +98,14 @@ CONFIGURE_ARGS+= --with-com-err=yes # CYRUS_IDLE?= poll BUILD_DEFS+= CYRUS_IDLE +PLIST_VARS+= idled .if (${CYRUS_IDLE} != "poll") && (${CYRUS_IDLE} != "idled") && \ (${CYRUS_IDLE} != "no") PKG_FAIL_REASON+= "CYRUS_IDLE must be poll, idled or no" .endif CONFIGURE_ARGS+= --with-idle=${CYRUS_IDLE:Q} .if ${CYRUS_IDLE} == "idled" -PLIST_SUBST+= IDLED= -.else -PLIST_SUBST+= IDLED="@comment " +PLIST.idled= yes .endif MAKE_ENV+= PERL=${PERL5:Q} diff --git a/mail/cyrus-imapd/PLIST b/mail/cyrus-imapd/PLIST index a78cb7e0748..df947b83f13 100644 --- a/mail/cyrus-imapd/PLIST +++ b/mail/cyrus-imapd/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2007/12/22 21:15:06 adam Exp $ +@comment $NetBSD: PLIST,v 1.11 2008/04/12 22:43:03 jlam Exp $ bin/imtest bin/installsieve bin/lmtptest @@ -19,7 +19,7 @@ cyrus/bin/cyrdump cyrus/bin/deliver cyrus/bin/fetchnews cyrus/bin/fud -${IDLED}cyrus/bin/idled +${PLIST.idled}cyrus/bin/idled cyrus/bin/imapd cyrus/bin/ipurge cyrus/bin/lmtpd @@ -36,9 +36,9 @@ cyrus/bin/notifyd cyrus/bin/pop3d cyrus/bin/pop3proxyd cyrus/bin/proxyd -${LDAP}cyrus/bin/ptdump -${LDAP}cyrus/bin/ptexpire -${LDAP}cyrus/bin/ptloader +${PLIST.ldap}cyrus/bin/ptdump +${PLIST.ldap}cyrus/bin/ptexpire +${PLIST.ldap}cyrus/bin/ptloader cyrus/bin/quota cyrus/bin/reconstruct cyrus/bin/rehash |