summaryrefslogtreecommitdiff
path: root/x11/libXxf86vm
diff options
context:
space:
mode:
authorbjs <bjs@pkgsrc.org>2008-07-13 23:18:19 +0000
committerbjs <bjs@pkgsrc.org>2008-07-13 23:18:19 +0000
commit70c414d849df1bab38528119bd2d3c344b0eddff (patch)
tree0b927aa227cacef9a1e53681b923503018d5d6c7 /x11/libXxf86vm
parent4c2c00655706f0e9264621c6455cca6fbe157d31 (diff)
downloadpkgsrc-70c414d849df1bab38528119bd2d3c344b0eddff.tar.gz
Update to version 1.0.2. In addition to incorporating patch-aa, there's
one more change: zero-length strings are set to NULL instead of null- terminated.
Diffstat (limited to 'x11/libXxf86vm')
-rw-r--r--x11/libXxf86vm/Makefile5
-rw-r--r--x11/libXxf86vm/distinfo9
-rw-r--r--x11/libXxf86vm/patches/patch-aa25
3 files changed, 6 insertions, 33 deletions
diff --git a/x11/libXxf86vm/Makefile b/x11/libXxf86vm/Makefile
index f18be64e532..3c49a22e25c 100644
--- a/x11/libXxf86vm/Makefile
+++ b/x11/libXxf86vm/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2008/05/24 21:45:16 tnn Exp $
+# $NetBSD: Makefile,v 1.5 2008/07/13 23:18:19 bjs Exp $
#
-DISTNAME= libXxf86vm-1.0.1
-PKGREVISION= 1
+DISTNAME= libXxf86vm-1.0.2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/libXxf86vm/distinfo b/x11/libXxf86vm/distinfo
index d5dff968e15..74f548a7fcd 100644
--- a/x11/libXxf86vm/distinfo
+++ b/x11/libXxf86vm/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.2 2008/04/08 03:41:00 bjs Exp $
+$NetBSD: distinfo,v 1.3 2008/07/13 23:18:19 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
+SHA1 (libXxf86vm-1.0.2.tar.bz2) = f9003eeacea625da74d757a68a66aa7dff5ed0cf
+RMD160 (libXxf86vm-1.0.2.tar.bz2) = 10fcd0ebd90c0110e6b04da660578aa883895256
+Size (libXxf86vm-1.0.2.tar.bz2) = 240637 bytes
diff --git a/x11/libXxf86vm/patches/patch-aa b/x11/libXxf86vm/patches/patch-aa
deleted file mode 100644
index c4ef3564dea..00000000000
--- a/x11/libXxf86vm/patches/patch-aa
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2008/04/08 03:41:00 bjs Exp $
-
-From: Adam Jackson <ajax@redhat.com>
-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();