From owner-freebsd-ports  Mon May 31  3:30: 6 1999
Delivered-To: freebsd-ports@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP id B459215227
	for <freebsd-ports@FreeBSD.org>; Mon, 31 May 1999 03:30:01 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id DAA61900;
	Mon, 31 May 1999 03:30:01 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: from nsx.kgc.co.jp (nsx.kgc.co.jp [210.226.77.146])
	by hub.freebsd.org (Postfix) with SMTP id D11B9150F4
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 31 May 1999 03:21:39 -0700 (PDT)
	(envelope-from candy@kgc.co.jp)
Received: (qmail 14881 invoked from network); 31 May 1999 19:21:38 +0900
Received: from unknown (HELO ssm.kgc.co.jp) (qmailr@210.226.77.148)
  by 210.226.77.146 with SMTP; 31 May 1999 19:21:38 +0900
Received: (qmail 19305 invoked from network); 31 May 1999 19:19:08 +0900
Received: from xxx.kgc.co.jp (172.31.2.3)
  by ssm.kgc.co.jp with SMTP; 31 May 1999 19:19:08 +0900
Received: by xxx.kgc.co.jp (8.9.3/3.3W8:95062916) id TAA42511; Mon, 31 May 1999 19:19:08 +0900 (JST)
Message-Id: <199905311019.TAA42511@xxx.kgc.co.jp>
Date: Mon, 31 May 1999 19:19:08 +0900 (JST)
From: candy@kgc.co.jp
Reply-To: candy@kgc.co.jp
To: FreeBSD-gnats-submit@freebsd.org
X-Send-Pr-Version: 3.2
Subject: ports/11956: fix: netpbm can't handle comments int rgb.txt
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         11956
>Category:       ports
>Synopsis:       fix: netpbm can't handle comments int rgb.txt
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 31 03:30:00 PDT 1999
>Closed-Date:
>Last-Modified:
>Originator:     candy
>Release:        FreeBSD 3.2-RELEASE i386
>Organization:
>Environment:

	ports/current

>Description:

	netpbm programs which link ppm/libppm4.c can't handle
	comment line (begins with `!') in /usr/X11R6/lib/X11/rgb.txt

>How-To-Repeat:

	$ ppmtogif -transparent white
	ppmtogif: can't parse color names database line - "! $XConsortium: rgb.txt,v 10.41 94/02/20 18:39:36 rws Exp $

>Fix:

cd /usr/ports/graphics/netpbm
make patch
cd work/netpbm
patch -p < this_patch

--- ppm/libppm4.c.orig	Mon Oct  4 18:12:13 1993
+++ ppm/libppm4.c	Thu Nov  5 16:17:48 1998
@@ -217,6 +217,7 @@
 #endif /* A_RGBENV */
         canonstr( colorname );
         while ( fgets( buf1, sizeof(buf1), f ) != NULL )
+        if (buf1[0] != '!')
             {
             if ( sscanf( buf1, "%ld %ld %ld %[^\n]", &r, &g, &b, buf2 ) != 4 )
                 {
@@ -298,6 +299,7 @@
 #endif /* A_RGBENV */
     best_diff = 32767;
     while ( fgets( buf, sizeof(buf), f ) != NULL )
+        if (buf[0] != '!')
         {
         if ( sscanf( buf, "%d %d %d %[^\n]", &this_r, &this_g, &this_b,
                      this_colorname ) != 4 )

>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message