From 6c0d8d46e9cdf7602942bb092fe3801cf4b645be Mon Sep 17 00:00:00 2001
From: reed <reed>
Date: Thu, 27 Dec 2007 14:14:24 +0000
Subject: Add patch and bump revision.

This is for PR 37610 to fix internationalized text bug.

This fix was already in XFree86 and Xorg libXaw versions since at
least Nov. 2004 and in Fedora for Xaw3d since 2002.
---
 x11/Xaw3d/Makefile         |  4 ++--
 x11/Xaw3d/distinfo         |  3 ++-
 x11/Xaw3d/patches/patch-ae | 16 ++++++++++++++++
 3 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 x11/Xaw3d/patches/patch-ae

(limited to 'x11/Xaw3d')

diff --git a/x11/Xaw3d/Makefile b/x11/Xaw3d/Makefile
index c0723d65468..3b37aca39e3 100644
--- a/x11/Xaw3d/Makefile
+++ b/x11/Xaw3d/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.53 2007/09/29 12:28:36 obache Exp $
+# $NetBSD: Makefile,v 1.54 2007/12/27 14:14:24 reed Exp $
 #
 
 DISTNAME=	Xaw3d-1.5E
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.visi.com/users/hawkeyd/X/
 
diff --git a/x11/Xaw3d/distinfo b/x11/Xaw3d/distinfo
index 22575467254..edc495e322c 100644
--- a/x11/Xaw3d/distinfo
+++ b/x11/Xaw3d/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2007/09/12 11:29:36 xtraeme Exp $
+$NetBSD: distinfo,v 1.12 2007/12/27 14:14:24 reed Exp $
 
 SHA1 (Xaw3d-1.5E.tar.gz) = efc5b923feda52866c859c59a5b553cb675a69d1
 RMD160 (Xaw3d-1.5E.tar.gz) = 086cbabaa45ce5c110815aea24eebcbb54613118
@@ -7,3 +7,4 @@ SHA1 (patch-aa) = 7729cfe83671f482670350ead9ccf1bfe3e932e3
 SHA1 (patch-ab) = 9bbe44041708b2d01b728638ac07e32addc01cff
 SHA1 (patch-ac) = cce339b75bdfe407608f004eaf1f22fca26ecd5e
 SHA1 (patch-ad) = e9c599fd237feabe9b3311f41da96455263a1a28
+SHA1 (patch-ae) = 6f6ffdd9ed4b60afb5518ed1d0245aa7fb515ac6
diff --git a/x11/Xaw3d/patches/patch-ae b/x11/Xaw3d/patches/patch-ae
new file mode 100644
index 00000000000..ec319984524
--- /dev/null
+++ b/x11/Xaw3d/patches/patch-ae
@@ -0,0 +1,16 @@
+$NetBSD: patch-ae,v 1.1 2007/12/27 14:14:24 reed Exp $
+
+Already in XFree86 and X.org versions since at least Nov. 2004.
+Also in Fedora version since Aug 09 2002.
+http://rpmfind.net//linux/RPM/fedora/7/x86_64/Xaw3d-1.5E-10.1.i386.html
+
+--- MultiSrc.c.orig	Tue Aug  6 22:51:08 2002
++++ MultiSrc.c	Tue Aug  6 22:51:16 2002
+@@ -735,6 +735,7 @@
+   
+   if ( string_set || (old_src->multi_src.type != src->multi_src.type) ) {
+     RemoveOldStringOrFile(old_src, string_set);
++    src->multi_src.allocated_string = old_src->multi_src.allocated_string;
+     file = InitStringOrFile(src, string_set);
+ 
+     /* Load pieces does this logic for us, but it shouldn't.  Its messy.*/
-- 
cgit v1.2.3