pkg/39291: junck patchdiff output

[sdrake%ihug.co.nz@localhost]

>Number:         39291
>Category:       pkg
>Synopsis:       junck patchdiff output
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Tue Aug 05 09:45:00 +0000 2008
>Originator:     Steven Drake
>Release:        pkgsrc-2008Q2
>Organization:
>Environment:
Linux idran.drake.org.nz 2.6.26.1 #1 PREEMPT Sun Aug 3 22:31:36 NZST 2008 i686 
pentium4 i386 GNU/Linux
>Description:
Package pkgtools/pkgdiff.
After running mkpatches the patchdiff output contains lines showing differences 
between the patch control/meta line.
I.e. where the timestamps are different (missing in one patch not in the other 
or differnet timezones) or where one patch was made with the -p patch option 
and the other wasn't.

>How-To-Repeat:
$ cd devel/cvsgraph
$ make patch
  .....
$ mkpathes
$ patchdiff
Comparing patches/patch-aa to work/.newpatches/patch-aa
3,5c3,5
< --- Makefile.in.orig  Fri Aug  6 18:30:24 2004
< +++ Makefile.in       Fri Aug  6 18:31:18 2004
< @@ -10,6 +10,7 @@
---
> --- Makefile.in.orig  2004-07-15 09:42:58.000000000 +0000
> +++ Makefile.in
> @@ -10,6 +10,7 @@ RM  = rm -f
13c13
< @@ -34,7 +35,7 @@
---
> @@ -34,7 +35,7 @@ GENOBJS     = $(GENSRCS:.c=.o)


>Fix:
Try this patch.
--- files/patchdiff.pl.orig
+++ files/patchdiff.pl
@@ -98,6 +98,9 @@
        $diff=`diff $orig{$patch} $new{$patch}`;
        $diff=~s/^\dc\d\n..\$[N]etBSD.*\$\n---\n..\$[N]etBSD.*\$\n//m;
        $diff=~s/^\dc\d\n..\+\+\+.*\n---\n..\+\+\+.*\n//m;
+       $diff=~s/^\dc\d\n..---.*\n---\n..---.*\n//m;
+       $diff=~s/^[\d,]*c[\d,]*\n.( --- [^ \t\n]*).*\n.( \+\+\+ [^ 
\t\n]*).*\n.(@@.*@@).*\n---\n.\1.*\n.\2.*\n.\3.*\n//m;
+       $diff=~s/^\d*c\d*\n.( @@.*@@).*\n---\n.\1.*\n//mg;
        if ($diff) {
             print "Comparing $orig{$patch} to $new{$patch}\n$diff";
        }
--
uuencoded version:
begin 644 -
M+2TM(&9I;&5S+W!A=&-H9&EF9BYP;"YO<FEG"BLK*R!F:6QE<R]P871C:&1I
M9F8N<&P*0$`@+3DX+#8@*SDX+#D@0$`*("`@("`@("`D9&EF9CU@9&EF9B`D
M;W)I9WLD<&%T8VA]("1N97=[)'!A=&-H?6`["B`@("`@("`@)&1I9F8]?G,O
M7EQD8UQD7&XN+EPD6TY=971"4T0N*EPD7&XM+2U<;BXN7"1;3EUE=$)31"XJ
M7"1<;B\O;3L*("`@("`@("`D9&EF9CU^<R]>7&1C7&1<;BXN7"M<*UPK+BI<
M;BTM+5QN+BY<*UPK7"LN*EQN+R]M.PHK("`@("`@("1D:69F/7YS+UY<9&-<
M9%QN+BXM+2TN*EQN+2TM7&XN+BTM+2XJ7&XO+VT["BL@("`@("`@)&1I9F8]
M?G,O7EM<9"Q=*F-;7&0L72I<;BXH("TM+2!;7B!<=%QN72HI+BI<;BXH(%PK
M7"M<*R!;7B!<=%QN72HI+BI<;BXH0$`N*D!`*2XJ7&XM+2U<;BY<,2XJ7&XN
M7#(N*EQN+EPS+BI<;B\O;3L**R`@("`@("`D9&EF9CU^<R]>7&0J8UQD*EQN
M+B@@0$`N*D!`*2XJ7&XM+2U<;BY<,2XJ7&XO+VUG.PH@("`@("`@(&EF("@D
M9&EF9BD@>PH@("`@("`@("`@("`@<')I;G0@(D-O;7!A<FEN9R`D;W)I9WLD
K<&%T8VA]('1O("1N97=[)'!A=&-H?5QN)&1I9F8B.PH@("`@("`@('T*"@``
`
end