summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2001-12-19 10:16:37 +0000
committertron <tron@pkgsrc.org>2001-12-19 10:16:37 +0000
commit69ed7c9527cbdb050527508cd0390122ab429311 (patch)
tree003f14d1f372c3e06881e28c8df24f44419fadd8 /x11
parentb3349bdd77f647f4a363606b160805a785ef2e0d (diff)
downloadpkgsrc-69ed7c9527cbdb050527508cd0390122ab429311.tar.gz
Search "rgb.txt" in the correct directory on systems where the "xpkwedge"
package is installed. Patch supplied by Robert Elz in PR pkg/14869.
Diffstat (limited to 'x11')
-rw-r--r--x11/xcolors/distinfo4
-rw-r--r--x11/xcolors/patches/patch-aa9
2 files changed, 7 insertions, 6 deletions
diff --git a/x11/xcolors/distinfo b/x11/xcolors/distinfo
index 6c4e8631eb7..72c6c8d0afc 100644
--- a/x11/xcolors/distinfo
+++ b/x11/xcolors/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2001/05/21 22:00:05 wiz Exp $
+$NetBSD: distinfo,v 1.4 2001/12/19 10:16:37 tron Exp $
SHA1 (xcolors.tar.gz) = 5be585937c0a5076175635bd68366a0d2438c798
Size (xcolors.tar.gz) = 6309 bytes
-SHA1 (patch-aa) = 3dd0444d505850b22373ca2ceaf209383f1fc7b7
+SHA1 (patch-aa) = ef21290248d2747e50ecb065a55b7a82d2959d48
diff --git a/x11/xcolors/patches/patch-aa b/x11/xcolors/patches/patch-aa
index 8d48fdb38f0..9968b4bac83 100644
--- a/x11/xcolors/patches/patch-aa
+++ b/x11/xcolors/patches/patch-aa
@@ -1,17 +1,18 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 11:18:21 agc Exp $
+$NetBSD
---- ./Imakefile.org Mon Jun 6 17:28:45 1994
-+++ ./Imakefile Sun Dec 22 16:28:05 1996
+--- Imakefile.orig Fri Dec 7 21:14:34 2001
++++ Imakefile Fri Dec 7 21:16:36 2001
@@ -8,12 +8,7 @@
OBJS = xcolors.o
SYS_LIBRARIES = -lm
-#if BuildServer
- DEFINES = -DRGB_TXT=\"$(RGBDBFILE).txt\"
+- DEFINES = -DRGB_TXT=\"$(RGBDBFILE).txt\"
-#else
- /* 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)