Re: CVS commit: pkgsrc/emulators/mame

[Thomas Klausner <wiz%NetBSD.org@localhost>]

On Wed, Sep 24, 2014 at 12:33:44PM +0000, Jonathan Perkin wrote:
> Module Name:  pkgsrc
> Committed By: jperkin
> Date:         Wed Sep 24 12:33:44 UTC 2014
> 
> Modified Files:
>       pkgsrc/emulators/mame: distinfo
>       pkgsrc/emulators/mame/patches: patch-src_lib_web_mongoose.c
>           patch-src_osd_osdcore.h
> 
> Log Message:
> Fix broken patch files.

Well, no. This breaks the patching on NetBSD.

===> Patching for mame-0.154
=> Applying pkgsrc patches for mame-0.154
=> Verifying /usr/pkgsrc/emulators/mame/../../emulators/mame/patches/patch-src_lib_web_mongoose.c
=> Applying pkgsrc patch /usr/pkgsrc/emulators/mame/../../emulators/mame/patches/patch-src_lib_web_mongoose.c
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-src_lib_web_mongoose.c,v 1.2 2014/09/24 12:33:44 jperkin Exp $
|
|If _XOPEN_SOURCE is defined to 600, NetBSD does not provide strtoll
|and other stuff.
|
|--- src/lib/web/mongoose.c.orig        2014-07-22 08:14:56.000000000 +0000
|+++ src/lib/web/mongoose.c
--------------------------
Patching file src/lib/web/mongoose.c using Plan A...
Hunk #1 failed at 46.
1 out of 1 hunks failed--saving rejects to src/lib/web/mongoose.c.rej
done
Patch /usr/pkgsrc/emulators/mame/../../emulators/mame/patches/patch-src_lib_web_mongoose.c failed
=> Verifying /usr/pkgsrc/emulators/mame/../../emulators/mame/patches/patch-src_osd_osdcore.h
=> Applying pkgsrc patch /usr/pkgsrc/emulators/mame/../../emulators/mame/patches/patch-src_osd_osdcore.h
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-src_osd_osdcore.h,v 1.2 2014/09/24 12:33:44 jperkin Exp $
|
|Include stdarg.h for va_list.
|
|--- src/osd/osdcore.h.orig     2014-04-25 09:31:28.000000000 +0000
|+++ src/osd/osdcore.h
--------------------------
Patching file src/osd/osdcore.h using Plan A...
Hunk #1 failed at 19.
1 out of 1 hunks failed--saving rejects to src/osd/osdcore.h.rej
done
Patch /usr/pkgsrc/emulators/mame/../../emulators/mame/patches/patch-src_osd_osdcore.h failed
ERROR: Patching failed due to modified or broken patch file(s):
ERROR:  /usr/pkgsrc/emulators/mame/../../emulators/mame/patches/patch-src_lib_web_mongoose.c
ERROR:  /usr/pkgsrc/emulators/mame/../../emulators/mame/patches/patch-src_osd_osdcore.h
*** Error code 1

Stop.

I guess you should play with the unzip arguments instead.
 Thomas