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/PAM | |
| 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/PAM')
| -rw-r--r-- | security/PAM/Makefile | 11 | ||||
| -rw-r--r-- | security/PAM/PLIST | 8 |
2 files changed, 9 insertions, 10 deletions
diff --git a/security/PAM/Makefile b/security/PAM/Makefile index 597b6caf326..c2d4e29f5e2 100644 --- a/security/PAM/Makefile +++ b/security/PAM/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2007/07/09 04:27:55 minskim Exp $ +# $NetBSD: Makefile,v 1.43 2008/04/12 22:43:09 jlam Exp $ # DISTNAME= Linux-PAM-0.77 @@ -47,12 +47,12 @@ PKG_SUPPORTED_OPTIONS= libcrack ### ### Support using libcrack to protect against weak passwords. ### +PLIST_VARS+= libcrack .if !empty(PKG_OPTIONS:Mlibcrack) . include "../../security/libcrack/buildlink3.mk" -PLIST_SUBST+= USE_LIBCRACK= +PLIST.libcrack= yes .else CONFIGURE_ARGS+= --disable-crack -PLIST_SUBST+= USE_LIBCRACK="@comment " .endif .if !empty(OPSYS:M*BSD) @@ -69,11 +69,10 @@ EGDIR= ${PREFIX}/share/examples/${PKGBASE} CFILES= access.conf pam_env.conf group.conf time.conf +PLIST_VARS+= limits .if ${OPSYS} == "Linux" CFILES+= limits.conf -PLIST_SUBST+= PAM_LIMITS= -.else -PLIST_SUBST+= PAM_LIMITS="@comment " +PLIST.limits= yes .endif CONF_FILES= ${EGDIR}/pam.conf ${PKG_SYSCONFBASEDIR}/pam.conf diff --git a/security/PAM/PLIST b/security/PAM/PLIST index 9ff54bce459..62248c9cf92 100644 --- a/security/PAM/PLIST +++ b/security/PAM/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2004/11/16 07:46:57 jlam Exp $ +@comment $NetBSD: PLIST,v 1.7 2008/04/12 22:43:09 jlam Exp $ include/security/_pam_aconf.h include/security/_pam_compat.h include/security/_pam_macros.h @@ -12,7 +12,7 @@ lib/libpam.la lib/libpam_misc.la lib/libpamc.la lib/security/pam_access.la -${USE_LIBCRACK}lib/security/pam_cracklib.la +${PLIST.libcrack}lib/security/pam_cracklib.la lib/security/pam_debug.la lib/security/pam_deny.la lib/security/pam_env.la @@ -22,7 +22,7 @@ lib/security/pam_ftp.la lib/security/pam_group.la lib/security/pam_issue.la lib/security/pam_lastlog.la -${PAM_LIMITS}lib/security/pam_limits.la +${PLIST.limits}lib/security/pam_limits.la lib/security/pam_listfile.la lib/security/pam_mail.la lib/security/pam_mkhomedir.la @@ -62,7 +62,7 @@ sbin/pam_tally sbin/unix_chkpwd share/examples/${PKGBASE}/access.conf share/examples/${PKGBASE}/group.conf -${PAM_LIMITS}share/examples/${PKGBASE}/limits.conf +${PLIST.limits}share/examples/${PKGBASE}/limits.conf share/examples/${PKGBASE}/pam.conf share/examples/${PKGBASE}/pam_env.conf share/examples/${PKGBASE}/time.conf |