Tue May 12 16:30:59 2020 UTC ()
x11/gdm: remove nonexistent files from SUBST_FILES


(rillig)
diff -r1.195 -r1.196 pkgsrc/x11/gdm/Makefile
cvs diff -r1.195 -r1.196 pkgsrc/x11/gdm/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/gdm/Attic/Makefile 2020/03/10 22:11:12 1.195
+++ pkgsrc/x11/gdm/Attic/Makefile 2020/05/12 16:30:59 1.196
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.195 2020/03/10 22:11:12 wiz Exp $ 1# $NetBSD: Makefile,v 1.196 2020/05/12 16:30:59 rillig Exp $
2# 2#
3 3
4DISTNAME= gdm-2.20.11 4DISTNAME= gdm-2.20.11
5PKGREVISION= 31 5PKGREVISION= 31
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= https://www.gnome.org/ 11HOMEPAGE= https://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
14DEPENDS+= zenity>=2.16.0:../../x11/zenity 14DEPENDS+= zenity>=2.16.0:../../x11/zenity
@@ -53,28 +53,26 @@ CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCON @@ -53,28 +53,26 @@ CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCON
53.endfor 53.endfor
54.for f in Init/Default PostLogin/Default.sample PostSession/Default \ 54.for f in Init/Default PostLogin/Default.sample PostSession/Default \
55 PreSession/Default XKeepsCrashing Xsession 55 PreSession/Default XKeepsCrashing Xsession
56CONF_FILES_PERMS+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} \ 56CONF_FILES_PERMS+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} \
57 ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0755 57 ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0755
58.endfor 58.endfor
59RCD_SCRIPTS= gdm 59RCD_SCRIPTS= gdm
60 60
61.include "../../mk/bsd.prefs.mk" 61.include "../../mk/bsd.prefs.mk"
62 62
63SUBST_CLASSES+= desktop 63SUBST_CLASSES+= desktop
64SUBST_MESSAGE.desktop= Configuring GDM settings. 64SUBST_MESSAGE.desktop= Configuring GDM settings.
65SUBST_STAGE.desktop= pre-configure 65SUBST_STAGE.desktop= pre-configure
66SUBST_FILES.desktop= config/default.desktop.in 
67#SUBST_FILES.desktop+= config/gnome.desktop.in 
68SUBST_FILES.desktop+= config/gdm.conf.in 66SUBST_FILES.desktop+= config/gdm.conf.in
69SUBST_SED.desktop= -e 's/^_//g' 67SUBST_SED.desktop= -e 's/^_//g'
70SUBST_SED.desktop+= -e 's|^User=gdm$$|User=${GDMOWN}|g' 68SUBST_SED.desktop+= -e 's|^User=gdm$$|User=${GDMOWN}|g'
71SUBST_SED.desktop+= -e 's|^Group=gdm$$|Group=${GDMGRP}|g' 69SUBST_SED.desktop+= -e 's|^Group=gdm$$|Group=${GDMGRP}|g'
72SUBST_SED.desktop+= -e 's|^\#GtkTheme=.*$$|GtkTheme=Clearlooks|g' 70SUBST_SED.desktop+= -e 's|^\#GtkTheme=.*$$|GtkTheme=Clearlooks|g'
73SUBST_SED.desktop+= -e 's|^\#FirstVT=.*$$|FirstVT=5|g' 71SUBST_SED.desktop+= -e 's|^\#FirstVT=.*$$|FirstVT=5|g'
74SUBST_SED.desktop+= -e 's|^\#VTAllocation=.*$$|VTAllocation=true|g' 72SUBST_SED.desktop+= -e 's|^\#VTAllocation=.*$$|VTAllocation=true|g'
75.if ${OPSYS} == "NetBSD" 73.if ${OPSYS} == "NetBSD"
76SUBST_SED.desktop+= -e 's|^\#Logo=.*$$|Logo=${PREFIX}/share/pixmaps/NetBSD.xpm|g' 74SUBST_SED.desktop+= -e 's|^\#Logo=.*$$|Logo=${PREFIX}/share/pixmaps/NetBSD.xpm|g'
77.endif 75.endif
78.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" 76.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD"
79SUBST_SED.desktop+= -e 's|^\#RebootCommand=.*$$|RebootCommand=/sbin/shutdown -r now|g' 77SUBST_SED.desktop+= -e 's|^\#RebootCommand=.*$$|RebootCommand=/sbin/shutdown -r now|g'
80SUBST_SED.desktop+= -e 's|^\#HaltCommand=.*$$|HaltCommand=/sbin/shutdown -p now|g' 78SUBST_SED.desktop+= -e 's|^\#HaltCommand=.*$$|HaltCommand=/sbin/shutdown -p now|g'