diff options
| author | jmmv <jmmv@pkgsrc.org> | 2004-01-22 10:11:16 +0000 |
|---|---|---|
| committer | jmmv <jmmv@pkgsrc.org> | 2004-01-22 10:11:16 +0000 |
| commit | d2895a3ec690a4cc00ea3a1d069162791f715838 (patch) | |
| tree | a9cb93c79e4125dcbbccd26796ede7b1aa50c388 /x11/gdm/Makefile | |
| parent | 615df608bd69f2c2cd7ada7546420bda7e61fe5f (diff) | |
| download | pkgsrc-d2895a3ec690a4cc00ea3a1d069162791f715838.tar.gz | |
Simplify patches a lot (specially those touching configure) and also cleanup
the Makefile a bit. No functional changes.
Diffstat (limited to 'x11/gdm/Makefile')
| -rw-r--r-- | x11/gdm/Makefile | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index 9ed2c445ffc..183b120c832 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2004/01/22 09:16:59 jmmv Exp $ +# $NetBSD: Makefile,v 1.44 2004/01/22 10:11:16 jmmv Exp $ # DISTNAME= gdm-2.4.4.7 @@ -12,6 +12,8 @@ MAINTAINER= mjl@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= Gnome Display Manager - a re-implementation of the xdm program +BUILD_USES_MSGFMT= YES + USE_BUILDLINK2= YES USE_PKGINSTALL= YES USE_PKGLOCALEDIR= YES @@ -22,9 +24,7 @@ LIBTOOL_OVERRIDE= ${WRKSRC}/libtool CONFIGURE_ARGS+= --localstatedir=/var CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} - -CONFIGURE_ENV+= X11BASE=${X11BASE} GDMOWN=${GDMOWN} GDMGRP=${GDMGRP} -MAKE_ENV+= ROOT_USER=${ROOT_USER} ROOT_GROUP=${ROOT_GROUP} +CONFIGURE_ENV+= X11BASE=${X11BASE} MAKE_ENV+= CHMOD=${CHMOD} CHOWN=${CHOWN} OWN_DIRS= ${PKG_SYSCONFDIR}/dm/Sessions @@ -54,10 +54,14 @@ SUPPORT_FILES+= ${EGDIR}/gdm/$f \ RCD_SCRIPTS= gdm SUBST_CLASSES+= desktop -SUBST_MESSAGE.desktop= "Enabling sessions." -SUBST_STAGE.desktop= post-patch -SUBST_FILES.desktop= config/default.desktop.in config/gnome.desktop.in +SUBST_MESSAGE.desktop= "Configuring GDM settings." +SUBST_STAGE.desktop= pre-configure +SUBST_FILES.desktop= config/default.desktop.in +SUBST_FILES.desktop+= config/gnome.desktop.in +SUBST_FILES.desktop+= config/gdm.conf.in SUBST_SED.desktop= -e 's/^_//g' +SUBST_SED.desktop+= -e 's|@GDMOWN@|${GDMOWN}|g' +SUBST_SED.desktop+= -e 's|@GDMGRP@|${GDMGRP}|g' .include "../../mk/bsd.prefs.mk" @@ -74,14 +78,11 @@ BUILD_DEFS+= USE_PAM .if defined(USE_PAM) .include "../../security/PAM/buildlink2.mk" +CONFIGURE_ENV+= USE_PAM=yes PLIST_SUBST+= PAM_MISC="" .else +CONFIGURE_ENV+= USE_PAM=no PLIST_SUBST+= PAM_MISC="@comment " -SUBST_CLASSES+= pam -SUBST_MESSAGE.pam= "Disabling PAM." -SUBST_STAGE.pam= post-patch -SUBST_FILES.pam= configure -SUBST_SED.pam= -e 's:security/pam_appl.h:nopam:g' .endif post-install: |