pkg/46962: unreasonable failure of pkgdiff

[dholland%netbsd.org@localhost]

>Number:         46962
>Category:       pkg
>Synopsis:       unreasonable failure of pkgdiff
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun Sep 16 03:20:00 +0000 2012
>Originator:     David A. Holland
>Release:        NetBSD 6.99.7 (20120524) pkgsrc 20120915
>Organization:
>Environment:
System: NetBSD valkyrie 6.99.7 NetBSD 6.99.7 (VALKYRIE) #5: Thu May 24 23:36:41 
EDT 2012  root@valkyrie:/usr/src/sys/arch/amd64/compile/VALKYRIE amd64
Architecture: x86_64
Machine: amd64
>Description:

pkgdiff fails on the following two files:

valkyrie% pkgdiff test.c.orig test.c
Cannot strip away RCS IDs, please handle manually!
Exit 1

even though (or perhaps because) the diff does not include RCS IDs.

>How-To-Repeat:

   --- test.c.orig ---
static char id[] = "$Revision: 1.1 $";

#include <stdio.h>
#include <stdlib.h>
#include <string.h>

int a = 1;
int b = 2;
int c = 3;
   --- test.c ---
static char id[] = "$Revision: 1.1 $";

#include <stdio.h>
#include <stdlib.h>
#include <string.h>

int foo;

int a = 1;
int b = 2;
int c = 3;
   ------

>Fix:

dunno.