diff options
| author | tnn <tnn> | 2008-01-17 07:04:09 +0000 |
|---|---|---|
| committer | tnn <tnn> | 2008-01-17 07:04:09 +0000 |
| commit | 3b072b4b525a5561538af4a693d27764bea3f492 (patch) | |
| tree | 406cf3c1edac4867d41d691abc5f8ce46beab44f | |
| parent | e5bcd061dff79551abe2071a3907ce9c2f5b6b85 (diff) | |
| download | pkgsrc-3b072b4b525a5561538af4a693d27764bea3f492.tar.gz | |
Fix PR pkg/37772 Chuck Cranor: xcolors needs rgb.txt (X11_TYPE=modular)
Bump rev.
| -rw-r--r-- | x11/xcolors/Makefile | 13 | ||||
| -rw-r--r-- | x11/xcolors/distinfo | 4 | ||||
| -rw-r--r-- | x11/xcolors/patches/patch-aa | 9 |
3 files changed, 17 insertions, 9 deletions
diff --git a/x11/xcolors/Makefile b/x11/xcolors/Makefile index 61d9daff31a..7ef24b088ae 100644 --- a/x11/xcolors/Makefile +++ b/x11/xcolors/Makefile @@ -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 colors in the universe 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" diff --git a/x11/xcolors/distinfo b/x11/xcolors/distinfo index 02c7ecc0925..49199cec7ae 100644 --- a/x11/xcolors/distinfo +++ b/x11/xcolors/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.5 2005/02/23 17:36:21 wiz Exp $ +$NetBSD: distinfo,v 1.6 2008/01/17 07:04:09 tnn Exp $ SHA1 (xcolors.tar.gz) = 5be585937c0a5076175635bd68366a0d2438c798 RMD160 (xcolors.tar.gz) = 9b57be44fda3af028120dad1905d4d0723d7ff71 Size (xcolors.tar.gz) = 6309 bytes -SHA1 (patch-aa) = ef21290248d2747e50ecb065a55b7a82d2959d48 +SHA1 (patch-aa) = 41f1edd7bf36ca6d883eb3091910b2f317a14f2e diff --git a/x11/xcolors/patches/patch-aa b/x11/xcolors/patches/patch-aa index 1f1506b7f9a..5057c5ddd12 100644 --- a/x11/xcolors/patches/patch-aa +++ b/x11/xcolors/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.4 2002/05/20 19:11:41 cjep Exp $ +$NetBSD: patch-aa,v 1.5 2008/01/17 07:04:09 tnn Exp $ ---- Imakefile.orig Fri Dec 7 21:14:34 2001 -+++ Imakefile Fri Dec 7 21:16:36 2001 -@@ -8,12 +8,7 @@ +--- Imakefile.orig 1994-06-07 02:28:45.000000000 +0200 ++++ Imakefile +@@ -8,12 +8,6 @@ LOCAL_LIBRARIES = XawClientLibs OBJS = xcolors.o SYS_LIBRARIES = -lm @@ -12,7 +12,6 @@ $NetBSD: patch-aa,v 1.4 2002/05/20 19:11:41 cjep Exp $ - /* rgb.txt will not be installed, so find it in build tree */ - DEFINES = -DRGB_TXT=\"$(RGBSRC)/rgb.txt\" -#endif -+ DEFINES = -DRGB_TXT=\"$(X11BASE)/lib/X11/rgb.txt\" ComplexProgramTarget(xcolors) InstallAppDefaults(Xcolors) |