Re: pkg/29877

[Kouichirou Hiratsuka <hira%po6.nsk.ne.jp@localhost>]

At Sun, 12 Jun 2005 04:08:07 +0000 (UTC),
jlam%netbsd.org@localhost wrote:
> 
> Synopsis: archivers/gsharutils broken on -current and 3.0_BETA
> 
> Please let me know if this problem occurs with a current pkgsrc checkout.
> Several changes were made to the way that patches are applied by the
> pkgsrc infrastructure that should fix the problem described by this PR.
> Thanks!
> 
File extraction is fine.  Please close this PR.  Thanks!

BTW, it fails to apply the patch-aa.

# cd /usr/pkgsrc/benchmarks/xengine && make
===> Checking for vulnerabilities in xengine-1.0.1nb1
[snip]
shar: Extracting "Imakefile" (752 characters)
shar: Extracting "Makefile" (9481 characters)
shar: Extracting "README" (2136 characters)
shar: Extracting "patchlevel.h" (22 characters)
shar: Extracting "xengine.c" (11425 characters)
shar: Extracting "xengine.man" (1142 characters)
shar: End of shell archive.
shar: Extracting "xengine.patch1" (11551 characters)
shar: End of shell archive.
===> Patching for xengine-1.0.1nb1
===> Applying distribution patches for xengine-1.0.1nb1
===> Applying pkgsrc patches for xengine-1.0.1nb1
1 out of 1 hunks failed--saving rejects to xengine.c.rej
Patch /work1/NetBSD/pkgsrc/benchmarks/xengine/patches/patch-aa failed
Patching failed due to modified or broken patch file(s):
        /work1/NetBSD/pkgsrc/benchmarks/xengine/patches/patch-aa
*** Error code 1

Stop.
make: stopped in /work1/NetBSD/pkgsrc/benchmarks/xengine
*** Error code 1

Stop.
make: stopped in /work1/NetBSD/pkgsrc/benchmarks/xengine
#

Could you apply the following patch?

Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/benchmarks/xengine/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo    22 Feb 2005 21:16:37 -0000      1.3
+++ distinfo    12 Jun 2005 10:29:15 -0000
@@ -6,4 +6,4 @@
 SHA1 (xengine/patch1.z) = b633b0e88389fbdd2b9c9f6243099043040dd4d1
 RMD160 (xengine/patch1.z) = ccf0c19d2456ec299575b0190248824506b9ca33
 Size (xengine/patch1.z) = 3506 bytes
-SHA1 (patch-aa) = 00a3636ceed86cd2112679a1fdee289d3948bbac
+SHA1 (patch-aa) = 778bd5793e3514dd22ae782aee544611e35beafe
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/benchmarks/xengine/patches/patch-aa,v
retrieving revision 1.2
diff -u -r1.2 patch-aa
--- patches/patch-aa    3 Apr 2000 15:55:23 -0000       1.2
+++ patches/patch-aa    12 Jun 2005 10:29:15 -0000
@@ -1,28 +1,20 @@
-$NetBSD: patch-aa,v 1.2 2000/04/03 15:55:23 sakamoto Exp $
+$NetBSD$
 
-*** xengine.c~ Wed Oct  3 10:58:17 1990
---- xengine.c  Sun Dec  8 22:17:43 1996
-***************
-*** 180,191 ****
-  
-       Arg             args[10];
-  
-!      XtSetArg(args[0], XtNwidth, 0);
-!      XtSetArg(args[1], XtNheight, 0);
-       XtGetValues(w, args, 2);
-- 
--      width = args[0].value;
--      height = args[1].value;
-  
-       XFreePixmap(XtDisplay(engine), enginePixmap);
-       enginePixmap = XCreatePixmap(XtDisplay(engine), XtWindow(engine), 
width, height, DefaultDepthOfScreen(XtScreen(engine)));
---- 180,188 ----
-  
-       Arg             args[10];
-  
-!      XtSetArg(args[0], XtNwidth, &width);
-!      XtSetArg(args[1], XtNheight, &height);
-       XtGetValues(w, args, 2);
-  
-       XFreePixmap(XtDisplay(engine), enginePixmap);
-       enginePixmap = XCreatePixmap(XtDisplay(engine), XtWindow(engine), 
width, height, DefaultDepthOfScreen(XtScreen(engine)));
+--- xengine.c.orig     2005-06-12 19:23:19.000000000 +0900
++++ xengine.c  2005-06-12 19:26:38.000000000 +0900
+@@ -179,13 +179,10 @@
+ 
+       Arg             args[10];
+ 
+-      XtSetArg(args[0], XtNwidth, 0);
+-      XtSetArg(args[1], XtNheight, 0);
++      XtSetArg(args[0], XtNwidth, &width);
++      XtSetArg(args[1], XtNheight, &height);
+       XtGetValues(w, args, 2);
+ 
+-      width = args[0].value;
+-      height = args[1].value;
+-
+       XFreePixmap(XtDisplay(engine), enginePixmap);
+       enginePixmap = XCreatePixmap(XtDisplay(engine), XtWindow(engine), 
width, height, DefaultDepth(XtDisplay(engine), 0));
+