Re: CVS commit: pkgsrc/emulators/mame

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

Attachment.

On Wed, Sep 24, 2014 at 08:59:57PM +0200, Thomas Klausner wrote:
> On Wed, Sep 24, 2014 at 04:58:17PM +0100, Jonathan Perkin wrote:
> > The only solution I see at the moment is to manually dos2unix all of
> > the files we are going to patch, to cover the case that they haven't
> > already been converted.  Patch below:
> ...
> > Can you test this works on NetBSD?  We can go with this for now, and
> > then perhaps have a better idea of how to handle this in the general
> > case for after the freeze.
> 
> The patch didn't apply for me, I've applied it manually, attached.
> 
> Doesn't change anything though:
> 
> 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.
> 
>  Thomas

Index: Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/mame/Makefile.common,v
retrieving revision 1.16
diff -u -r1.16 Makefile.common
--- Makefile.common     25 Jul 2014 15:28:56 -0000      1.16
+++ Makefile.common     24 Sep 2014 18:58:41 -0000
@@ -14,6 +14,7 @@
 NO_SRC_ON_CDROM=       ${RESTRICTED}
 NO_BIN_ON_CDROM=       ${RESTRICTED}
 
+BUILD_DEPENDS+=                dos2unix-[0-9]*:../../converters/dos2unix
 DEPENDS+=              liberation-ttf-[0-9]*:../../fonts/liberation-ttf
 
 WRKSRC=                        ${WRKDIR}
@@ -64,6 +65,11 @@
 post-extract:
        cd ${WRKDIR} && ${.CURDIR}/../../mk/extract/extract mame.zip
        rm ${WRKDIR}/mame.zip
+       # This needs to be done for every file that is patched.
+       ${RUN} for f in src/lib/web/mongoose.c src/osd/osdcore.h; do    \
+               ${CP} ${WRKSRC}/$${f} ${WRKSRC}/$${f}.bak;              \
+               ${CAT} ${WRKSRC}/$${f}.bak | dos2unix >${WRKSRC}/$${f}; \
+       done
 
 .include "../../lang/python/application.mk"
 .include "../../devel/GConf/buildlink3.mk"