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 /security/gnupg | |
| 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 'security/gnupg')
| -rw-r--r-- | security/gnupg/PLIST | 4 | ||||
| -rw-r--r-- | security/gnupg/options.mk | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/security/gnupg/PLIST b/security/gnupg/PLIST index e89944db87b..4107bbe658f 100644 --- a/security/gnupg/PLIST +++ b/security/gnupg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.21 2007/03/07 11:31:24 drochner Exp $ +@comment $NetBSD: PLIST,v 1.22 2008/04/12 22:43:09 jlam Exp $ bin/gpg bin/gpg-zip bin/gpgsplit @@ -7,7 +7,7 @@ info/gnupg1.info libexec/gnupg/gpgkeys_curl libexec/gnupg/gpgkeys_finger libexec/gnupg/gpgkeys_hkp -${OPENLDAP}libexec/gnupg/gpgkeys_ldap +${PLIST.ldap}libexec/gnupg/gpgkeys_ldap man/man1/gpg.1 man/man1/gpg.ru.1 man/man1/gpgv.1 diff --git a/security/gnupg/options.mk b/security/gnupg/options.mk index e778f7057e1..cde9bbb4348 100644 --- a/security/gnupg/options.mk +++ b/security/gnupg/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.12 2007/10/31 12:29:33 rillig Exp $ +# $NetBSD: options.mk,v 1.13 2008/04/12 22:43:09 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gnupg PKG_SUPPORTED_OPTIONS= curl idea ldap @@ -43,16 +43,16 @@ pre-configure: ${GZCAT} ${DISTDIR}/idea.c.gz > ${WRKSRC}/cipher/idea.c .endif +PLIST_VARS+= ldap .if !empty(PKG_OPTIONS:Mldap) .include "../../databases/openldap-client/buildlink3.mk" -PLIST_SUBST+= OPENLDAP="" +PLIST.ldap= yes .else -CONFIGURE_ARGS+=--disable-ldap -PLIST_SUBST+= OPENLDAP="@comment " +CONFIGURE_ARGS+= --disable-ldap .endif .if !empty(PKG_OPTIONS:Mm68060-optimized) # be more efficient on M68060 machines -CONFIGURE_ENV+= M68060=${M68060:Q} -CFLAGS+= -m68060 +CONFIGURE_ENV+= M68060=${M68060:Q} +CFLAGS+= -m68060 .endif |