Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/pkgsrc/x11/xcolorsel/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/pkgsrc/x11/xcolorsel/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.2
retrieving revision 1.13
diff -u -p -r1.2 -r1.13
--- pkgsrc/x11/xcolorsel/Makefile	1998/07/15 08:13:41	1.2
+++ pkgsrc/x11/xcolorsel/Makefile	2003/08/31 16:40:51	1.13
@@ -1,17 +1,26 @@
-# $NetBSD: Makefile,v 1.2 1998/07/15 08:13:41 tron Exp $
+# $NetBSD: Makefile,v 1.13 2003/08/31 16:40:51 kei Exp $
 #
 
 DISTNAME=	xcolorsel-1.1a-src
 PKGNAME=	xcolorsel-1.1a
+PKGREVISION=	1
+WRKSRC=		${WRKDIR}/xcolorsel
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR=	utilities
-
-MAINTAINER=	perry@netbsd.org
+MASTER_SITES=	${MASTER_SITE_XCONTRIB:=utilities/}
 
-DEPENDS+=	Xaw3d-1.5:../../x11/Xaw3d
+MAINTAINER=	perry@NetBSD.org
+COMMENT=	Browse and select named X colors from rgb.txt
 
-WRKSRC=		${WRKDIR}/xcolorsel
+USE_BUILDLINK2=	yes
 USE_IMAKE=	yes
+XAW_TYPE?=	3d
+
+.include "../../mk/bsd.prefs.mk"
+
+# We need at least Xaw3d to compile this package.
+.if (${XAW_TYPE} == standard || ${XAW_TYPE} == neXtaw)
+XAW_TYPE=	3d
+.endif
 
+.include "../../mk/xaw.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"