From e8bf783e1aa281cd3a6c29d57c45755ef32b070b Mon Sep 17 00:00:00 2001
From: smb <smb>
Date: Tue, 11 Sep 2007 23:49:39 +0000
Subject: Avoid problems if a pointer passed in is NULL (and work around what
 may or may not be an xfig bug)

---
 x11/Xaw3d/Makefile         |  4 ++--
 x11/Xaw3d/distinfo         |  3 ++-
 x11/Xaw3d/patches/patch-ad | 13 +++++++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 x11/Xaw3d/patches/patch-ad

(limited to 'x11/Xaw3d')

diff --git a/x11/Xaw3d/Makefile b/x11/Xaw3d/Makefile
index d8ee96dfed1..1ced6c6230f 100644
--- a/x11/Xaw3d/Makefile
+++ b/x11/Xaw3d/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.51 2006/12/27 13:37:42 joerg Exp $
+# $NetBSD: Makefile,v 1.52 2007/09/11 23:49:39 smb Exp $
 #
 
 DISTNAME=	Xaw3d-1.5E
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.visi.com/users/hawkeyd/X/
 
diff --git a/x11/Xaw3d/distinfo b/x11/Xaw3d/distinfo
index 11ab36fe725..29ae74ecf02 100644
--- a/x11/Xaw3d/distinfo
+++ b/x11/Xaw3d/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2006/03/13 00:16:23 markd Exp $
+$NetBSD: distinfo,v 1.10 2007/09/11 23:49:40 smb Exp $
 
 SHA1 (Xaw3d-1.5E.tar.gz) = efc5b923feda52866c859c59a5b553cb675a69d1
 RMD160 (Xaw3d-1.5E.tar.gz) = 086cbabaa45ce5c110815aea24eebcbb54613118
@@ -6,3 +6,4 @@ Size (Xaw3d-1.5E.tar.gz) = 309264 bytes
 SHA1 (patch-aa) = 7729cfe83671f482670350ead9ccf1bfe3e932e3
 SHA1 (patch-ab) = 9bbe44041708b2d01b728638ac07e32addc01cff
 SHA1 (patch-ac) = cce339b75bdfe407608f004eaf1f22fca26ecd5e
+SHA1 (patch-ad) = 213145d3e7bb6ac78912f16be98d4f446e40b9ac
diff --git a/x11/Xaw3d/patches/patch-ad b/x11/Xaw3d/patches/patch-ad
new file mode 100644
index 00000000000..73e2ba55568
--- /dev/null
+++ b/x11/Xaw3d/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2007/09/11 23:49:40 smb Exp $
+
+--- SmeLine.c.orig	2000-11-27 08:19:28.000000000 -0500
++++ SmeLine.c	2007-09-11 17:21:39.000000000 -0400
+@@ -217,7 +217,7 @@
+     SmeLineObject entry = (SmeLineObject) w;
+     SimpleMenuWidget smw = (SimpleMenuWidget) XtParent (w);
+     ThreeDWidget tdw = (ThreeDWidget) smw->simple_menu.threeD;
+-    Dimension s = tdw->threeD.shadow_width;
++    Dimension s = tdw ? tdw->threeD.shadow_width : NULL;
+     int y = entry->rectangle.y + 
+ 	    (int)(entry->rectangle.height - entry->sme_line.line_width) / 2;
+ 
-- 
cgit v1.2.3