pkg/43934: [PATCH] (netpbm) default path for rgb.txt

[makoto%ki.nu@localhost]

>Number:         43934
>Category:       pkg
>Synopsis:       [PATCH] (netpbm) default path for rgb.txt
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sun Oct 03 12:05:00 +0000 2010
>Originator:     Makoto Fujiwara
>Release:        NetBSD 5.0_STABLE
>Organization:
KINU Corporation
>Environment:
        
        
System: NetBSD modena 5.0_STABLE NetBSD 5.0_STABLE (XEN3_DOM0) #0: Wed Apr 7 
02:17:52 UTC 2010 
builds%b8.netbsd.org@localhost:/home/builds/ab/netbsd-5/amd64/201004070000Z-obj/home/builds/ab/netbsd-5/src/sys/arch/amd64/compile/XEN3_DOM0
 amd64
Architecture: x86_64
Machine: amd64
>Description:
        Output jpeg file from tgif editing needs user intervention
        to set 'rgb.txt' path. The default should be adjusted for
        pkgsrc environment.

>How-To-Repeat:
        (1) Have graphics/tgif installed.
        (2) Edit (or create) some drawing.
        (3) Select JPEG as print output
        (4) Hit Ctrl-P (to ask for print).
        You will get following message

xpmtoppm: can't open color names dictionary file named /usr/lib/X11/rgb.txt, 
/usr/share/X11/rgb.txt, or /usr/X11R6/lib/X11/rgb.txt and Environmet variable 
RGBDEF not set.  Set RGBDEF to the pathname of your rgb.txt file or don't use 
color names.
Empty input file

      There may be work around to set Environment before starting tgif.
      But it is not user friendly (or time consuming to find the work around).
>Fix:

Index: graphics/netpbm/Makefile
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/graphics/netpbm/Makefile,v
retrieving revision 1.165
diff -u -r1.165 Makefile
--- graphics/netpbm/Makefile    19 Feb 2010 18:25:44 -0000      1.165
+++ graphics/netpbm/Makefile    3 Oct 2010 11:37:29 -0000
@@ -93,4 +93,10 @@
        ${FIND} ${DESTDIR}${PREFIX}/share/doc/netpbm -type f -print |   \
                ${XARGS} ${CHMOD} ${NONBINMODE}
 
+SUBST_CLASSES+=                   rgb_txt
+SUBST_STAGE.rgb_txt=       post-patch
+SUBST_MESSAGE.rgb_txt=     Configure RGB_TXT
+SUBST_FILES.rgb_txt=       pm_config.in.h
+SUBST_SED.rgb_txt+=        -e 's|@@PREFIX@@|${PREFIX}|'
+
 .include "../../mk/bsd.pkg.mk"
Index: graphics/netpbm/distinfo
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/graphics/netpbm/distinfo,v
retrieving revision 1.74
diff -u -r1.74 distinfo
--- graphics/netpbm/distinfo    28 Mar 2010 12:36:35 -0000      1.74
+++ graphics/netpbm/distinfo    3 Oct 2010 11:52:41 -0000
@@ -19,4 +19,5 @@
 SHA1 (patch-dd) = 2acbcffeef96fd8b0419e60fa44a1eaf9f4b291b
 SHA1 (patch-eb) = 5c3dfac08038fce372fabc7c526081bb8051e908
 SHA1 (patch-ec) = 47290b162eac9be6744d8406c7ccc6efebaee1fc
+SHA1 (patch-ed) = 22951e2175f280809d824c08bc7d4e01955c2e5e
 SHA1 (patch-ppmdraw) = d901a690f8f21a1af940129d1edef509b369ea1a
Index: graphics/netpbm/patches/patch-ed
===================================================================
RCS file: graphics/netpbm/patches/patch-ed
diff -N graphics/netpbm/patches/patch-ed
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ graphics/netpbm/patches/patch-ed    3 Oct 2010 11:51:49 -0000
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- pm_config.in.h-orig        2010-10-03 20:28:03.000000000 +0900
++++ pm_config.in.h     2010-10-03 20:29:26.000000000 +0900
+@@ -68,7 +68,7 @@
+ #define RGB_DB3 "PBMplus_Dir:RGB.TXT"
+ #else
+ #define RGB_DB1 "/usr/lib/X11/rgb.txt"
+-#define RGB_DB2 "/usr/share/X11/rgb.txt"
++#define RGB_DB2 "@@PREFIX@@/share/netpbm/rgb.txt"
+ #define RGB_DB3 "/usr/X11R6/lib/X11/rgb.txt"
+ #endif
+ 

>Unformatted:
 xpmtoppm: can't open color names dictionary file