CVS commit: pkgsrc/x11/xcolorsel

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Fri May  1 23:30:25 UTC 2020

Modified Files:
        pkgsrc/x11/xcolorsel: Makefile distinfo
        pkgsrc/x11/xcolorsel/patches: patch-RgbText.c

Log Message:
x11/xcolorsel: fix hard-coded path to X11BASE


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/x11/xcolorsel/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/xcolorsel/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/xcolorsel/patches/patch-RgbText.c

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

Modified files:

Index: pkgsrc/x11/xcolorsel/Makefile
diff -u pkgsrc/x11/xcolorsel/Makefile:1.26 pkgsrc/x11/xcolorsel/Makefile:1.27
--- pkgsrc/x11/xcolorsel/Makefile:1.26  Thu May 23 19:23:23 2019
+++ pkgsrc/x11/xcolorsel/Makefile       Fri May  1 23:30:25 2020
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2019/05/23 19:23:23 rillig Exp $
+# $NetBSD: Makefile,v 1.27 2020/05/01 23:30:25 rillig Exp $
 
 DISTNAME=      xcolorsel-1.1a-src
 PKGNAME=       xcolorsel-1.1a
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_XCONTRIB:=utilities/}
 

Index: pkgsrc/x11/xcolorsel/distinfo
diff -u pkgsrc/x11/xcolorsel/distinfo:1.8 pkgsrc/x11/xcolorsel/distinfo:1.9
--- pkgsrc/x11/xcolorsel/distinfo:1.8   Wed Nov  4 03:28:58 2015
+++ pkgsrc/x11/xcolorsel/distinfo       Fri May  1 23:30:25 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2015/11/04 03:28:58 agc Exp $
+$NetBSD: distinfo,v 1.9 2020/05/01 23:30:25 rillig Exp $
 
 SHA1 (xcolorsel-1.1a-src.tar.gz) = 398df69d3c5ac99ee21b1e19100b98f385a1666c
 RMD160 (xcolorsel-1.1a-src.tar.gz) = 5ae81689bcdc23828778eb5d46f08b7c30b1566c
@@ -7,5 +7,5 @@ Size (xcolorsel-1.1a-src.tar.gz) = 67359
 SHA1 (patch-Imakefile) = 39e087e56f752930a96bd8ae4e9a39bf4a0b0806
 SHA1 (patch-RgbSink.c) = d39b2498c8015c7451dbc46727b14dc1293b7944
 SHA1 (patch-RgbSrc.c) = c3de7ce86a9eeecd716d0ca95574376a58b22c68
-SHA1 (patch-RgbText.c) = 060873da624cd93069ffcfaca08193b054116557
+SHA1 (patch-RgbText.c) = ea09371fd88c4a1068f069926097743fd25cfbdc
 SHA1 (patch-xcolorsel.c) = a6667fff4372d242cc13c44d2a2fdf53ad5b065d

Index: pkgsrc/x11/xcolorsel/patches/patch-RgbText.c
diff -u pkgsrc/x11/xcolorsel/patches/patch-RgbText.c:1.2 pkgsrc/x11/xcolorsel/patches/patch-RgbText.c:1.3
--- pkgsrc/x11/xcolorsel/patches/patch-RgbText.c:1.2    Wed Oct 14 20:17:28 2015
+++ pkgsrc/x11/xcolorsel/patches/patch-RgbText.c        Fri May  1 23:30:25 2020
@@ -1,4 +1,4 @@
-$NetBSD: patch-RgbText.c,v 1.2 2015/10/14 20:17:28 wiz Exp $
+$NetBSD: patch-RgbText.c,v 1.3 2020/05/01 23:30:25 rillig Exp $
 
 --- RgbText.c.orig     1994-12-13 22:13:27.000000000 +0000
 +++ RgbText.c
@@ -15,7 +15,7 @@ $NetBSD: patch-RgbText.c,v 1.2 2015/10/1
                XtRString, (XtPointer) "30" },
  { XtNfile, XtCFile, XtRString, sizeof(String), offset(file),
 -              XtRString, (XtPointer) "/usr/lib/X11/rgb.txt" },
-+              XtRString, (XtPointer) "/usr/pkg/X11/rgb.txt" },
++              XtRString, (XtPointer) "@X11BASE@/X11/rgb.txt" },
  { XtNtileWidth, XtCTileWidth, XtRDimension, sizeof(Dimension), offset(tile_width),
                XtRString, (XtPointer) "3" },
  { XtNmaxRed, XtCMaxRed, XtRShort, sizeof(unsigned short), offset(max_red),