XtCtextBorder, XtCdrawTextBorder:

These two macros are multiply defined in Label.h, List.h, and SmeBSB.h.
We undefine them before setting up their definitions in each header file.

4 files changed, 70 insertions, 1 deletions

diff --git a/x11/Xaw-Xpm/files/patch-sum b/x11/Xaw-Xpm/files/patch-sum
index c475762387f..d4f0ee989fa 100644
--- a/x11/Xaw-Xpm/files/patch-sum
+++ b/x11/Xaw-Xpm/files/patch-sum
@@ -1,4 +1,7 @@
-$NetBSD: patch-sum,v 1.2 2000/10/06 01:15:42 jlam Exp $
+$NetBSD: patch-sum,v 1.3 2000/12/06 09:01:57 jlam Exp $
 
 MD5 (patch-aa) = e7d8a270765ae5b07eb901639d994995
 MD5 (patch-ab) = 29c5f04752833e738f8307e60471a495
+MD5 (patch-ac) = 457980e1e3a26f32fb8af7e965662e14
+MD5 (patch-ad) = 0d57bd8b6225eb359fe44999efa884b2
+MD5 (patch-ae) = e21c1c1d0bbcd03763d446cf6623f38e
diff --git a/x11/Xaw-Xpm/patches/patch-ac b/x11/Xaw-Xpm/patches/patch-ac
new file mode 100644
index 00000000000..3b6f41e3b93
--- /dev/null
+++ b/x11/Xaw-Xpm/patches/patch-ac
@@ -0,0 +1,22 @@
+$NetBSD: patch-ac,v 1.1 2000/12/06 09:02:01 jlam Exp $
+
+--- Label.h.orig	Sat Nov  9 22:07:44 1996
++++ Label.h
+@@ -98,6 +98,17 @@
+ #define XawTextEncoding8bit	0
+ #define XawTextEncodingChar2b	1
+ 
++/*
++ * These two macros are multiply defined in Label.h, List.h, and SmeBSB.h.
++ * We undefine them before setting up their definitions in each header file.
++ */
++#ifdef XtCtextBorder
++#undef XtCtextBorder
++#endif
++#ifdef XtCdrawTextBorder
++#undef XtCdrawTextBorder
++#endif
++
+ #define XtNleftBitmap "leftBitmap"
+ #define XtCLeftBitmap "LeftBitmap"
+ #define XtNencoding "encoding"
diff --git a/x11/Xaw-Xpm/patches/patch-ad b/x11/Xaw-Xpm/patches/patch-ad
new file mode 100644
index 00000000000..88613ae206e
--- /dev/null
+++ b/x11/Xaw-Xpm/patches/patch-ad
@@ -0,0 +1,22 @@
+$NetBSD: patch-ad,v 1.1 2000/12/06 09:02:01 jlam Exp $
+
+--- List.h.orig	Sat Nov  9 22:08:42 1996
++++ List.h
+@@ -120,6 +120,17 @@
+ 
+ #define XAW_LIST_NONE -1	
+ 
++/*
++ * These two macros are multiply defined in Label.h, List.h, and SmeBSB.h.
++ * We undefine them before setting up their definitions in each header file. 
++ */
++#ifdef XtCtextBorder
++#undef XtCtextBorder
++#endif
++#ifdef XtCdrawTextBorder
++#undef XtCdrawTextBorder
++#endif
++
+ #define XtCList "List"
+ #define XtCSpacing "Spacing"
+ #define XtCColumns "Columns"
diff --git a/x11/Xaw-Xpm/patches/patch-ae b/x11/Xaw-Xpm/patches/patch-ae
new file mode 100644
index 00000000000..52e2d654096
--- /dev/null
+++ b/x11/Xaw-Xpm/patches/patch-ae
@@ -0,0 +1,22 @@
+$NetBSD: patch-ae,v 1.1 2000/12/06 09:02:01 jlam Exp $
+
+--- SmeBSB.h.orig	Sat Nov  9 22:18:01 1996
++++ SmeBSB.h
+@@ -82,6 +82,17 @@
+ 
+ extern WidgetClass smeBSBObjectClass;
+ 
++/*
++ * These two macros are multiply defined in Label.h, List.h, and SmeBSB.h.
++ * We undefine them before setting up their definitions in each header file. 
++ */
++#ifdef XtCtextBorder
++#undef XtCtextBorder
++#endif
++#ifdef XtCdrawTextBorder
++#undef XtCdrawTextBorder
++#endif
++
+ #define XtNleftBitmap "leftBitmap"
+ #define XtNleftMargin "leftMargin"
+ #define XtNrightBitmap "rightBitmap"