diff options
author | jmmv <jmmv@pkgsrc.org> | 2004-07-05 22:02:58 +0000 |
---|---|---|
committer | jmmv <jmmv@pkgsrc.org> | 2004-07-05 22:02:58 +0000 |
commit | 1fece3d5f138609fc9c4566810f1963595e7c1e1 (patch) | |
tree | 9ffa0e97c5201aba1e057a7f7a2f78d5a06fe5ee | |
parent | 2f6fd86193aaecef408491446d7510e468811c19 (diff) | |
download | pkgsrc-1fece3d5f138609fc9c4566810f1963595e7c1e1.tar.gz |
Update to 2.6.0.3nb1:
- Use VARBASE instead of hardcoding /var.
- Patch gdm.conf.in directly from the Makefile using subst.mk, instead of
doing it from a patch _and_ the Makefile.
- Do not register the rc.d script in the PLIST (handled automatically).
- Under NetBSD (and OpenBSD), use /sbin/shutdown to reboot and halt the
computer, instead of reboot and poweroff. The former runs the rc.d
scripts properly while the other two don't.
-rw-r--r-- | x11/gdm/Makefile | 22 | ||||
-rw-r--r-- | x11/gdm/PLIST | 3 | ||||
-rw-r--r-- | x11/gdm/distinfo | 3 | ||||
-rw-r--r-- | x11/gdm/patches/patch-ab | 24 |
4 files changed, 16 insertions, 36 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index e957648d9cc..5c052146783 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.66 2004/07/05 09:10:19 jmmv Exp $ +# $NetBSD: Makefile,v 1.67 2004/07/05 22:02:58 jmmv Exp $ # DISTNAME= gdm-2.6.0.3 +PKGREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gdm/2.6/} EXTRACT_SUFX= .tar.bz2 @@ -27,7 +28,7 @@ GNU_CONFIGURE= YES USE_X11= YES USE_LIBTOOL= YES -CONFIGURE_ARGS+= --localstatedir=/var +CONFIGURE_ARGS+= --localstatedir=${VARBASE} CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} CONFIGURE_ENV+= X11BASE=${X11BASE} MAKE_ENV+= CHMOD=${CHMOD} CHOWN=${CHOWN} @@ -37,8 +38,8 @@ OWN_DIRS+= ${PKG_SYSCONFDIR}/gdm/Init OWN_DIRS+= ${PKG_SYSCONFDIR}/gdm/PostSession OWN_DIRS+= ${PKG_SYSCONFDIR}/gdm/PreSession OWN_DIRS+= ${PKG_SYSCONFDIR}/gdm/modules -OWN_DIRS+= /var/gdm -OWN_DIRS+= /var/log/gdm +OWN_DIRS+= ${VARBASE}/gdm +OWN_DIRS+= ${VARBASE}/log/gdm EGDIR= ${PREFIX}/share/examples CONF_FILES= ${EGDIR}/dm/Sessions/default.desktop \ @@ -58,6 +59,8 @@ SUPPORT_FILES+= ${EGDIR}/gdm/$f \ .endfor RCD_SCRIPTS= gdm +.include "../../mk/bsd.prefs.mk" + SUBST_CLASSES+= desktop SUBST_MESSAGE.desktop= "Configuring GDM settings." SUBST_STAGE.desktop= pre-configure @@ -65,10 +68,13 @@ 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" +SUBST_SED.desktop+= -e 's|^User=gdm$$|User=${GDMOWN}|g' +SUBST_SED.desktop+= -e 's|^Group=gdm$$|Group=${GDMGRP}|g' +SUBST_SED.desktop+= -e 's|^\#Logo=.*$$|Logo=@EXPANDED_PIXMAPDIR@/Daemon.png|g' +.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" +SUBST_SED.desktop+= -e 's|^\#RebootCommand=.*$$|RebootCommand=/sbin/shutdown -r now|g' +SUBST_SED.desktop+= -e 's|^\#HaltCommand=.*$$|HaltCommand=/sbin/shutdown -p now|g' +.endif BUILD_DEFS+= USE_INET6 diff --git a/x11/gdm/PLIST b/x11/gdm/PLIST index 596bfb33301..d729cffb609 100644 --- a/x11/gdm/PLIST +++ b/x11/gdm/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2004/06/20 21:25:46 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.11 2004/07/05 22:02:58 jmmv Exp $ bin/gdm bin/gdm-binary bin/gdmXnest @@ -10,7 +10,6 @@ bin/gdmlogin bin/gdmphotosetup bin/gdmsetup bin/gdmthemetester -etc/rc.d/gdm lib/gtk-2.0/modules/libdwellmouselistener.a lib/gtk-2.0/modules/libdwellmouselistener.la lib/gtk-2.0/modules/libkeymouselistener.a diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo index bee2de484b1..14756b3ea87 100644 --- a/x11/gdm/distinfo +++ b/x11/gdm/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.15 2004/07/05 09:10:19 jmmv Exp $ +$NetBSD: distinfo,v 1.16 2004/07/05 22:02:58 jmmv Exp $ SHA1 (gdm-2.6.0.3.tar.bz2) = 03462ee0ac5eb7238e7460fc6c985724500470b1 Size (gdm-2.6.0.3.tar.bz2) = 3079606 bytes @@ -7,7 +7,6 @@ Size (Daemon.README) = 2191 bytes SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d Size (Daemon.png) = 15725 bytes SHA1 (patch-aa) = 2704d70b2ad3b3908749e3423fc60e8815287451 -SHA1 (patch-ab) = 049d4fe8b6e71239392e7a8bae00006103dff309 SHA1 (patch-ac) = d810e16076aa69070f238900198a0050eaf12516 SHA1 (patch-ae) = f05e3bffbcb1522ac6265869eef52655d35511c2 SHA1 (patch-af) = 467afc3ee4d555fac4d5d26e49c3ff8b098e7369 diff --git a/x11/gdm/patches/patch-ab b/x11/gdm/patches/patch-ab deleted file mode 100644 index bcc128307de..00000000000 --- a/x11/gdm/patches/patch-ab +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ab,v 1.5 2004/01/20 13:41:06 xtraeme Exp $ - ---- config/gdm.conf.in.orig 2003-10-10 16:03:16.000000000 -0500 -+++ config/gdm.conf.in -@@ -68,8 +68,8 @@ TimedLoginDelay=30 - # you should create these user and group. Anyone found running this as - # someone too privilaged will get a kick in the ass. This should have - # access to only the gdm directories and files. --User=gdm --Group=gdm -+User=@GDMOWN@ -+Group=@GDMGRP@ - # To try to kill all clients started at greeter time or in the Init script. - # doesn't always work, only if those clients have a window of their own - #KillInitClients=true -@@ -237,7 +237,7 @@ Browser=false - # although gdm will be able to read a standard locale.alias file as well. - #LocaleFile=@EXPANDED_LOCALEDIR@/locale.alias - # Logo shown in the standard greeter --#Logo=@EXPANDED_PIXMAPDIR@/gdm-foot-logo.png -+Logo=@EXPANDED_PIXMAPDIR@/Daemon.png - # The standard greeter should shake if a user entered the wrong username or - # password. Kind of cool looking - #Quiver=true |