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 /x11/gdm | |
| 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 'x11/gdm')
| -rw-r--r-- | x11/gdm/Makefile | 19 | ||||
| -rw-r--r-- | x11/gdm/PLIST | 8 |
2 files changed, 11 insertions, 16 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index c3aa8d5a1c8..3e7ebb18beb 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.138 2008/03/12 21:41:21 drochner Exp $ +# $NetBSD: Makefile,v 1.139 2008/04/12 22:43:14 jlam Exp $ # DISTNAME= gdm-2.20.4 @@ -112,33 +112,28 @@ CONFIGURE_ARGS+= --disable-ipv6 CONFIGURE_ARGS+= X_SERVER_ARGS="vt05" .endif +PLIST_VARS+= pam .if !empty(PKG_OPTIONS:Mpam) . include "../../mk/pam.buildlink3.mk" CONFIGURE_ARGS+= --enable-authentication-scheme=pam . if ${PAM_TYPE} == "linux-pam" -PLIST_SUBST+= PAM_MISC="" -. else -PLIST_SUBST+= PAM_MISC="@comment " +PLIST.pam= yes . endif .elif exists(/etc/shadow) CONFIGURE_ARGS+= --enable-authentication-scheme=shadow -PLIST_SUBST+= PAM_MISC="@comment " .else CONFIGURE_ARGS+= --enable-authentication-scheme=crypt -PLIST_SUBST+= PAM_MISC="@comment " .endif +PLIST_VARS+= dmx .if exists(${X11BASE}/include/X11/extensions/dmxext.h) -PLIST_SUBST+= DMX="" -.else -PLIST_SUBST+= DMX="@comment " +PLIST.dmx= yes .endif PRINT_PLIST_AWK+= /dmx/ { print "$${DMX}" $$0; next } +PLIST_VARS+= gdmopen .if exists(/usr/include/linux/vt.h) -PLIST_SUBST+= GDMOPEN="" -.else -PLIST_SUBST+= GDMOPEN="@comment " +PLIST.gdmopen= yes .endif PRINT_PLIST_AWK+= /gdmopen/ { print "$${GDMOPEN}" $$0; next } diff --git a/x11/gdm/PLIST b/x11/gdm/PLIST index b7247e5226a..c15e465b259 100644 --- a/x11/gdm/PLIST +++ b/x11/gdm/PLIST @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST,v 1.36 2007/12/16 22:19:43 drochner Exp $ -${DMX}bin/gdm-dmx-reconnect-proxy +@comment $NetBSD: PLIST,v 1.37 2008/04/12 22:43:14 jlam Exp $ +${PLIST.dmx}bin/gdm-dmx-reconnect-proxy bin/gdmXnest bin/gdmXnestchooser bin/gdmdynamic @@ -8,11 +8,11 @@ bin/gdmphotosetup bin/gdmthemetester lib/gtk-2.0/modules/libdwellmouselistener.la lib/gtk-2.0/modules/libkeymouselistener.la -${PAM_MISC}libexec/gdmaskpass +${PLIST.pam}libexec/gdmaskpass libexec/gdmchooser libexec/gdmgreeter libexec/gdmlogin -${GDMOPEN}libexec/gdmopen +${PLIST.gdmopen}libexec/gdmopen libexec/gdmtranslate man/man1/gdm.1 sbin/gdm |