[pkgsrc/trunk]: pkgsrc/x11/libXxf86vm Add a patch from Xorg GIT to fix:

[bjs <bjs%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7fba7883e3e7
branches:  trunk
changeset: 540836:7fba7883e3e7
user:      bjs <bjs%pkgsrc.org@localhost>
date:      Tue Apr 08 03:41:00 2008 +0000

description:
Add a patch from Xorg GIT to fix:

Bug #10846: Fix XF86VidModeGetMonitor when vendor or model are null.

Bump PKGREVISION.

diffstat:

 x11/libXxf86vm/Makefile         |   3 ++-
 x11/libXxf86vm/distinfo         |   3 ++-
 x11/libXxf86vm/patches/patch-aa |  25 +++++++++++++++++++++++++
 3 files changed, 29 insertions(+), 2 deletions(-)

diffs (53 lines):

diff -r faf3b58b713b -r 7fba7883e3e7 x11/libXxf86vm/Makefile
--- a/x11/libXxf86vm/Makefile   Tue Apr 08 01:53:18 2008 +0000
+++ b/x11/libXxf86vm/Makefile   Tue Apr 08 03:41:00 2008 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/07/27 23:51:59 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/04/08 03:41:00 bjs Exp $
 #
 
 DISTNAME=              libXxf86vm-1.0.1
+PKGREVISION=           1
 CATEGORIES=            x11
 MASTER_SITES=          http://xorg.freedesktop.org/releases/individual/lib/
 EXTRACT_SUFX=          .tar.bz2
diff -r faf3b58b713b -r 7fba7883e3e7 x11/libXxf86vm/distinfo
--- a/x11/libXxf86vm/distinfo   Tue Apr 08 01:53:18 2008 +0000
+++ b/x11/libXxf86vm/distinfo   Tue Apr 08 03:41:00 2008 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/11/14 15:06:45 joerg Exp $
+$NetBSD: distinfo,v 1.2 2008/04/08 03:41:00 bjs Exp $
 
 SHA1 (libXxf86vm-1.0.1.tar.bz2) = 75469e9ef5bc29dc84fcc5e35251583d10c04859
 RMD160 (libXxf86vm-1.0.1.tar.bz2) = f9bd6533f37c74a948ad9f8af58d833a8ce1bfcf
 Size (libXxf86vm-1.0.1.tar.bz2) = 227928 bytes
+SHA1 (patch-aa) = aeff97fa6c348314c3a4e4aae8aa9ba782ab6f28
diff -r faf3b58b713b -r 7fba7883e3e7 x11/libXxf86vm/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/libXxf86vm/patches/patch-aa   Tue Apr 08 03:41:00 2008 +0000
@@ -0,0 +1,25 @@
+$NetBSD: patch-aa,v 1.1 2008/04/08 03:41:00 bjs Exp $
+
+From: Adam Jackson <ajax%redhat.com@localhost>
+Date: Mon, 24 Mar 2008 19:13:14 +0000 (-0400)
+Subject: Bug #10846: Fix XF86VidModeGetMonitor when vendor or model are null.
+X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/lib/libXxf86vm.git;a=commitdiff;h=0aa2ae83518b14e927fb5b8ced182a4f25cecc76
+
+Bug #10846: Fix XF86VidModeGetMonitor when vendor or model are null.
+
+--- src/XF86VMode.c.orig       2004-04-23 14:43:56.000000000 -0400
++++ src/XF86VMode.c
+@@ -967,11 +964,11 @@ XF86VidModeGetMonitor(dpy, screen, monit
+     if (rep.vendorLength)
+       _XReadPad(dpy, monitor->vendor, rep.vendorLength);
+     else
+-      monitor->vendor = "";
++      monitor->vendor[0] = '\0';
+     if (rep.modelLength)
+       _XReadPad(dpy, monitor->model, rep.modelLength);
+     else
+-      monitor->model = "";
++      monitor->model[0] = '\0';
+       
+     UnlockDisplay(dpy);
+     SyncHandle();