summaryrefslogtreecommitdiff
path: root/x11/xorg-libs/patches/patch-al
diff options
context:
space:
mode:
Diffstat (limited to 'x11/xorg-libs/patches/patch-al')
-rw-r--r--x11/xorg-libs/patches/patch-al35
1 files changed, 11 insertions, 24 deletions
diff --git a/x11/xorg-libs/patches/patch-al b/x11/xorg-libs/patches/patch-al
index 84f9a08769d..2e28f077169 100644
--- a/x11/xorg-libs/patches/patch-al
+++ b/x11/xorg-libs/patches/patch-al
@@ -1,25 +1,12 @@
-$NetBSD: patch-al,v 1.2 2004/09/21 17:38:53 xtraeme Exp $
+$NetBSD: patch-al,v 1.3 2006/01/18 23:53:06 xtraeme Exp $
-Workaround to make this build on Linux, I think the error is related
-to buildlink.
-
---- programs/Xserver/hw/dmx/dmxinit.c.orig 2004-09-16 15:20:43.000000000 +0200
-+++ programs/Xserver/hw/dmx/dmxinit.c 2004-09-16 15:21:21.000000000 +0200
-@@ -573,7 +573,7 @@
- #endif
-
- if (dmxGeneration != serverGeneration) {
-- int vendrel = VENDOR_RELEASE;
-+ int vendrel = NULL;
- int major, minor, year, month, day;
-
- dmxGeneration = serverGeneration;
-@@ -595,7 +595,7 @@
- dmxLog(dmxInfo, "DMX version: %d.%d.%02d%02d%02d (%s)\n",
- major, minor, year, month, day, VENDOR_STRING);
-
-- SetVendorRelease(VENDOR_RELEASE);
-+ SetVendorRelease(NULL);
- SetVendorString(VENDOR_STRING);
-
- if (dmxGeneration == 1) {
+--- programs/xdm/config/xdm-conf.cpp.orig 2006-01-02 11:00:33.000000000 +0100
++++ programs/xdm/config/xdm-conf.cpp 2006-01-02 11:00:51.000000000 +0100
+@@ -19,6 +19,7 @@
+ DisplayManager.accessFile: XDMCONFIGDIR/Xaccess
+ DisplayManager*resources: XDMCONFIGDIR/Xresources
+ DisplayManager.willing: SU nobody -c XDMSCRIPTDIR/Xwilling
++DisplayManager.authDir: XDMAUTHDIR
+ ! All displays should use authorization, but we cannot be sure
+ ! X terminals may not be configured that way, so they will require
+ ! individual resource settings.