Thu Jan 17 07:04:10 2008 UTC ()
Fix PR pkg/37772 Chuck Cranor: xcolors needs rgb.txt (X11_TYPE=modular)
Bump rev.


(tnn)
diff -r1.16 -r1.17 pkgsrc/x11/xcolors/Makefile
diff -r1.5 -r1.6 pkgsrc/x11/xcolors/distinfo
diff -r1.4 -r1.5 pkgsrc/x11/xcolors/patches/patch-aa
cvs diff -r1.16 -r1.17 pkgsrc/x11/xcolors/Makefile (expand / switch to unified diff)

--- 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,18 +1,27 @@ @@ -1,18 +1,27 @@
1# $NetBSD: Makefile,v 1.16 2006/12/27 13:37:43 joerg Exp $ 1# $NetBSD: Makefile,v 1.17 2008/01/17 07:04:09 tnn Exp $
2 2
3DISTNAME= xcolors 3DISTNAME= xcolors
4PKGNAME= xcolors-1.3 4PKGNAME= xcolors-1.3
5PKGREVISION= 2 5PKGREVISION= 3
6CATEGORIES= x11 6CATEGORIES= x11
7MASTER_SITES= ftp://ftp.tut.ac.jp/X11/X11R6/contrib/programs/ 7MASTER_SITES= ftp://ftp.tut.ac.jp/X11/X11R6/contrib/programs/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10COMMENT= Display all (ok, most of) the colors in the universe 10COMMENT= Display all (ok, most of) the colors in the universe
11 11
12WRKSRC= ${WRKDIR}/xcolors 12WRKSRC= ${WRKDIR}/xcolors
13USE_IMAKE= yes 13USE_IMAKE= yes
14 14
 15.include "../../mk/bsd.prefs.mk"
 16
 17.if ${X11_TYPE} == "modular"
 18DEPENDS+= rgb>=1.0.1:../../x11/rgb
 19CPPFLAGS+= -DRGB_TXT=\"${PREFIX}/share/X11/rgb.txt\"
 20.else
 21CPPFLAGS+= -DRGB_TXT=\"${X11BASE}/lib/X11/rgb.txt\"
 22.endif
 23
15.include "../../x11/libXaw/buildlink3.mk" 24.include "../../x11/libXaw/buildlink3.mk"
16.include "../../x11/libXp/buildlink3.mk" 25.include "../../x11/libXp/buildlink3.mk"
17.include "../../x11/libXt/buildlink3.mk" 26.include "../../x11/libXt/buildlink3.mk"
18.include "../../mk/bsd.pkg.mk" 27.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/x11/xcolors/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/xcolors/distinfo 2005/02/23 17:36:21 1.5
+++ pkgsrc/x11/xcolors/distinfo 2008/01/17 07:04:09 1.6
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.5 2005/02/23 17:36:21 wiz Exp $ 1$NetBSD: distinfo,v 1.6 2008/01/17 07:04:09 tnn Exp $
2 2
3SHA1 (xcolors.tar.gz) = 5be585937c0a5076175635bd68366a0d2438c798 3SHA1 (xcolors.tar.gz) = 5be585937c0a5076175635bd68366a0d2438c798
4RMD160 (xcolors.tar.gz) = 9b57be44fda3af028120dad1905d4d0723d7ff71 4RMD160 (xcolors.tar.gz) = 9b57be44fda3af028120dad1905d4d0723d7ff71
5Size (xcolors.tar.gz) = 6309 bytes 5Size (xcolors.tar.gz) = 6309 bytes
6SHA1 (patch-aa) = ef21290248d2747e50ecb065a55b7a82d2959d48 6SHA1 (patch-aa) = 41f1edd7bf36ca6d883eb3091910b2f317a14f2e
cvs diff -r1.4 -r1.5 pkgsrc/x11/xcolors/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/x11/xcolors/patches/patch-aa 2002/05/20 19:11:41 1.4
+++ pkgsrc/x11/xcolors/patches/patch-aa 2008/01/17 07:04:09 1.5
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1$NetBSD: patch-aa,v 1.4 2002/05/20 19:11:41 cjep Exp $ 1$NetBSD: patch-aa,v 1.5 2008/01/17 07:04:09 tnn Exp $
2 2
3--- Imakefile.orig Fri Dec 7 21:14:34 2001 3--- Imakefile.orig 1994-06-07 02:28:45.000000000 +0200
4+++ Imakefile Fri Dec 7 21:16:36 2001 4+++ Imakefile
5@@ -8,12 +8,7 @@ 5@@ -8,12 +8,6 @@ LOCAL_LIBRARIES = XawClientLibs
6 OBJS = xcolors.o 6 OBJS = xcolors.o
7 SYS_LIBRARIES = -lm 7 SYS_LIBRARIES = -lm
8  8
9-#if BuildServer 9-#if BuildServer
10- DEFINES = -DRGB_TXT=\"$(RGBDBFILE).txt\" 10- DEFINES = -DRGB_TXT=\"$(RGBDBFILE).txt\"
11-#else 11-#else
12- /* rgb.txt will not be installed, so find it in build tree */ 12- /* rgb.txt will not be installed, so find it in build tree */
13- DEFINES = -DRGB_TXT=\"$(RGBSRC)/rgb.txt\" 13- DEFINES = -DRGB_TXT=\"$(RGBSRC)/rgb.txt\"
14-#endif 14-#endif
15+ DEFINES = -DRGB_TXT=\"$(X11BASE)/lib/X11/rgb.txt\" 
16  15
17 ComplexProgramTarget(xcolors) 16 ComplexProgramTarget(xcolors)
18 InstallAppDefaults(Xcolors) 17 InstallAppDefaults(Xcolors)