Mon Feb 8 09:47:06 2010 UTC ()
Fix wrong ownership of config files. Bump PKGREVISION.


(tnn)
diff -r1.155 -r1.156 pkgsrc/x11/gdm/Makefile
cvs diff -r1.155 -r1.156 pkgsrc/x11/gdm/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/gdm/Attic/Makefile 2009/08/26 19:58:29 1.155
+++ pkgsrc/x11/gdm/Attic/Makefile 2010/02/08 09:47:06 1.156
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.155 2009/08/26 19:58:29 sno Exp $ 1# $NetBSD: Makefile,v 1.156 2010/02/08 09:47:06 tnn Exp $
2# 2#
3 3
4DISTNAME= gdm-2.20.10 4DISTNAME= gdm-2.20.10
5PKGREVISION= 2 5PKGREVISION= 3
6CATEGORIES= x11 gnome 6CATEGORIES= x11 gnome
7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gdm/2.20/} 7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gdm/2.20/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.gnome.org/ 11HOMEPAGE= http://www.gnome.org/
12COMMENT= Gnome Display Manager - a re-implementation of the xdm program 12COMMENT= Gnome Display Manager - a re-implementation of the xdm program
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16DEPENDS+= zenity>=2.16.0:../../x11/zenity 16DEPENDS+= zenity>=2.16.0:../../x11/zenity
17 17
18USE_PKGLOCALEDIR= YES 18USE_PKGLOCALEDIR= YES
@@ -46,27 +46,27 @@ OWN_DIRS+= ${VARBASE}/log/gdm @@ -46,27 +46,27 @@ OWN_DIRS+= ${VARBASE}/log/gdm
46 46
47PKG_SYSCONFSUBDIR= gdm 47PKG_SYSCONFSUBDIR= gdm
48EGDIR= ${PREFIX}/share/examples/gdm 48EGDIR= ${PREFIX}/share/examples/gdm
49CONF_FILES= 49CONF_FILES=
50.for f in custom.conf locale.alias \ 50.for f in custom.conf locale.alias \
51 modules/AccessDwellMouseEvents modules/AccessKeyMouseEvents \ 51 modules/AccessDwellMouseEvents modules/AccessKeyMouseEvents \
52 modules/factory-AccessDwellMouseEvents \ 52 modules/factory-AccessDwellMouseEvents \
53 modules/factory-AccessKeyMouseEvents 53 modules/factory-AccessKeyMouseEvents
54CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} 54CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
55.endfor 55.endfor
56.for f in Init/Default PostLogin/Default.sample PostSession/Default \ 56.for f in Init/Default PostLogin/Default.sample PostSession/Default \
57 PreSession/Default XKeepsCrashing Xsession 57 PreSession/Default XKeepsCrashing Xsession
58CONF_FILES_PERMS+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} \ 58CONF_FILES_PERMS+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} \
59 ${ROOT_USER} ${ROOT_GROUP} 0755 59 ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0755
60.endfor 60.endfor
61RCD_SCRIPTS= gdm 61RCD_SCRIPTS= gdm
62 62
63.include "../../mk/bsd.prefs.mk" 63.include "../../mk/bsd.prefs.mk"
64 64
65SUBST_CLASSES+= desktop 65SUBST_CLASSES+= desktop
66SUBST_MESSAGE.desktop= Configuring GDM settings. 66SUBST_MESSAGE.desktop= Configuring GDM settings.
67SUBST_STAGE.desktop= pre-configure 67SUBST_STAGE.desktop= pre-configure
68SUBST_FILES.desktop= config/default.desktop.in 68SUBST_FILES.desktop= config/default.desktop.in
69#SUBST_FILES.desktop+= config/gnome.desktop.in 69#SUBST_FILES.desktop+= config/gnome.desktop.in
70SUBST_FILES.desktop+= config/gdm.conf.in 70SUBST_FILES.desktop+= config/gdm.conf.in
71SUBST_SED.desktop= -e 's/^_//g' 71SUBST_SED.desktop= -e 's/^_//g'
72SUBST_SED.desktop+= -e 's|^User=gdm$$|User=${GDMOWN}|g' 72SUBST_SED.desktop+= -e 's|^User=gdm$$|User=${GDMOWN}|g'
@@ -74,30 +74,30 @@ SUBST_SED.desktop+= -e 's|^Group=gdm$$|G @@ -74,30 +74,30 @@ SUBST_SED.desktop+= -e 's|^Group=gdm$$|G
74SUBST_SED.desktop+= -e 's|^\#GtkTheme=.*$$|GtkTheme=Clearlooks|g' 74SUBST_SED.desktop+= -e 's|^\#GtkTheme=.*$$|GtkTheme=Clearlooks|g'
75SUBST_SED.desktop+= -e 's|^\#FirstVT=.*$$|FirstVT=5|g' 75SUBST_SED.desktop+= -e 's|^\#FirstVT=.*$$|FirstVT=5|g'
76SUBST_SED.desktop+= -e 's|^\#VTAllocation=.*$$|VTAllocation=true|g' 76SUBST_SED.desktop+= -e 's|^\#VTAllocation=.*$$|VTAllocation=true|g'
77.if ${OPSYS} == "NetBSD" 77.if ${OPSYS} == "NetBSD"
78SUBST_SED.desktop+= -e 's|^\#Logo=.*$$|Logo=${PREFIX}/share/pixmaps/NetBSD.xpm|g' 78SUBST_SED.desktop+= -e 's|^\#Logo=.*$$|Logo=${PREFIX}/share/pixmaps/NetBSD.xpm|g'
79.endif 79.endif
80.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" 80.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD"
81SUBST_SED.desktop+= -e 's|^\#RebootCommand=.*$$|RebootCommand=/sbin/shutdown -r now|g' 81SUBST_SED.desktop+= -e 's|^\#RebootCommand=.*$$|RebootCommand=/sbin/shutdown -r now|g'
82SUBST_SED.desktop+= -e 's|^\#HaltCommand=.*$$|HaltCommand=/sbin/shutdown -p now|g' 82SUBST_SED.desktop+= -e 's|^\#HaltCommand=.*$$|HaltCommand=/sbin/shutdown -p now|g'
83.endif 83.endif
84SUBST_SED.desktop+= -e 's|^PreFetchProgram=.*$$|PreFetchProgram=${PREFIX}/libexec/gdmprefetch @${PKG_SYSCONFDIR}/gdmprefetchlist|g' 84SUBST_SED.desktop+= -e 's|^PreFetchProgram=.*$$|PreFetchProgram=${PREFIX}/libexec/gdmprefetch @${PKG_SYSCONFDIR}/gdmprefetchlist|g'
85 85
86SUBST_CLASSES+= gdmsetup 86SUBST_CLASSES+= gdmsetup
87SUBST_MESSAGE.gdmsetup= Patching gdmsetup theme installer to use ${ROOT_USER}:${ROOT_GROUP} 87SUBST_MESSAGE.gdmsetup= Patching gdmsetup theme installer to use ${REAL_ROOT_USER}:${REAL_ROOT_GROUP}
88SUBST_STAGE.gdmsetup= post-patch 88SUBST_STAGE.gdmsetup= post-patch
89SUBST_FILES.gdmsetup= gui/gdmsetup.c 89SUBST_FILES.gdmsetup= gui/gdmsetup.c
90SUBST_SED.gdmsetup= -e 's/root:root/${ROOT_USER}:${ROOT_GROUP}/g' 90SUBST_SED.gdmsetup= -e 's/root:root/${REAL_ROOT_USER}:${REAL_ROOT_GROUP}/g'
91 91
92.if ${OPSYS} == "SunOS" 92.if ${OPSYS} == "SunOS"
93CFLAGS+= -DSunOS 93CFLAGS+= -DSunOS
94GDMOWN= daemon 94GDMOWN= daemon
95GDMGRP= other 95GDMGRP= other
96.else 96.else
97GDMOWN= daemon 97GDMOWN= daemon
98GDMGRP= daemon 98GDMGRP= daemon
99.endif 99.endif
100 100
101# The following forces the X server to start on the 5th virtual terminal. 101# The following forces the X server to start on the 5th virtual terminal.
102# This is suboptimal but matches the defaults for the xdm configuration, 102# This is suboptimal but matches the defaults for the xdm configuration,
103# which should work for most installations. See the definition of 103# which should work for most installations. See the definition of