Clean up libXaw handling. [1/2]

- remove LIBXAW variable. It is handled by buildlink3.mk now
- simplify patches and Makefile in packages using libXaw
- in some cases force use of Xaw3d (won't build with Xaw)
- replace some directly included of x11/Xaw3d with mk/xaw.buildlink3.mk

In next part:
- replace more includes with mk/xaw.buildlink3.mk

11 files changed, 28 insertions, 138 deletions

diff --git a/x11/xcolorsel/patches/patch-Imakefile b/x11/xcolorsel/patches/patch-Imakefile
new file mode 100644
index 00000000000..22b33c90788
--- /dev/null
+++ b/x11/xcolorsel/patches/patch-Imakefile
@@ -0,0 +1,13 @@
+$NetBSD: patch-Imakefile,v 1.1 2013/01/15 16:21:36 morr Exp $
+
+--- Imakefile.orig	1994-12-13 20:31:19.000000000 +0000
++++ Imakefile
+@@ -71,7 +71,7 @@ depend:: appdef-c.h appdef.h
+ all:: Xcolorsel.help
+ install:: Xcolorsel.help
+ 
+-NormalProgramTarget(xcolorsel,$(OBJS),,XawClientLibs,)
++NormalProgramTarget(xcolorsel,$(OBJS),,-lXaw $(XMULIB) $(XTOOLLIB) $(XLIB),)
+ 
+ InstallProgram(xcolorsel,$(BINDIR))
+ InstallManPage(xcolorsel,$(MANDIR))
diff --git a/x11/xcolorsel/patches/patch-ab b/x11/xcolorsel/patches/patch-RgbText.c
index bc0dff6e3e2..4f040f1e7ee 100644
--- a/x11/xcolorsel/patches/patch-ab
+++ b/x11/xcolorsel/patches/patch-RgbText.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2007/07/31 09:57:04 joerg Exp $
+$NetBSD: patch-RgbText.c,v 1.1 2013/01/15 16:21:36 morr Exp $
 
 --- RgbText.c.orig	1994-12-13 22:13:27.000000000 +0000
 +++ RgbText.c
-@@ -78,12 +78,11 @@
+@@ -78,7 +78,6 @@
  #include <stdlib.h>
  /* And here we have a special gift for all SUN's outside >;-> */
  #include <unistd.h>
@@ -10,18 +10,12 @@ $NetBSD: patch-ab,v 1.3 2007/07/31 09:57:04 joerg Exp $
  #include <ctype.h>
  #include <errno.h>
  #include <X11/IntrinsicP.h>
- #include <X11/StringDefs.h>
--#include <X11/Xaw/Paned.h>
-+#include <X11/Xaw3d/Paned.h>
- #include "RgbTextP.h"
- #include "RgbSinkP.h"
- #include "RgbSrc.h"
 @@ -146,7 +145,7 @@ static XtResource resources[] = {
  { XtNcolumns, XtCColumns, XtRDimension, sizeof(Dimension), offset(columns),
  		XtRString, (XtPointer) "30" },
  { XtNfile, XtCFile, XtRString, sizeof(String), offset(file),
 -		XtRString, (XtPointer) "/usr/lib/X11/rgb.txt" },
-+		XtRString, (XtPointer) "/usr/X11R6/lib/X11/rgb.txt" },
++		XtRString, (XtPointer) "@X11BASE@/X11/rgb.txt" },
  { XtNtileWidth, XtCTileWidth, XtRDimension, sizeof(Dimension), offset(tile_width),
  		XtRString, (XtPointer) "3" },
  { XtNmaxRed, XtCMaxRed, XtRShort, sizeof(unsigned short), offset(max_red),
diff --git a/x11/xcolorsel/patches/patch-aa b/x11/xcolorsel/patches/patch-aa
deleted file mode 100644
index 84a00dd1160..00000000000
--- a/x11/xcolorsel/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2001/08/23 04:26:55 jlam Exp $
-
---- Imakefile.orig	Tue Dec 13 21:31:19 1994
-+++ Imakefile	Wed Jul 15 09:56:07 1998
-@@ -71,7 +71,7 @@
- all:: Xcolorsel.help
- install:: Xcolorsel.help
- 
--NormalProgramTarget(xcolorsel,$(OBJS),,XawClientLibs,)
-+NormalProgramTarget(xcolorsel,$(OBJS),,${LIBXAW} $(XMULIB) $(XTOOLLIB) $(XLIB),)
- 
- InstallProgram(xcolorsel,$(BINDIR))
- InstallManPage(xcolorsel,$(MANDIR))
diff --git a/x11/xcolorsel/patches/patch-ac b/x11/xcolorsel/patches/patch-ac
deleted file mode 100644
index dd8fb2e0439..00000000000
--- a/x11/xcolorsel/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.2 1998/08/07 11:18:21 agc Exp $
-
---- RgbSink.h.orig	Sun Nov 13 23:14:23 1994
-+++ RgbSink.h	Wed Jul 15 09:56:56 1998
-@@ -85,7 +85,7 @@
- /*The Parent:*/
- #include "RgbText.h"
- /* The superclass: */
--#include <X11/Xaw/AsciiSink.h>
-+#include <X11/Xaw3d/AsciiSink.h>
- 
- /****************************************************************
-  *
diff --git a/x11/xcolorsel/patches/patch-ad b/x11/xcolorsel/patches/patch-ad
deleted file mode 100644
index 6fb17029f2c..00000000000
--- a/x11/xcolorsel/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.2 1998/08/07 11:18:22 agc Exp $
-
---- RgbSinkP.h.orig	Sun Nov 13 23:14:27 1994
-+++ RgbSinkP.h	Wed Jul 15 09:57:46 1998
-@@ -85,7 +85,7 @@
- #include "RgbSink.h"
- #include "config.h"
- /* include superclass private header file */
--#include <X11/Xaw/AsciiSinkP.h>
-+#include <X11/Xaw3d/AsciiSinkP.h>
- /* This is closely related to and uses parts of: */
- #include "RgbTextP.h"
- 
diff --git a/x11/xcolorsel/patches/patch-ae b/x11/xcolorsel/patches/patch-ae
deleted file mode 100644
index 9bb10aa6f86..00000000000
--- a/x11/xcolorsel/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.2 1998/08/07 11:18:22 agc Exp $
-
---- RgbSrc.h.orig	Sun Nov 13 23:14:35 1994
-+++ RgbSrc.h	Wed Jul 15 09:58:37 1998
-@@ -84,7 +84,7 @@
- /*The Parent:*/
- #include "RgbText.h"
- /* The superclass: */
--#include <X11/Xaw/AsciiSrc.h>
-+#include <X11/Xaw3d/AsciiSrc.h>
- 
- /****************************************************************
-  *
diff --git a/x11/xcolorsel/patches/patch-af b/x11/xcolorsel/patches/patch-af
deleted file mode 100644
index f0efc5fecbd..00000000000
--- a/x11/xcolorsel/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.2 1998/08/07 11:18:22 agc Exp $
-
---- RgbSrcP.h.orig	Sun Nov 13 23:14:42 1994
-+++ RgbSrcP.h	Wed Jul 15 09:59:08 1998
-@@ -85,7 +85,7 @@
- #include "config.h"
- 
- /* include superclass private header file */
--#include <X11/Xaw/AsciiSrcP.h>
-+#include <X11/Xaw3d/AsciiSrcP.h>
- /* This is closely related to and uses parts of: */
- #include "RgbTextP.h"
- 
diff --git a/x11/xcolorsel/patches/patch-ag b/x11/xcolorsel/patches/patch-ag
deleted file mode 100644
index bfb027ace08..00000000000
--- a/x11/xcolorsel/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.2 1998/08/07 11:18:22 agc Exp $
-
---- RgbText.h.orig	Sun Nov 13 23:14:49 1994
-+++ RgbText.h	Wed Jul 15 09:59:51 1998
-@@ -133,7 +133,7 @@
- #ifndef _RgbText_h
- #define _RgbText_h
- 
--#include <X11/Xaw/AsciiText.h>
-+#include <X11/Xaw3d/AsciiText.h>
- 
- #define XtNmaxRows	"maxRows"
- #define XtNrows		"rows"
diff --git a/x11/xcolorsel/patches/patch-ah b/x11/xcolorsel/patches/patch-ah
deleted file mode 100644
index 29844cf2ba5..00000000000
--- a/x11/xcolorsel/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.2 1998/08/07 11:18:22 agc Exp $
-
---- RgbTextP.h.orig	Wed Nov 16 21:27:10 1994
-+++ RgbTextP.h	Wed Jul 15 10:00:34 1998
-@@ -78,7 +78,7 @@
- #include "RgbText.h"
- #include "config.h"
- 
--#include <X11/Xaw/TextP.h>
-+#include <X11/Xaw3d/TextP.h>
- #include <X11/Xcms.h>
- 
- typedef struct _colordef { unsigned short red, green, blue; /*Theoretic RGB*/
diff --git a/x11/xcolorsel/patches/patch-ai b/x11/xcolorsel/patches/patch-ai
deleted file mode 100644
index b7ee8543e9c..00000000000
--- a/x11/xcolorsel/patches/patch-ai
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-ai,v 1.3 2007/07/31 09:57:04 joerg Exp $
-
---- xcolorsel.c.orig	1994-11-13 22:16:59.000000000 +0000
-+++ xcolorsel.c
-@@ -53,23 +53,22 @@
- #include <unistd.h>
- #include <string.h>
- #include <errno.h>
--#include <malloc.h>
- #include <fcntl.h>
- 
- #include <X11/Xlib.h>
- #include <X11/Intrinsic.h>
- #include <X11/Shell.h>
- #include <X11/StringDefs.h>
--#include <X11/Xaw/Box.h>
--#include <X11/Xaw/Paned.h>
--#include <X11/Xaw/Form.h>
--#include <X11/Xaw/Label.h>
--#include <X11/Xaw/Command.h>
--#include <X11/Xaw/MenuButton.h>
--#include <X11/Xaw/Toggle.h>
--#include <X11/Xaw/SimpleMenu.h>
--#include <X11/Xaw/SmeBSB.h>
--#include <X11/Xaw/AsciiText.h>
-+#include <X11/Xaw3d/Box.h>
-+#include <X11/Xaw3d/Paned.h>
-+#include <X11/Xaw3d/Form.h>
-+#include <X11/Xaw3d/Label.h>
-+#include <X11/Xaw3d/Command.h>
-+#include <X11/Xaw3d/MenuButton.h>
-+#include <X11/Xaw3d/Toggle.h>
-+#include <X11/Xaw3d/SimpleMenu.h>
-+#include <X11/Xaw3d/SmeBSB.h>
-+#include <X11/Xaw3d/AsciiText.h>
- 
- #include "config.h"
- #include "RgbText.h"
diff --git a/x11/xcolorsel/patches/patch-xcolorsel.c b/x11/xcolorsel/patches/patch-xcolorsel.c
new file mode 100644
index 00000000000..9ec1691ce8a
--- /dev/null
+++ b/x11/xcolorsel/patches/patch-xcolorsel.c
@@ -0,0 +1,12 @@
+$NetBSD: patch-xcolorsel.c,v 1.1 2013/01/15 16:21:36 morr Exp $
+
+--- xcolorsel.c.orig	1994-11-13 22:16:59.000000000 +0000
++++ xcolorsel.c
+@@ -53,7 +53,6 @@
+ #include <unistd.h>
+ #include <string.h>
+ #include <errno.h>
+-#include <malloc.h>
+ #include <fcntl.h>
+ 
+ #include <X11/Xlib.h>