diff options
author | jlam <jlam> | 2008-04-12 22:42:57 +0000 |
---|---|---|
committer | jlam <jlam> | 2008-04-12 22:42:57 +0000 |
commit | 9ff693053b2b42cd6a29b886e071ad01acdeefe2 (patch) | |
tree | fdd67c81079412bf94013749a954125434a9baca /mail/mutt-devel | |
parent | 4a580ef74536ed1f7c6a7ecd5a26e46a93aec9b3 (diff) | |
download | pkgsrc-9ff693053b2b42cd6a29b886e071ad01acdeefe2.tar.gz |
Convert to use PLIST_VARS instead of manually passing "@comment "
through PLIST_SUBST to the plist module.
Diffstat (limited to 'mail/mutt-devel')
-rw-r--r-- | mail/mutt-devel/Makefile | 7 | ||||
-rw-r--r-- | mail/mutt-devel/PLIST | 6 | ||||
-rw-r--r-- | mail/mutt-devel/options.mk | 6 |
3 files changed, 9 insertions, 10 deletions
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile index bab2a55d31a..914be853834 100644 --- a/mail/mutt-devel/Makefile +++ b/mail/mutt-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.66 2008/02/22 01:16:58 gdt Exp $ +# $NetBSD: Makefile,v 1.67 2008/04/12 22:43:03 jlam Exp $ DISTNAME= mutt-1.5.17 PKGREVISION= 5 @@ -60,10 +60,9 @@ INSTALLATION_DIRS+= ${DOCDIR} ${EGDIR} # Define WRKSRC explicitly so we can use its value below. WRKSRC= ${WRKDIR}/${DISTNAME} +PLIST_VARS+= dotlock .if exists(${WRKSRC}/mutt_dotlock) -PLIST_SUBST+= MUTT_DOTLOCK= -.else -PLIST_SUBST+= MUTT_DOTLOCK="@comment " +PLIST.dotlock= yes .endif INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} sysconfdir=${EGDIR} diff --git a/mail/mutt-devel/PLIST b/mail/mutt-devel/PLIST index 8f36e1197c0..00a704af001 100644 --- a/mail/mutt-devel/PLIST +++ b/mail/mutt-devel/PLIST @@ -1,11 +1,11 @@ -@comment $NetBSD: PLIST,v 1.16 2007/11/07 21:19:36 tonio Exp $ +@comment $NetBSD: PLIST,v 1.17 2008/04/12 22:43:03 jlam Exp $ bin/flea bin/mutt bin/muttbug -${MUTT_DOTLOCK}bin/mutt_dotlock +${PLIST.dotlock}bin/mutt_dotlock bin/pgpewrap bin/pgpring -${WITHSMIME}bin/smime_keys +${PLIST.smime}bin/smime_keys man/man1/flea.1 man/man1/mutt.1 man/man1/mutt_dotlock.1 diff --git a/mail/mutt-devel/options.mk b/mail/mutt-devel/options.mk index 087992edcda..d78ba3a2fe0 100644 --- a/mail/mutt-devel/options.mk +++ b/mail/mutt-devel/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.28 2008/03/08 14:28:32 joerg Exp $ +# $NetBSD: options.mk,v 1.29 2008/04/12 22:43:03 jlam Exp $ # Global and legacy options @@ -68,15 +68,15 @@ CONFIGURE_ARGS+= --without-ssl ### ### S/MIME ### +PLIST_VARS+= smime .if !empty(PKG_OPTIONS:Msmime) USE_TOOLS+= perl:run REPLACE_PERL+= *.pl */*.pl . include "../../security/openssl/buildlink3.mk" CONFIGURE_ARGS+= --enable-smime -PLIST_SUBST+= WITHSMIME='' +PLIST.smime= yes .else CONFIGURE_ARGS+= --disable-smime -PLIST_SUBST+= WITHSMIME='@comment ' .endif ### |