Update sdlmame to 0148u1.
OK?
f.-
Index: Makefile
===================================================================
RCS file: /cvs/ports/emulators/sdlmame/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile 6 Feb 2013 10:19:52 -0000 1.24
+++ Makefile 9 Mar 2013 11:40:05 -0000
@@ -10,8 +10,8 @@ COMMENT-tools = tools to manipulate MAM
V = 0148
DISTNAME = mame${V}s
-PKGNAME-main = sdlmame-${V:S/0/0./}
-PKGNAME-tools = sdlmame-tools-${V:S/0/0./}
+PKGNAME-main = sdlmame-${V:S/0/0./}pl1
+PKGNAME-tools = sdlmame-tools-${V:S/0/0./}pl1
CATEGORIES = emulators games
@@ -23,7 +23,6 @@ MAINTAINER = Federico G. Schwindt <fgsc
# history.dat : Creative Commons Attribution 3.0
PERMIT_PACKAGE_CDROM = may not sell
PERMIT_PACKAGE_FTP = Yes
-PERMIT_DISTFILES_CDROM = may not sell
PERMIT_DISTFILES_FTP = Yes
WANTLIB = SDL SDL_ttf X11 Xcomposite Xcursor Xdamage Xext \
@@ -43,6 +42,7 @@ DIST_SUBDIR = mame
# PATCHFILES doesn't work for .zip
DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \
+ ${V}u1_diff.zip:0 \
history${V:S/0//}e.zip:1
MODULES = devel/gettext \
@@ -72,9 +72,9 @@ 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
-#.endfor
+.for v in 1
+ ${PATCH} ${PATCH_DIST_ARGS} < ${WRKDIR}/${V}u${v}.diff
+.endfor
@perl -pi -e 's|\r\n|\n|g' ${WRKDIST}/makefile \
${WRKDIST}/src/emu/fileio.h \
${WRKDIST}/src/emu/machine/netlist.h \
Index: distinfo
===================================================================
RCS file: /cvs/ports/emulators/sdlmame/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo 31 Jan 2013 22:27:36 -0000 1.8
+++ distinfo 9 Mar 2013 11:40:05 -0000
@@ -1,4 +1,6 @@
+SHA256 (mame/0148u1_diff.zip) = JzeNCeUPMcoN1POd9MR0AWZxlGZX63r56lqg/7rh2bs=
SHA256 (mame/history148e.zip) = avUNQJMhmJnZWrLO5fjxIwlHw+YhiFRZk+ia9dzXxo4=
SHA256 (mame/mame0148s.zip) = eNimi6U5NP38iV9FDAhoLa2oH37D50qY+wQlOVBtkyE=
+SIZE (mame/0148u1_diff.zip) = 3386949
SIZE (mame/history148e.zip) = 3779373
SIZE (mame/mame0148s.zip) = 33822494
Index: patches/patch-src_emu_machine_netlist_h
===================================================================
RCS file: /cvs/ports/emulators/sdlmame/patches/patch-src_emu_machine_netlist_h,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_emu_machine_netlist_h
--- patches/patch-src_emu_machine_netlist_h 31 Jan 2013 22:27:36 -0000
1.1
+++ patches/patch-src_emu_machine_netlist_h 9 Mar 2013 11:40:06 -0000
@@ -1,10 +1,10 @@
$OpenBSD: patch-src_emu_machine_netlist_h,v 1.1 2013/01/31 22:27:36 fgsch Exp $
---- src/emu/machine/netlist.h.orig Sun Jan 20 20:35:07 2013
-+++ src/emu/machine/netlist.h Sun Jan 20 20:34:40 2013
-@@ -107,7 +107,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()); \
+--- 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__)
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.5
diff -u -p -r1.5 patch-src_osd_sdl_sdl_mak
--- patches/patch-src_osd_sdl_sdl_mak 31 Jan 2013 22:27:36 -0000 1.5
+++ patches/patch-src_osd_sdl_sdl_mak 9 Mar 2013 11:40:06 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_osd_sdl_sdl_mak,v 1.5 2013/01/31 22:27:36 fgsch Exp $
---- src/osd/sdl/sdl.mak.orig Thu Jan 24 15:42:05 2013
-+++ src/osd/sdl/sdl.mak Thu Jan 24 15:43:24 2013
-@@ -697,9 +697,9 @@ LIBS += `pkg-config QtGui --libs`
+--- 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`
endif
# some systems still put important things in a different prefix
