[pkgsrc/trunk]: pkgsrc Avoid problems if a pointer passed in is NULL (and wor...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/251c5ac13db0
branches:  trunk
changeset: 533249:251c5ac13db0
user:      smb <smb%pkgsrc.org@localhost>
date:      Tue Sep 11 23:49:39 2007 +0000

description:
Avoid problems if a pointer passed in is NULL (and work around what may
or may not be an xfig bug)

diffstat:

 doc/CHANGES-2007           |   3 ++-
 x11/Xaw3d/Makefile         |   4 ++--
 x11/Xaw3d/distinfo         |   3 ++-
 x11/Xaw3d/patches/patch-ad |  13 +++++++++++++
 4 files changed, 19 insertions(+), 4 deletions(-)

diffs (59 lines):

diff -r 6ec5e08a1698 -r 251c5ac13db0 doc/CHANGES-2007
--- a/doc/CHANGES-2007  Tue Sep 11 22:21:12 2007 +0000
+++ b/doc/CHANGES-2007  Tue Sep 11 23:49:39 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2007,v 1.1994 2007/09/11 18:41:47 wiz Exp $
+$NetBSD: CHANGES-2007,v 1.1995 2007/09/11 23:49:39 smb Exp $
 
 Changes to the packages collection and infrastructure in 2007:
 
@@ -3643,3 +3643,4 @@
        Added textproc/hunspell-de version 20070829 [wiz 2007-09-11]
        Added textproc/hunspell-en_GB version 20061130 [wiz 2007-09-11]
        Added textproc/hunspell-en_US version 20060207 [wiz 2007-09-11]
+       Updated x11/Xaw3d to 1.5Enb3 [smb 2007-09-11]
diff -r 6ec5e08a1698 -r 251c5ac13db0 x11/Xaw3d/Makefile
--- a/x11/Xaw3d/Makefile        Tue Sep 11 22:21:12 2007 +0000
+++ b/x11/Xaw3d/Makefile        Tue Sep 11 23:49:39 2007 +0000
@@ -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 -r 6ec5e08a1698 -r 251c5ac13db0 x11/Xaw3d/distinfo
--- a/x11/Xaw3d/distinfo        Tue Sep 11 22:21:12 2007 +0000
+++ b/x11/Xaw3d/distinfo        Tue Sep 11 23:49:39 2007 +0000
@@ -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 @@
 SHA1 (patch-aa) = 7729cfe83671f482670350ead9ccf1bfe3e932e3
 SHA1 (patch-ab) = 9bbe44041708b2d01b728638ac07e32addc01cff
 SHA1 (patch-ac) = cce339b75bdfe407608f004eaf1f22fca26ecd5e
+SHA1 (patch-ad) = 213145d3e7bb6ac78912f16be98d4f446e40b9ac
diff -r 6ec5e08a1698 -r 251c5ac13db0 x11/Xaw3d/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/Xaw3d/patches/patch-ad        Tue Sep 11 23:49:39 2007 +0000
@@ -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;
+