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

18 files changed, 52 insertions, 198 deletions

diff --git a/x11/Xaw-Xpm/buildlink3.mk b/x11/Xaw-Xpm/buildlink3.mk
index 3e58ba2863f..d29c7c74341 100644
--- a/x11/Xaw-Xpm/buildlink3.mk
+++ b/x11/Xaw-Xpm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2012/06/15 23:06:02 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2013/01/15 16:21:35 morr Exp $
 
 BUILDLINK_TREE+=	Xaw-Xpm
 
@@ -9,6 +9,8 @@ BUILDLINK_API_DEPENDS.Xaw-Xpm+=	Xaw-Xpm>=1.1
 BUILDLINK_ABI_DEPENDS.Xaw-Xpm+=	Xaw-Xpm>=1.1nb2
 BUILDLINK_PKGSRCDIR.Xaw-Xpm?=	../../x11/Xaw-Xpm
 
+BUILDLINK_TRANSFORM+=           l:Xaw:Xaw3d
+
 .include "../../mk/bsd.fast.prefs.mk"
 
 .if ${X11_TYPE} == "modular"
@@ -20,12 +22,6 @@ buildlink-Xaw-Xpm-inc-hack: .PHONY buildlink-directories
 		${LN} -s Xaw3d ${BUILDLINK_DIR}/include/X11/Xaw
 .endif
 
-LIBXAW?=	-L${BUILDLINK_PREFIX.Xaw-Xpm}/lib			\
-		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.Xaw-Xpm}/lib	\
-		-L${BUILDLINK_PREFIX.libXpm}/lib			\
-		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libXpm}/lib	\
-		-lXaw3d -lXpm
-
 .include "../../x11/libXmu/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .endif # XAW_XPM_BUILDLINK3_MK
diff --git a/x11/Xaw3d/buildlink3.mk b/x11/Xaw3d/buildlink3.mk
index c6428fb18c7..e89455f8ae1 100644
--- a/x11/Xaw3d/buildlink3.mk
+++ b/x11/Xaw3d/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2012/05/07 01:54:06 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2013/01/15 16:21:35 morr Exp $
 
 BUILDLINK_TREE+=	Xaw3d
 
@@ -25,9 +25,6 @@ buildlink-Xaw3d-inc-hack: buildlink-directories
 
 .include "../../x11/libXmu/buildlink3.mk"
 
-LIBXAW?=	-L${BUILDLINK_PREFIX.Xaw3d}/lib				\
-		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.Xaw3d}/lib	\
-		-lXaw3d
 .endif # XAW3D_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-Xaw3d
diff --git a/x11/kterm/Makefile b/x11/kterm/Makefile
index 28637e430b7..b6610452e96 100644
--- a/x11/kterm/Makefile
+++ b/x11/kterm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2012/10/29 05:06:32 asau Exp $
+# $NetBSD: Makefile,v 1.59 2013/01/15 16:21:35 morr Exp $
 
 DISTNAME=	kterm-6.2.0
 PKGREVISION=	23
@@ -23,11 +23,6 @@ SPECIAL_PERMS=	${PREFIX:Q}/bin/kterm ${SETUID_ROOT_PERMS}
 
 .include "../../mk/bsd.prefs.mk"
 
-.if defined(XAW_TYPE) && (${XAW_TYPE} == "3d" || ${XAW_TYPE} == "xpm" || ${XAW_TYPE} == "neXtaw")
-post-patch:
-	@${ECHO_MSG}  "===>  Applying Xaw scrollbar patch"
-	@${PATCH} ${PATCH_ARGS} < ${FILESDIR:Q}/patch-xaw3d
-.endif
-
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/xaw.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kterm/files/patch-xaw3d b/x11/kterm/files/patch-xaw3d
deleted file mode 100644
index df98138591e..00000000000
--- a/x11/kterm/files/patch-xaw3d
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-xaw3d,v 1.2 2001/08/23 04:26:55 jlam Exp $
-
---- kterm.h.orig	Fri Jul 12 14:01:37 1996
-+++ kterm.h	Wed Jun  9 10:07:50 1999
-@@ -36,6 +36,6 @@
- #define KTERM_KINPUT2	/* Kinput2 protocol */
- #define KTERM_COLOR	/* color sequence */
- #define KTERM_NOTEK	/* disables Tektronix emulation */
--#undef  KTERM_XAW3D	/* Xaw3d -DARROW_SCROLLBAR support */
-+#define KTERM_XAW3D	/* Xaw3d -DARROW_SCROLLBAR support */
- 
- #endif /* !_KTERM_H_ */
---- Imakefile.orig	Fri Jul 12 14:01:04 1996
-+++ Imakefile	Wed Jun  9 10:24:30 1999
-@@ -46,6 +46,9 @@
-         TEKSRCS = TekPrsTbl.c Tekproc.c
-         TEKOBJS = TekPrsTbl.o Tekproc.o
- #endif
-+#ifdef KTERM_XAW3D
-+        XAWLIB = ${LIBXAW}
-+#endif
-           SRCS1 = button.c charproc.c cursor.c data.c input.c \
- 		  main.c menu.c misc.c screen.c scrollbar.c tabs.c \
- 		  util.c VTPrsTbl.c \
diff --git a/x11/neXtaw/buildlink3.mk b/x11/neXtaw/buildlink3.mk
index 3b7563b5af1..dacebc49388 100644
--- a/x11/neXtaw/buildlink3.mk
+++ b/x11/neXtaw/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2012/06/15 23:06:03 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2013/01/15 16:21:36 morr Exp $
 
 BUILDLINK_TREE+=	neXtaw
 
@@ -9,6 +9,8 @@ BUILDLINK_API_DEPENDS.neXtaw+=	neXtaw>=0.15.1
 BUILDLINK_ABI_DEPENDS.neXtaw+=	neXtaw>=0.15.1nb2
 BUILDLINK_PKGSRCDIR.neXtaw?=	../../x11/neXtaw
 
+BUILDLINK_TRANSFORM+=           l:Xaw:neXtaw
+
 .include "../../mk/bsd.fast.prefs.mk"
 
 .if ${X11_TYPE} == "modular"
@@ -21,10 +23,6 @@ buildlink-neXtaw-inc-hack: buildlink-directories
 		${LN} -s neXtaw ${BUILDLINK_DIR}/include/X11/Xaw
 .endif
 
-LIBXAW?=	-L${BUILDLINK_PREFIX.neXtaw}/lib			\
-		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.neXtaw}/lib	\
-		-lneXtaw
-
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
diff --git a/x11/xcolorsel/Makefile b/x11/xcolorsel/Makefile
index 7931e316dfc..99145f4fe6d 100644
--- a/x11/xcolorsel/Makefile
+++ b/x11/xcolorsel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2012/10/29 05:07:00 asau Exp $
+# $NetBSD: Makefile,v 1.23 2013/01/15 16:21:36 morr Exp $
 #
 
 DISTNAME=	xcolorsel-1.1a-src
@@ -11,8 +11,16 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Browse and select named X colors from rgb.txt
 
 WRKSRC=		${WRKDIR}/xcolorsel
-MAKE_ENV+=	LIBXAW=${LIBXAW:Q}
 USE_IMAKE=	yes
 
-.include "../../x11/Xaw3d/buildlink3.mk"
+SUBST_CLASSES+=         xcolorsel
+SUBST_STAGE.xcolorsel=        pre-configure
+SUBST_MESSAGE.xcolorsel=      Fixing hard-coded paths.
+SUBST_FILES.xcolorsel=        RgbText.c
+SUBST_SED.xcolorsel+=         -e "s,@X11BASE@,${X11BASE},g"
+
+#this requires Xaw3d
+XAW_TYPE=	3d
+
+.include "../../mk/xaw.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xcolorsel/distinfo b/x11/xcolorsel/distinfo
index 253bc33e0d9..d84cc95d323 100644
--- a/x11/xcolorsel/distinfo
+++ b/x11/xcolorsel/distinfo
@@ -1,14 +1,8 @@
-$NetBSD: distinfo,v 1.5 2007/07/31 09:57:04 joerg Exp $
+$NetBSD: distinfo,v 1.6 2013/01/15 16:21:36 morr Exp $
 
 SHA1 (xcolorsel-1.1a-src.tar.gz) = 398df69d3c5ac99ee21b1e19100b98f385a1666c
 RMD160 (xcolorsel-1.1a-src.tar.gz) = 5ae81689bcdc23828778eb5d46f08b7c30b1566c
 Size (xcolorsel-1.1a-src.tar.gz) = 67359 bytes
-SHA1 (patch-aa) = 6a0e20fd50b058e9302fe0c938ff5c7951e34566
-SHA1 (patch-ab) = f5dd98f791ee88db88e8c28d1cbb09dcc595968d
-SHA1 (patch-ac) = 8bbdcba8de4d69450459512b1527c729a24760a1
-SHA1 (patch-ad) = 79eeb35b8103b42be889ac8cf8979a1fdbfbb252
-SHA1 (patch-ae) = c1503c6912f8f8c5e7bc59251f829d056022c745
-SHA1 (patch-af) = 3284e0fcf69c8a26bc0be74300ac5cd6bf9deb00
-SHA1 (patch-ag) = ff36d06ad032024e1488435f2c6ce6a768b2b7a0
-SHA1 (patch-ah) = 17ec04769fb7f95327a0bca4227e520d816f317f
-SHA1 (patch-ai) = 8ca07a15ba5ab62a4b4cb5d5b6f7c1aab82fe7ce
+SHA1 (patch-Imakefile) = 39e087e56f752930a96bd8ae4e9a39bf4a0b0806
+SHA1 (patch-RgbText.c) = ea09371fd88c4a1068f069926097743fd25cfbdc
+SHA1 (patch-xcolorsel.c) = a6667fff4372d242cc13c44d2a2fdf53ad5b065d
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>