From a17239c066dcfcad39db4003a2b8d421fa1bc881 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Thu, 23 Aug 2001 04:26:51 +0000
Subject: 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.

---
 x11/xcolorsel/Makefile         | 10 ++++++++--
 x11/xcolorsel/distinfo         |  4 ++--
 x11/xcolorsel/patches/patch-aa |  4 ++--
 3 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'x11/xcolorsel')

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))
-- 
cgit v1.2.3