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/xcolors/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/pkgsrc/x11/xcolors/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- pkgsrc/x11/xcolors/Makefile	2006/12/27 13:37:43	1.16
+++ pkgsrc/x11/xcolors/Makefile	2008/01/17 07:04:09	1.17
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2006/12/27 13:37:43 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2008/01/17 07:04:09 tnn Exp $
 
 DISTNAME=	xcolors
 PKGNAME=	xcolors-1.3
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.tut.ac.jp/X11/X11R6/contrib/programs/
 
@@ -12,6 +12,15 @@ COMMENT=	Display all (ok, most of) the c
 WRKSRC=		${WRKDIR}/xcolors
 USE_IMAKE=	yes
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${X11_TYPE} == "modular"
+DEPENDS+=	rgb>=1.0.1:../../x11/rgb
+CPPFLAGS+=	-DRGB_TXT=\"${PREFIX}/share/X11/rgb.txt\"
+.else
+CPPFLAGS+=	-DRGB_TXT=\"${X11BASE}/lib/X11/rgb.txt\"
+.endif
+
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXp/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"