From 2ec1ee6032ed13a177fd7f467d1a42d7a64a4167 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Thu, 1 Jan 2009 12:01:19 +0000 Subject: [PATCH] - use xdm Xresources file instead of non-existent one --- x11/gnome/gdm/Makefile | 4 ++-- x11/gnome/gdm/patches/patch-config_Init_in | 15 ++++++++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/x11/gnome/gdm/Makefile b/x11/gnome/gdm/Makefile index afc0334ad2f..b6530943914 100644 --- a/x11/gnome/gdm/Makefile +++ b/x11/gnome/gdm/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.42 2008/12/31 17:10:53 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.43 2009/01/01 12:01:19 ajacoutot Exp $ COMMENT= GNOME display manager GNOME_PROJECT= gdm GNOME_VERSION= 2.20.8 -PKGNAME= ${DISTNAME}p6 +PKGNAME= ${DISTNAME}p7 HOMEPAGE= http://www.gnome.org/projects/gdm/ diff --git a/x11/gnome/gdm/patches/patch-config_Init_in b/x11/gnome/gdm/patches/patch-config_Init_in index 747534e5033..9839ad2fff0 100644 --- a/x11/gnome/gdm/patches/patch-config_Init_in +++ b/x11/gnome/gdm/patches/patch-config_Init_in @@ -1,6 +1,6 @@ -$OpenBSD: patch-config_Init_in,v 1.1 2008/12/18 12:06:09 ajacoutot Exp $ ---- config/Init.in.orig Thu Dec 18 12:01:48 2008 -+++ config/Init.in Thu Dec 18 12:03:21 2008 +$OpenBSD: patch-config_Init_in,v 1.2 2009/01/01 12:01:20 ajacoutot Exp $ +--- config/Init.in.orig Wed Sep 3 20:36:09 2008 ++++ config/Init.in Thu Jan 1 12:54:44 2009 @@ -3,7 +3,7 @@ # Plus a lot of fun stuff added # -George @@ -10,3 +10,12 @@ $OpenBSD: patch-config_Init_in,v 1.1 2008/12/18 12:06:09 ajacoutot Exp $ OLD_IFS=$IFS gdmwhich () { +@@ -22,7 +22,7 @@ gdmwhich () { + echo "$OUTPUT" + } + +-sysresources=/etc/X11/Xresources ++sysresources=/etc/X11/xdm/Xresources + + # merge in defaults + if [ -f "$sysresources" ]; then