>Number:         16445
>Category:       pkg
>Synopsis:       [PATCH] pkgsrc/cross/binutils is broken (patch-msixtyeightk)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon Apr 22 09:35:00 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Jonathan Perkin
>Release:        NetBSD 1.5ZC
>Organization:
BBC Internet Services
>Environment:
NetBSD batfink.intra.nut 1.5ZC NetBSD 1.5ZC (BATFINK) #0: Wed Apr 17 14:54:52 BST 2002     sketch@batfink.intra.nut:/usr/src/sys/arch/i386/compile/BATFINK i38
>Description:
cross/binutils seems inherintly broken - different patches are patching
the same file, which will obviously cause problems as new patch files
are introduced (the standard naming scheme isn't used, instead "patch-
`arch`" is.

This has caused breakage in patch-msixtyeightk due to patch fuzz.

The below patch fixes it for now, but shouldn't this pkg entry be
properly tidied to avoid future breakage?  I'm surprised nobody has
seen this up until now.
>How-To-Repeat:

>Fix:
Index: distinfo
===================================================================
RCS file: /cache/ncvs/pkgsrc/cross/binutils/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo    2001/04/21 09:36:23     1.2
+++ distinfo    2002/04/22 16:27:36
@@ -16,6 +16,6 @@
 SHA1 (patch-armthirtytwo) = 177620bd2e259041a984e8a60df42b00212cc2b4
 SHA1 (patch-arrays) = 82ceaa4049c4e862d50988de2f25c8d31c9b64f4
 SHA1 (patch-mips) = 9480188e72b1eaf0064795cb4a718adcc306d091
-SHA1 (patch-msixtyeightk) = ddcc471e77306881c555d340d6a2ef5e874802d5
+SHA1 (patch-msixtyeightk) = 1c4a378b9b82261416c82fd3a44810c96edd659d
 SHA1 (patch-powerpc) = 7aa4f800f9f74ec7868a3d29aea7436f8e6b85a4
 SHA1 (patch-sh) = a6e5f4b4ac7298d90ab0d44276ecd9888464b786
cvs diff: Diffing files
cvs diff: Diffing patches
Index: patches/patch-msixtyeightk
===================================================================
RCS file: /cache/ncvs/pkgsrc/cross/binutils/patches/patch-msixtyeightk,v
retrieving revision 1.1
diff -u -r1.1 patch-msixtyeightk
--- patches/patch-msixtyeightk  2001/04/05 15:27:25     1.1
+++ patches/patch-msixtyeightk  2002/04/22 16:27:24
@@ -1,15 +1,15 @@
 $NetBSD: patch-m68k,v 1.1 2001/01/24 11:24:12 tsutsui Exp $
 
---- ./ld/configure.tgt.orig    Sat Dec  9 21:17:55 2000
-+++ ./ld/configure.tgt Sat Dec  9 21:25:20 2000
+--- ld/configure.tgt.orig      Mon Apr 22 17:20:07 2002
++++ ld/configure.tgt   Mon Apr 22 17:22:00 2002
 @@ -134,6 +134,7 @@
+                       ;;
  m68*-*-lynxos*)               targ_emul=m68klynx ;;
  m68*-hp*-netbsd*)     targ_emul=m68k4knbsd ;;
 +m68*-*-netbsdelf*)    targ_emul=m68kelfnbsd ;;
  m68*-*-netbsd*)               targ_emul=m68knbsd ;;
  m68*-*-psos*)         targ_emul=m68kpsos ;;
  m68*-*-rtems*)                targ_emul=m68kcoff ;;
- hppa*-*-*elf*)                targ_emul=hppaelf ;;
 --- /dev/null  Sat Dec  9 21:20:06 2000
 +++ ./ld/emulparams/m68kelfnbsd.sh     Sat Dec  9 21:23:39 2000
 @@ -0,0 +1,12 @@

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