From owner-freebsd-ports  Tue Jul 24 20: 0:19 2001
Delivered-To: freebsd-ports@hub.freebsd.org
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 86B5A37B403
	for <freebsd-ports@hub.freebsd.org>; Tue, 24 Jul 2001 20:00:05 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.11.4/8.11.4) id f6P305c45622;
	Tue, 24 Jul 2001 20:00:05 -0700 (PDT)
	(envelope-from gnats)
Received: from topaz.mdcc.cx (topaz.mdcc.cx [212.204.230.141])
	by hub.freebsd.org (Postfix) with ESMTP id DCFFA37B401
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 24 Jul 2001 19:55:29 -0700 (PDT)
	(envelope-from edwin@mavetju.org)
Received: from k7.mavetju.org (topaz.mdcc.cx [212.204.230.141])
	by topaz.mdcc.cx (Postfix) with ESMTP id 50FDA2B787
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 25 Jul 2001 04:55:26 +0200 (CEST)
Received: by k7.mavetju.org (Postfix, from userid 1001)
	id 0677060; Wed, 25 Jul 2001 12:55:17 +1000 (EST)
Message-Id: <20010725025517.0677060@k7.mavetju.org>
Date: Wed, 25 Jul 2001 12:55:17 +1000 (EST)
From: edwin@mavetju.org
Reply-To: edwin@mavetju.org
To: FreeBSD-gnats-submit@freebsd.org
X-Send-Pr-Version: 3.2
Subject: ports/29211: [fix] graphics/netpbm fails to patch
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-ports.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-ports>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-ports>
X-Loop: FreeBSD.org


>Number:         29211
>Category:       ports
>Synopsis:       [fix] graphics/netpbm fails to patch correctly
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jul 24 20:00:05 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     Edwin Groothuis
>Release:        FreeBSD 4.2-RELEASE i386
>Organization:
-
>Environment:

# $FreeBSD: ports/graphics/netpbm/Makefile,v 1.46 2001/07/24 14:07:58 roam Exp $

>Description:

When patching netpbm, it fails on patch-cj.

>How-To-Repeat:

cd /usr/ports/graphics/netpbm
make patch

>Fix:

patch patch-cj with:
--- ../patch-cj Wed Jul 25 12:40:11 2001
+++ patch-cj    Wed Jul 25 12:49:59 2001
@@ -1,13 +1,10 @@
---- ppm/hpcdtoppm/hpcdtoppm.h.orig     Mon Jun 13 17:04:45 1994
-+++ ppm/hpcdtoppm/hpcdtoppm.h  Fri Dec  8 00:00:00 2000
-@@ -11,10 +11,10 @@
- 
- #include <stdio.h>
- #include <string.h>
--#include <malloc.h>
+--- ppm/hpcdtoppm/hpcdtoppm.h.old      Wed Jul 25 12:43:49 2001
++++ ppm/hpcdtoppm/hpcdtoppm.h  Wed Jul 25 12:45:19 2001
+@@ -14,7 +14,7 @@
  #include <sys/types.h>
  #include <ctype.h>
  #include "config.h"
+-
 +#include "ppm.h"
  
  

or replace it with
--- ppm/hpcdtoppm/hpcdtoppm.h.origin       Wed Jul 25 12:43:49 2001
+++ ppm/hpcdtoppm/hpcdtoppm.h   Wed Jul 25 12:45:19 2001
@@ -14,7 +14,7 @@
 #include <sys/types.h>
 #include <ctype.h>
 #include "config.h"
-
+#include "ppm.h"
 
 
 
[/usr/ports/graphics/netpbm/files] root@k7>
>Release-Note:
>Audit-Trail:
>Unformatted:

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