Fully rerolled, the real sdlmess diff is identical to this one.
~Brian
Index: Makefile =================================================================== RCS file: /cvs/ports/emulators/sdlmame/Makefile,v retrieving revision 1.29 diff -u -p -r1.29 Makefile --- Makefile 14 Apr 2013 17:30:56 -0000 1.29 +++ Makefile 1 May 2013 16:10:50 -0000 @@ -8,10 +8,10 @@ MULTI_PACKAGES = -main -tools COMMENT-main = emulates a massive variety of arcades machines COMMENT-tools = tools to manipulate MAME/MESS roms and disk images -V = 0148 -DISTNAME = mame${V}s -PKGNAME-main = sdlmame-${V:S/0/0./}pl3 -PKGNAME-tools = sdlmame-tools-${V:S/0/0./}pl3 +V = 148 +DISTNAME = mame0${V}s +PKGNAME-main = sdlmame-0.${V}pl4 +PKGNAME-tools = sdlmame-tools-0.${V}pl4 CATEGORIES = emulators games @@ -31,7 +31,7 @@ WANTLIB = SDL SDL_ttf X11 Xcomposite Xcu pangoft2-1.0 pthread stdc++ util z MASTER_SITES = http://mamedev.org/downloader.php?file=releases/ \ - http://whiper.com/mame/${V:S/0//}/ + http://whiper.com/mame/${V}/ MASTER_SITES0 = http://mamedev.org/updates/ MASTER_SITES1 = http://www.arcade-history.com/dats/ @@ -40,10 +40,11 @@ DIST_SUBDIR = mame # PATCHFILES doesn't work for .zip DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \ - ${V}u1_diff.zip:0 \ - ${V}u2_diff.zip:0 \ - ${V}u3_diff.zip:0 \ - history${V:S/0//}h.zip:1 + 0${V}u1_diff.zip:0 \ + 0${V}u2_diff.zip:0 \ + 0${V}u3_diff.zip:0 \ + 0${V}u4_diff.zip:0 \ + history${V}i.zip:1 MODULES = devel/gettext \ lang/python @@ -74,8 +75,8 @@ post-extract: @${UNZIP} -oq ${WRKDIR}/mame.zip -d ${WRKSRC} pre-patch: -.for v in 1 2 3 - ${PATCH} ${PATCH_DIST_ARGS} < ${WRKDIR}/${V}u${v}.diff +.for v in 1 2 3 4 + ${PATCH} ${PATCH_DIST_ARGS} < ${WRKDIR}/0${V}u${v}.diff .endfor @perl -pi -e 's|\r\n|\n|g' ${WRKDIST}/makefile \ ${WRKDIST}/src/emu/fileio.h \ Index: distinfo =================================================================== RCS file: /cvs/ports/emulators/sdlmame/distinfo,v retrieving revision 1.11 diff -u -p -r1.11 distinfo --- distinfo 14 Apr 2013 17:30:56 -0000 1.11 +++ distinfo 1 May 2013 16:10:50 -0000 @@ -1,10 +1,12 @@ SHA256 (mame/0148u1_diff.zip) = JzeNCeUPMcoN1POd9MR0AWZxlGZX63r56lqg/7rh2bs= SHA256 (mame/0148u2_diff.zip) = 47z3PLFlWRWCpQm/EXGJOyPicPmscZmsTxxrzlbWliA= SHA256 (mame/0148u3_diff.zip) = ZeL4wixp/pLX9Y98Zsi2GZzYHH+g9PlvA4/qJZjeaK0= -SHA256 (mame/history148h.zip) = rtg5cHlui1uQ4LpEZ2z7ovJ62dxWGmmKeT7gxZAesUo= +SHA256 (mame/0148u4_diff.zip) = FZVqj5Q6VEwLDgA5isNe6rmR3S1WIULOlhVvVunbfH8= +SHA256 (mame/history148i.zip) = wRBRUzNL5WkP9P4bw0zffuznyVdXSkg6j7fM9vkVbyo= SHA256 (mame/mame0148s.zip) = eNimi6U5NP38iV9FDAhoLa2oH37D50qY+wQlOVBtkyE= SIZE (mame/0148u1_diff.zip) = 3386949 SIZE (mame/0148u2_diff.zip) = 3196998 SIZE (mame/0148u3_diff.zip) = 1182789 -SIZE (mame/history148h.zip) = 4456134 +SIZE (mame/0148u4_diff.zip) = 1666973 +SIZE (mame/history148i.zip) = 4497384 SIZE (mame/mame0148s.zip) = 33822494 Index: patches/patch-src_emu_machine_netlist_h =================================================================== RCS file: patches/patch-src_emu_machine_netlist_h diff -N patches/patch-src_emu_machine_netlist_h --- patches/patch-src_emu_machine_netlist_h 10 Mar 2013 10:56:50 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_emu_machine_netlist_h,v 1.2 2013/03/10 10:56:50 fgsch Exp $ ---- src/emu/machine/netlist.h.orig Tue Mar 5 19:13:20 2013 -+++ src/emu/machine/netlist.h Tue Mar 5 19:14:44 2013 -@@ -99,7 +99,7 @@ ATTR_COLD void NETLIST_NAME(_name)(netlist_setup_t &ne - - #define NETLIST_MEMREGION(_name) \ - netlist.parse((char *)downcast<netlist_t &>(netlist.netlist()).machine().root_device().memregion(_name)->base()); --#if defined(__GNUC__) && (__GNUC__ >= 3) -+#if defined(__GNUC__) && (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)) - #if !defined(__ppc__) && !defined (__PPC__) && !defined(__ppc64__) && !defined(__PPC64__) - #define ATTR_ALIGN __attribute__ ((aligned(128))) - #else Index: patches/patch-src_osd_sdl_sdl_mak =================================================================== RCS file: /cvs/ports/emulators/sdlmame/patches/patch-src_osd_sdl_sdl_mak,v retrieving revision 1.6 diff -u -p -r1.6 patch-src_osd_sdl_sdl_mak --- patches/patch-src_osd_sdl_sdl_mak 10 Mar 2013 10:56:50 -0000 1.6 +++ patches/patch-src_osd_sdl_sdl_mak 1 May 2013 16:10:50 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_osd_sdl_sdl_mak,v 1.6 2013/03/10 10:56:50 fgsch Exp $ ---- src/osd/sdl/sdl.mak.orig Tue Mar 5 19:13:20 2013 -+++ src/osd/sdl/sdl.mak Tue Mar 5 19:13:20 2013 -@@ -702,9 +702,9 @@ LIBS += `pkg-config QtGui --libs` +--- src/osd/sdl/sdl.mak.orig Wed May 1 12:09:06 2013 ++++ src/osd/sdl/sdl.mak Wed May 1 12:09:07 2013 +@@ -708,9 +708,9 @@ LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --lib endif # some systems still put important things in a different prefix