diff options
| author | jlam <jlam> | 2005-02-07 11:35:41 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-02-07 11:35:41 +0000 |
| commit | 0103db82790292b84ffafaea7b59ef53a66574c2 (patch) | |
| tree | 3fbd25c3d9c76742dee39e150259e83751db0c93 /x11 | |
| parent | ed5c8cdaa88c7efa24215abcb7d74dd2147ed87a (diff) | |
| download | pkgsrc-0103db82790292b84ffafaea7b59ef53a66574c2.tar.gz | |
Instantly deprecate USE_PAM from pkgsrc as its value is being set from
within NetBSD-current's bsd.own.mk, which conflicts with its usage in
pkgsrc. The package that use USE_PAM have been converted to use the
bsd.options.mk framework. This should fix PR pkg/29257.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/gdm1/Makefile | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/x11/gdm1/Makefile b/x11/gdm1/Makefile index 7ced5c2cf47..1650602d173 100644 --- a/x11/gdm1/Makefile +++ b/x11/gdm1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/10/03 00:18:29 tv Exp $ +# $NetBSD: Makefile,v 1.9 2005/02/07 11:35:47 jlam Exp $ DISTNAME= gdm-2.2.0 PKGREVISION= 7 @@ -61,10 +61,13 @@ GDMOWN= daemon GDMGRP= daemon .endif -.if defined(USE_PAM) -DEPENDS+= PAM-[0-9]*:../../security/PAM -.else +PKG_OPTIONS_VAR= PKG_OPTIONS.gdm1 +PKG_SUPPORTED_OPTIONS= PAM +.include "../../mk/bsd.options.mk" +.if !empty(PKG_OPTIONS:MPAM) +. include "../../mk/pam.buildlink3.mk" +.else SUBST_CLASSES+= pam SUBST_MESSAGE.pam= "Disabling PAM support." SUBST_STAGE.pam= pre-configure @@ -72,6 +75,10 @@ SUBST_FILES.pam= configure SUBST_SED.pam= -e 's:security/pam_appl.h:nopam:g' .endif +.include "../../devel/gettext-lib/buildlink3.mk" +.include "../../devel/libglade/buildlink3.mk" +.include "../../x11/gnome-libs/buildlink3.mk" + post-build: cd ${WRKSRC}/config; \ for f in Default PostSession PreSession; do \ @@ -118,8 +125,4 @@ post-install: ${LN} -fs Gnome ${GDMCFGDIR}/Sessions/Default ${INSTALL_SCRIPT} ${WRKDIR}/gdm ${PREFIX}/etc/rc.d/ -.include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/libglade/buildlink3.mk" -.include "../../x11/gnome-libs/buildlink3.mk" - .include "../../mk/bsd.pkg.mk" |