Move per-package default XAW_TYPE setting above the inclusion of

bsd.prefs.mk so that it is actually used.  Where possible, include
xaw.buildlink.mk instead of setting USE_XAW, and use LIBXAW where needed.

5 files changed, 23 insertions, 17 deletions

diff --git a/x11/kterm/Makefile b/x11/kterm/Makefile
index 6a65e0fbe69..96d26e24c6b 100644
--- a/x11/kterm/Makefile
+++ b/x11/kterm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/07/13 05:47:26 enami Exp $
+# $NetBSD: Makefile,v 1.15 2001/08/23 04:26:55 jlam Exp $
 
 DISTNAME=	kterm-6.2.0
 CATEGORIES=	x11
@@ -13,30 +13,30 @@ MAINTAINER=	sakamoto@netbsd.org
 COMMENT=	Multi-lingual terminal emulator for X
 
 USE_IMAKE=	YES
-USE_XAW=	YES
 
 BUILD_DEFS+=	KTERM_USE_WALLPAPER
 
 .include "../../mk/bsd.prefs.mk"
 
-XAW_TYPE?=	standard
-
-.if defined(KTERM_USE_WALLPAPER) && ${KTERM_USE_WALLPAPER} == imlib
+.if defined(KTERM_USE_WALLPAPER)
+.if ${KTERM_USE_WALLPAPER} == "imlib"
 PATCH_SITES+=	http://delegate.uec.ac.jp:8081/club/mma/%7Etakkun/fun/handling/
 PATCHFILES+=	KTerm-BGP-Imlib-1.0.patch.gz
 BUILDLINK_DEPENDS.imlib?=	imlib>=1.9.4
-USE_BUILDLINK_ONLY=		YES
+USE_CONFIG_WRAPPER=		YES
 .include "../../graphics/imlib/buildlink.mk"
-.elif defined(KTERM_USE_WALLPAPER) && ${KTERM_USE_WALLPAPER} == YES
-USE_XPM=	YES
+.elif ${KTERM_USE_WALLPAPER} == "YES"
 PATCH_SITES+=	http://delegate.uec.ac.jp:8081/club/mma/%7Etakkun/fun/handling/
 PATCHFILES+=	KTerm-BGP-1.0.patch.gz
+.include "../../graphics/xpm/buildlink.mk"
+.endif
 .endif
 
+.if defined(XAW_TYPE) && (${XAW_TYPE} == "3d" || ${XAW_TYPE} == "xpm")
 post-patch:
-.if ${XAW_TYPE} != "standard"
 	@${ECHO_MSG}  "===>  Applying Xaw scrollbar patch"
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-xaw3d
 .endif
 
+.include "../../mk/xaw.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kterm/files/patch-xaw3d b/x11/kterm/files/patch-xaw3d
index 3e1ea1f55be..df98138591e 100644
--- a/x11/kterm/files/patch-xaw3d
+++ b/x11/kterm/files/patch-xaw3d
@@ -1,4 +1,4 @@
-$NetBSD: patch-xaw3d,v 1.1.1.1 1999/06/09 11:34:01 sakamoto Exp $
+$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
@@ -17,7 +17,7 @@ $NetBSD: patch-xaw3d,v 1.1.1.1 1999/06/09 11:34:01 sakamoto Exp $
          TEKOBJS = TekPrsTbl.o Tekproc.o
  #endif
 +#ifdef KTERM_XAW3D
-+        XAWLIB = -lXaw3d
++        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 \
diff --git a/x11/xcolorsel/Makefile b/x11/xcolorsel/Makefile
index 6a81adc5223..d7f2c844f30 100644
--- a/x11/xcolorsel/Makefile
+++ b/x11/xcolorsel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/07/24 09:43:37 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/08/23 04:26:55 jlam Exp $
 #
 
 DISTNAME=	xcolorsel-1.1a-src
@@ -11,7 +11,13 @@ COMMENT=	Browse and select named X colors from rgb.txt
 
 WRKSRC=		${WRKDIR}/xcolorsel
 USE_IMAKE=	yes
-USE_XAW=	yes
+
+.include "../../mk/bsd.prefs.mk"
+
+# We need at least Xaw3d to compile this package.
+.if (${XAW_TYPE} == standard)
 XAW_TYPE=	3d
+.endif
 
+.include "../../mk/xaw.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xcolorsel/distinfo b/x11/xcolorsel/distinfo
index 780f4adea96..2a88012fd72 100644
--- a/x11/xcolorsel/distinfo
+++ b/x11/xcolorsel/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:07:51 skrll Exp $
+$NetBSD: distinfo,v 1.3 2001/08/23 04:26:55 jlam Exp $
 
 SHA1 (xcolorsel-1.1a-src.tar.gz) = 398df69d3c5ac99ee21b1e19100b98f385a1666c
 Size (xcolorsel-1.1a-src.tar.gz) = 67359 bytes
-SHA1 (patch-aa) = 1dbdc4ab8a347ff904016a8fc1401063652b221a
+SHA1 (patch-aa) = 6a0e20fd50b058e9302fe0c938ff5c7951e34566
 SHA1 (patch-ab) = f6dcb6895bb4013d2a433d164516dd41fc4cd47d
 SHA1 (patch-ac) = 8bbdcba8de4d69450459512b1527c729a24760a1
 SHA1 (patch-ad) = 79eeb35b8103b42be889ac8cf8979a1fdbfbb252
diff --git a/x11/xcolorsel/patches/patch-aa b/x11/xcolorsel/patches/patch-aa
index a4b42b0f204..84a00dd1160 100644
--- a/x11/xcolorsel/patches/patch-aa
+++ b/x11/xcolorsel/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 1998/08/07 11:18:21 agc Exp $
+$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
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.3 1998/08/07 11:18:21 agc Exp $
  install:: Xcolorsel.help
  
 -NormalProgramTarget(xcolorsel,$(OBJS),,XawClientLibs,)
-+NormalProgramTarget(xcolorsel,$(OBJS),,-lXaw3d $(XMULIB) $(XTOOLLIB) $(XLIB),)
++NormalProgramTarget(xcolorsel,$(OBJS),,${LIBXAW} $(XMULIB) $(XTOOLLIB) $(XLIB),)
  
  InstallProgram(xcolorsel,$(BINDIR))
  InstallManPage(xcolorsel,$(MANDIR))