anyone?
On Fri, Nov 11, 2011 at 10:46 AM, Federico G. Schwindt <[email protected]> wrote:
> Hi,
>
> Not trivial update to sdlmame 0143pl9. Tested on amd64.
> -tools is not longer a run dependency because it's not needed and will
> conflict with the upcoming sdlmess update.
> This will break sdlmess for a short period of time or we can simply remove
> the sdlmess' dependency on the sdlmame-tools.
> Since this diff is getting bigger and bigger I'd like to commit it now before
> it gets too complicated.
> Comments? OKs?
>
> f.-
>
> Index: sdlmame/Makefile
> ===================================================================
> RCS file: /cvs/ports/emulators/sdlmame/Makefile,v
> retrieving revision 1.16
> diff -u -p -r1.16 Makefile
> --- sdlmame/Makefile 29 Oct 2011 08:12:31 -0000 1.16
> +++ sdlmame/Makefile 11 Nov 2011 10:45:18 -0000
> @@ -8,18 +8,14 @@ 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 = 0.132
> -DISTNAME = sdlmame${V:S/.//}
> -PKGNAME-main = sdlmame-${V}
> -REVISION-main = 8
> -PKGNAME-tools = sdlmame-tools-${V}
> -REVISION-tools = 6
> +V = 0143
> +DISTNAME = mame${V}s
> +PKGNAME-main = sdlmame-${V:S/0/0./}pl9
> +PKGNAME-tools = sdlmame-tools-${V:S/0/0./}pl9
>
> CATEGORIES = emulators games
>
> -HOMEPAGE = http://rbelmont.mameworld.info/?page_id=163
> -
> -MAINTAINER = Pierre Riteau <[email protected]>
> +HOMEPAGE = http://mamedev.org/
>
> # MAME Distribution License, see http://mamedev.org/license.html
> # history.dat : Creative Commons Attribution 3.0
> @@ -30,67 +26,82 @@ PERMIT_DISTFILES_FTP = Yes
>
> MODULE = devel/gettext
>
> -WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext
> -WANTLIB += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo dbus-1
> -WANTLIB += expat fontconfig freetype gio-2.0 glib-2.0 gmodule-2.0
> -WANTLIB += gobject-2.0 gthread-2.0 m pango-1.0 pangocairo-1.0
> -WANTLIB += pangoft2-1.0 pixman-1 png pthread pthread-stubs xcb z
> -WANTLIB += SDL gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0 gtk-x11-2.0
> +WANTLIB = GL SDL SDL_ttf X11 Xcomposite Xcursor Xdamage Xext \
> + Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat \
> + fontconfig freetype gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0 \
> + gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \
> + gtk-x11-2.0 iconv intl m pango-1.0 pangocairo-1.0 \
> + pangoft2-1.0 pixman-1 png pthread pthread-stubs stdc++ util \
> + xcb xcb-render xcb-shm z
> +
> +MASTER_SITES = http://mamedev.org/downloader.php?file=releases/
> +MASTER_SITES0 = http://mamedev.org/updates/
> +MASTER_SITES1 = http://www.arcade-history.com/dats/
>
> -MASTER_SITES = http://rbelmont.mameworld.info/
> EXTRACT_SUFX = .zip
> +DIST_SUBDIR = mame
>
> -MASTER_SITES0 = http://www.arcade-history.com/dats/
> -DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} \
> - mamehistory137.zip:0
> +# 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 \
> + ${V}u4_diff.zip:0 \
> + ${V}u5_diff.zip:0 \
> + ${V}u6_diff.zip:0 \
> + ${V}u7_diff.zip:0 \
> + ${V}u8_diff.zip:0 \
> + ${V}u9_diff.zip:0 \
> + mamehistory${V:S/0//}a.zip:1
>
> BUILD_DEPENDS = archivers/unzip
> -LIB_DEPENDS = devel/sdl \
> - devel/gconf2 \
> +LIB_DEPENDS = devel/gconf2 \
> + devel/sdl-ttf \
> x11/gtk+2
> -RUN_DEPENDS-main = ${PKGNAME-tools}:emulators/sdlmame,-tools
> -
> -USE_GMAKE = Yes
> -
> -NO_REGRESS = Yes
> -VMEM_WARNING = Yes
> +RUN_DEPENDS-main = fonts/liberation-fonts
>
> MAKE_FLAGS = OPT_FLAGS='-DINI_PATH="\"${SYSCONFDIR}/mame;\""'
> -MAKE_ENV = ARCH=$(ARCH) CC=$(CC) CFLAGS="$(CFLAGS)" LD=$(CC) \
> +MAKE_ENV = ARCH=$(ARCH) CC=$(CC) CFLAGS="$(CFLAGS)" \
> TARGETOS=openbsd
> .if ${MACHINE_ARCH} == "amd64"
> -MAKE_ENV+= PTR64=1
> -# XXX -Wno-system-headers is needed because of inclusion of *mmintrin.h from
> gcc
> -# those headers don't compile with -Wsystem-headers -Werror on amd64
> -MAKE_FLAGS = OPT_FLAGS='-DINI_PATH="\"${SYSCONFDIR}/mame;\""
> -Wno-system-headers'
> +MAKE_ENV += PTR64=1
> .endif
> +USE_GMAKE = Yes
> +
> MAKE_FILE = makefile
>
> -MAME_EXTBIN = chdman jedutil ldresample ldverify romcmp
> -MAME_DOC = config.txt license.txt mame.txt newvideo.txt
> -MAME_DATA_DIR = roms samples artwork ctrlr cheat keymaps
> +NO_REGRESS = Yes
> +VMEM_WARNING = Yes
> +
> +post-extract:
> + @${UNZIP} -oq ${WRKDIR}/mame.zip -d ${WRKSRC}
> +
> +pre-patch:
> +.for v in 1 2 3 4 5 6 7 8 9
> + ${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/osd/sdl/sdlos_unix.c \
> + ${WRKDIST}/src/mame/video/mcd212.c
>
> do-install:
> ${INSTALL_PROGRAM} ${WRKSRC}/mame ${PREFIX}/bin/sdlmame
> -.for i in ${MAME_EXTBIN}
> - ${INSTALL_PROGRAM} ${WRKSRC}/${i} ${PREFIX}/bin/${i}
> -.endfor
> -.for i in ${MAME_DATA_DIR}
> - ${INSTALL_DATA_DIR} ${PREFIX}/share/sdlmame/${i}
> +.for f in chdman jedutil ldresample ldverify romcmp
> + ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/bin
> .endfor
> - ${INSTALL_DATA} ${WRKSRC}/keymaps/km[-_]??.txt \
> - ${PREFIX}/share/sdlmame/keymaps/
> - ${INSTALL_DATA} ${WRKSRC}/ui.bdf ${PREFIX}/share/sdlmame
> + ${INSTALL_DATA_DIR} ${PREFIX}/share/sdlmame/keymaps
> + ${INSTALL_DATA} ${WRKSRC}/src/osd/sdl/keymaps/km[-_]??.txt \
> + ${PREFIX}/share/sdlmame/keymaps/
> ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sdlmame
> -.for i in ${MAME_DOC}
> - ${INSTALL_DATA} ${WRKSRC}/docs/${i} ${PREFIX}/share/doc/sdlmame/
> +.for f in config.txt hlsl.txt license.txt mame.txt newvideo.txt
> + ${INSTALL_DATA} ${WRKSRC}/docs/${f} ${PREFIX}/share/doc/sdlmame
> .endfor
> - ${INSTALL_DATA} $(WRKSRC)/SDLMAME.txt ${PREFIX}/share/doc/sdlmame/
> ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/sdlmame
> ${SUBST_CMD} -c ${FILESDIR}/mame.ini \
> - ${PREFIX}/share/examples/sdlmame/mame.ini
> + ${PREFIX}/share/examples/sdlmame/mame.ini
> chown ${SHAREOWN}:${SHAREGRP} \
> - ${PREFIX}/share/examples/sdlmame/mame.ini
> + ${PREFIX}/share/examples/sdlmame/mame.ini
> ${INSTALL_DATA} ${WRKDIR}/history.dat ${PREFIX}/share/sdlmame
>
> .include <bsd.port.mk>
> Index: sdlmame/distinfo
> ===================================================================
> RCS file: /cvs/ports/emulators/sdlmame/distinfo,v
> retrieving revision 1.3
> diff -u -p -r1.3 distinfo
> --- sdlmame/distinfo 27 Apr 2010 13:00:25 -0000 1.3
> +++ sdlmame/distinfo 11 Nov 2011 10:45:18 -0000
> @@ -1,10 +1,55 @@
> -MD5 (mamehistory137.zip) = ugx9ewnjOXUtEirdF9cULQ==
> -MD5 (sdlmame0132.zip) = TjVpWzHsEHhQ+MUBNz+Pyg==
> -RMD160 (mamehistory137.zip) = ixb1XZWd3fHWh5SVQARvJ879OOg=
> -RMD160 (sdlmame0132.zip) = bvn5dFyDNzR0zq+s5VL7VUHo/rY=
> -SHA1 (mamehistory137.zip) = HqNLBD9xMlQym8M9pepmFE24D/c=
> -SHA1 (sdlmame0132.zip) = qDi1Lm28KDVqq6EA5G1X3g9TyN0=
> -SHA256 (mamehistory137.zip) = lmn3G7l9TBZieFtBE8aa8efe3hKGPftyeMaCnwb2dLg=
> -SHA256 (sdlmame0132.zip) = QuaYVWkeeeT4yjtILqwNUgPEVQKij2mmDMmzOygMqgE=
> -SIZE (mamehistory137.zip) = 2476068
> -SIZE (sdlmame0132.zip) = 17879263
> +MD5 (mame/0143u1_diff.zip) = qmXqbN5CJrWp3uid6Jv+GQ==
> +MD5 (mame/0143u2_diff.zip) = vqsvJl52+ZZUPKQQ2wBUsQ==
> +MD5 (mame/0143u3_diff.zip) = 9EzdHqZgDp7+uDSegrkuDg==
> +MD5 (mame/0143u4_diff.zip) = 4vCoLl04OHNQxN8EQcFijQ==
> +MD5 (mame/0143u5_diff.zip) = TrLlgrsJ6YBZGO132O748A==
> +MD5 (mame/0143u6_diff.zip) = H9+XqHKHLFJW8NqT5Rd8gQ==
> +MD5 (mame/0143u7_diff.zip) = A5iOGE4/YvShff969pemXQ==
> +MD5 (mame/0143u8_diff.zip) = ZBleZnkysS9l8Kvw9Dv7GA==
> +MD5 (mame/0143u9_diff.zip) = 0eJ5RyIshtA3jwcL7/K5tQ==
> +MD5 (mame/mame0143s.zip) = LZW52feal6aQ9iKE5NsOfg==
> +MD5 (mame/mamehistory143a.zip) = /KyvDhchJySjDCu4DsYMIA==
> +RMD160 (mame/0143u1_diff.zip) = Myp+u1B1C9YogZ450MprkknWGLc=
> +RMD160 (mame/0143u2_diff.zip) = KO1rWRD9cqjP0k0B52pYixTuw/U=
> +RMD160 (mame/0143u3_diff.zip) = HgOJP8F2UuHBzvZUEmEhN+Uee00=
> +RMD160 (mame/0143u4_diff.zip) = iLfa1MYa49v3QMF59pF1djy+rRc=
> +RMD160 (mame/0143u5_diff.zip) = lI4/cNHgAKPflDO6pQiTCFRqnQM=
> +RMD160 (mame/0143u6_diff.zip) = YGtr0LeCn+JqJgNcpAuTWjKVJGk=
> +RMD160 (mame/0143u7_diff.zip) = 0iH9qlRakTwavq1brWnlZWkcTKs=
> +RMD160 (mame/0143u8_diff.zip) = 6Yqk1+296COBfKEEmJ93p0RPx8w=
> +RMD160 (mame/0143u9_diff.zip) = BXR+PQHPlXz/jzmbconwh1BhIHk=
> +RMD160 (mame/mame0143s.zip) = DP/99ZOft0Cr2wMCVgEajmym7lQ=
> +RMD160 (mame/mamehistory143a.zip) = 3ZFzeiV+LA3UUyBZKRl1+X7cm5U=
> +SHA1 (mame/0143u1_diff.zip) = V6m5lgtIwqM3eVPAG7uFQCJOVgw=
> +SHA1 (mame/0143u2_diff.zip) = T8AVaROSxqrFeYt1Edwor90PO9s=
> +SHA1 (mame/0143u3_diff.zip) = uptuL/F555oAcVztX95lUEdxhJg=
> +SHA1 (mame/0143u4_diff.zip) = /CL0g2RRhu3s8M20ECu+ow6PqQI=
> +SHA1 (mame/0143u5_diff.zip) = Bp79VJBSPQP14W/Y+sKQE06yTPQ=
> +SHA1 (mame/0143u6_diff.zip) = /SyEXz/PBQGhpe6TSCIdVkNId4w=
> +SHA1 (mame/0143u7_diff.zip) = NA/ZNjiRqa+pT6Gw2AuPjlDwKm0=
> +SHA1 (mame/0143u8_diff.zip) = uNsC7RJOCao0/njjXbwOMTmj8sQ=
> +SHA1 (mame/0143u9_diff.zip) = sxfrpFUGaP2XzyBGsDWb113QMZk=
> +SHA1 (mame/mame0143s.zip) = 3Xz0PsnzEyHuaY+szjstOyHOvxU=
> +SHA1 (mame/mamehistory143a.zip) = T7j7OJn6bnNNY4/5HI2nS1WxBLY=
> +SHA256 (mame/0143u1_diff.zip) = MHFyxpVvWCUVkKXDDEVMmfvfAq5VTQ46qgEz/JmJ7ug=
> +SHA256 (mame/0143u2_diff.zip) = T2+llh/p/pnf1tMV2vUoCyUWrJYhOyosD8+EnChNsIY=
> +SHA256 (mame/0143u3_diff.zip) = JD+KI+ezZSDBvQxz5r3Fo1sEQtQ3GYhO2NOI4Hdc5ac=
> +SHA256 (mame/0143u4_diff.zip) = qdkDkuEjdYADpsxI6x4pXZ1pBZuQFLZVbP1fot+6JZc=
> +SHA256 (mame/0143u5_diff.zip) = KQ1hYJsf//ZhupvjK2G66xh5cPyYg0cXQfAB0l3syKY=
> +SHA256 (mame/0143u6_diff.zip) = 4piTaMDQVImAm6BRT9fEDuJOp1AaCXEp+qcDS17mhN8=
> +SHA256 (mame/0143u7_diff.zip) = uOBx6TR8xEDrBTBeJ6tKBM44+00XzpoVB8yHgVZxHFI=
> +SHA256 (mame/0143u8_diff.zip) = a6iTemHN8+OAtsW2h7v5Tx5ukQsJyA6nE0RH4fV3oxA=
> +SHA256 (mame/0143u9_diff.zip) = TSD70cy+Tbku1VCzlY5BhEsXOQ81j7T0DZA8KAsjaoo=
> +SHA256 (mame/mame0143s.zip) = Z38EdW7XvADhrcbmi7sXT4mEWId1jcKHxyRKWOasJm8=
> +SHA256 (mame/mamehistory143a.zip) =
> OC9b4ppip2EFLhzkVlXhaoqnZ8uPzZW0qQ6Ydjdf5FI=
> +SIZE (mame/0143u1_diff.zip) = 250465
> +SIZE (mame/0143u2_diff.zip) = 679992
> +SIZE (mame/0143u3_diff.zip) = 492365
> +SIZE (mame/0143u4_diff.zip) = 858755
> +SIZE (mame/0143u5_diff.zip) = 314547
> +SIZE (mame/0143u6_diff.zip) = 977344
> +SIZE (mame/0143u7_diff.zip) = 553427
> +SIZE (mame/0143u8_diff.zip) = 253256
> +SIZE (mame/0143u9_diff.zip) = 35288
> +SIZE (mame/mame0143s.zip) = 17902802
> +SIZE (mame/mamehistory143a.zip) = 2944687
> Index: sdlmame/patches/patch-makefile
> ===================================================================
> RCS file: /cvs/ports/emulators/sdlmame/patches/patch-makefile,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-makefile
> --- sdlmame/patches/patch-makefile 23 May 2010 09:19:45 -0000 1.2
> +++ sdlmame/patches/patch-makefile 11 Nov 2011 10:45:18 -0000
> @@ -1,7 +1,7 @@
> -$OpenBSD: patch-makefile,v 1.2 2010/05/23 09:19:45 espie Exp $
> ---- makefile.orig Sun Mar 29 01:50:01 2009
> -+++ makefile Mon May 17 21:55:57 2010
> -@@ -125,10 +125,10 @@ endif
> +$OpenBSD$
> +--- makefile.orig Sat Feb 12 15:17:48 2011
> ++++ makefile Thu Jun 2 12:18:06 2011
> +@@ -206,10 +206,10 @@ endif
> # BIGENDIAN = 1
>
> # uncomment next line to build expat as part of MAME build
> @@ -14,39 +14,34 @@ $OpenBSD: patch-makefile,v 1.2 2010/05/2
>
> # uncomment next line to include the symbols
> # SYMBOLS = 1
> -@@ -197,8 +197,8 @@ endif
> +@@ -298,7 +298,7 @@ endif
>
> # compiler, linker and utilities
> AR = @ar
> -CC = @gcc
> --LD = @gcc
> +CC ?= @gcc
> -+LD ?= @gcc
> + LD = @g++
> MD = -mkdir$(EXE)
> RM = @rm -f
> -
> -@@ -227,7 +227,7 @@ NAME = $(TARGET)$(SUBTARGET)
> +@@ -347,7 +347,7 @@ NAME = $(TARGET)$(SUBTARGET)
> endif
>
> - # fullname is prefix+name+suffix+debugsuffix
> --FULLNAME = $(PREFIX)$(NAME)$(CPPSUFFIX)$(SUFFIX)$(DEBUGSUFFIX)
> -+FULLNAME = $(NAME)$(CPPSUFFIX)$(SUFFIX)$(DEBUGSUFFIX)
> + # fullname is prefix+name+suffix+suffix64+suffixdebug
> +-FULLNAME =
> $(PREFIX)$(PREFIXSDL)$(NAME)$(SUFFIX)$(SUFFIX64)$(SUFFIXDEBUG)$(SUFFIXPROFILE)
> ++FULLNAME = $(PREFIXSDL)$(NAME)$(SUFFIX)$(SUFFIXDEBUG)$(SUFFIXPROFILE)
>
> # add an EXE suffix to get the final emulator name
> EMULATOR = $(FULLNAME)$(EXE)
> -@@ -302,9 +302,9 @@ CPPONLYFLAGS =
> +@@ -423,7 +423,7 @@ CPPONLYFLAGS =
> +
> # CFLAGS is defined based on C or C++ targets
> # (remember, expansion only happens when used, so doing it here is ok)
> - ifdef CPP_COMPILE
> -CFLAGS = $(CCOMFLAGS) $(CPPONLYFLAGS)
> +CFLAGS += $(CCOMFLAGS) $(CPPONLYFLAGS)
> - else
> --CFLAGS = $(CCOMFLAGS) $(CONLYFLAGS)
> -+CFLAGS += $(CCOMFLAGS) $(CONLYFLAGS)
> - endif
>
> # we compile C-only to C89 standard with GNU extensions
> -@@ -331,7 +331,7 @@ CCOMFLAGS += -pg
> + # we compile C++ code to C++98 standard with GNU extensions
> +@@ -450,7 +450,7 @@ CCOMFLAGS += -pg
> endif
>
> # add the optimization flag
> @@ -55,13 +50,3 @@ $OpenBSD: patch-makefile,v 1.2 2010/05/2
>
> # if we are optimizing, include optimization options
> # and make all errors into warnings
> -@@ -355,8 +355,7 @@ CCOMFLAGS += \
> - # warnings only applicable to C compiles
> - CONLYFLAGS += \
> - -Wpointer-arith \
> -- -Wbad-function-cast \
> -- -Wstrict-prototypes
> -+ -Wbad-function-cast
> -
> - # this warning is not supported on the os2 compilers
> - ifneq ($(TARGETOS),os2)
> Index: sdlmame/patches/patch-src_emu_fileio_h
> ===================================================================
> RCS file: sdlmame/patches/patch-src_emu_fileio_h
> diff -N sdlmame/patches/patch-src_emu_fileio_h
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ sdlmame/patches/patch-src_emu_fileio_h 11 Nov 2011 10:45:18 -0000
> @@ -0,0 +1,11 @@
> +$OpenBSD$
> +--- src/emu/fileio.h.orig Tue Nov 8 22:52:52 2011
> ++++ src/emu/fileio.h Tue Nov 8 22:52:52 2011
> +@@ -151,6 +151,7 @@ class emu_file (public)
> +
> + // reading
> + UINT32 read(void *buffer, UINT32 length);
> ++#undef getc
> + int getc();
> + int ungetc(int c);
> + char *gets(char *s, int n);
> Index: sdlmame/patches/patch-src_mame_video_mcd212_c
> ===================================================================
> RCS file: sdlmame/patches/patch-src_mame_video_mcd212_c
> diff -N sdlmame/patches/patch-src_mame_video_mcd212_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ sdlmame/patches/patch-src_mame_video_mcd212_c 11 Nov 2011 10:45:18
> -0000
> @@ -0,0 +1,16 @@
> +$OpenBSD$
> +--- src/mame/video/mcd212.c.orig Wed Nov 9 14:44:10 2011
> ++++ src/mame/video/mcd212.c Wed Nov 9 14:44:30 2011
> +@@ -1523,9 +1523,9 @@ void mcd212_init(running_machine &machine, mcd212_regs
> + mcd212->channel[index].ddr = 0;
> + mcd212->channel[index].dcp = 0;
> + mcd212->channel[index].dca = 0;
> +- memset(mcd212->channel[index].clut_r, 0, 768);
> +- memset(mcd212->channel[index].clut_g, 0, 768);
> +- memset(mcd212->channel[index].clut_b, 0, 768);
> ++ memset(mcd212->channel[index].clut_r, 0, 256);
> ++ memset(mcd212->channel[index].clut_g, 0, 256);
> ++ memset(mcd212->channel[index].clut_b, 0, 256);
> + mcd212->channel[index].image_coding_method = 0;
> + mcd212->channel[index].transparency_control = 0;
> + mcd212->channel[index].plane_order = 0;
> Index: sdlmame/patches/patch-src_osd_sdl_dview_c
> ===================================================================
> RCS file: sdlmame/patches/patch-src_osd_sdl_dview_c
> diff -N sdlmame/patches/patch-src_osd_sdl_dview_c
> --- sdlmame/patches/patch-src_osd_sdl_dview_c 24 Apr 2010 13:54:32 -0000
> 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,15 +0,0 @@
> -$OpenBSD: patch-src_osd_sdl_dview_c,v 1.1 2010/04/24 13:54:32 jasper Exp $
> -
> -Fix build with newer gtk versions.
> -
> ---- src/osd/sdl/dview.c.orig Sat Apr 24 15:34:35 2010
> -+++ src/osd/sdl/dview.c Sat Apr 24 15:34:58 2010
> -@@ -213,7 +213,7 @@ static void dview_size_allocate(GtkWidget *wdv, GtkAll
> - debug_view_set_visible_position(dv->dw, pos);
> - debug_view_set_visible_size(dv->dw, vsize);
> -
> -- if(GTK_WIDGET_REALIZED(wdv))
> -+ if(gtk_widget_get_realized(wdv))
> - gdk_window_move_resize(wdv->window,
> - allocation->x,
> allocation->y,
> - allocation->width,
> allocation->height);
> Index: sdlmame/patches/patch-src_osd_sdl_sdl_mak
> ===================================================================
> RCS file: sdlmame/patches/patch-src_osd_sdl_sdl_mak
> diff -N sdlmame/patches/patch-src_osd_sdl_sdl_mak
> --- sdlmame/patches/patch-src_osd_sdl_sdl_mak 1 Oct 2010 07:27:23 -0000
> 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,14 +0,0 @@
> -$OpenBSD: patch-src_osd_sdl_sdl_mak,v 1.3 2010/10/01 07:27:23 ajacoutot Exp $
> -
> -XXX make it compile with gtk+2 2.22 (*_DISABLE_DEPRECATED)
> -
> ---- src/osd/sdl/sdl.mak.orig Fri Oct 1 09:17:11 2010
> -+++ src/osd/sdl/sdl.mak Fri Oct 1 09:17:19 2010
> -@@ -272,7 +272,6 @@ ifndef NO_X11
> - OSDCOREOBJS += $(SDLOBJ)/debugwin.o $(SDLOBJ)/dview.o $(SDLOBJ)/debug-sup.o
> $(SDLOBJ)/debug-intf.o
> - CFLAGS += `pkg-config --cflags gtk+-2.0` `pkg-config --cflags gconf-2.0`
> - LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --libs gconf-2.0`
> --CFLAGS += -DGTK_DISABLE_DEPRECATED
> - else
> - OSDCOREOBJS += $(SDLOBJ)/debugwin.o
> - endif # NO_X11
> Index: sdlmame/pkg/DESCR-tools
> ===================================================================
> RCS file: /cvs/ports/emulators/sdlmame/pkg/DESCR-tools,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 DESCR-tools
> --- sdlmame/pkg/DESCR-tools 17 Mar 2009 19:55:09 -0000 1.1.1.1
> +++ sdlmame/pkg/DESCR-tools 11 Nov 2011 10:45:18 -0000
> @@ -1,2 +1,2 @@
> This package contains tools to manipulate roms and disk images used by
> -SDLMAME and SDLMESS.
> +SDLMAME.
> Index: sdlmame/pkg/PLIST-main
> ===================================================================
> RCS file: /cvs/ports/emulators/sdlmame/pkg/PLIST-main,v
> retrieving revision 1.4
> diff -u -p -r1.4 PLIST-main
> --- sdlmame/pkg/PLIST-main 9 May 2010 17:45:12 -0000 1.4
> +++ sdlmame/pkg/PLIST-main 11 Nov 2011 10:45:18 -0000
> @@ -15,8 +15,8 @@
> @pkgpath emulators/xmame,-mame,esd,x11
> @bin bin/sdlmame
> share/doc/sdlmame/
> -share/doc/sdlmame/SDLMAME.txt
> share/doc/sdlmame/config.txt
> +share/doc/sdlmame/hlsl.txt
> share/doc/sdlmame/license.txt
> share/doc/sdlmame/mame.txt
> share/doc/sdlmame/newvideo.txt
> @@ -25,9 +25,9 @@ share/examples/sdlmame/
> share/examples/sdlmame/mame.ini
> @sample ${SYSCONFDIR}/mame/mame.ini
> share/sdlmame/
> -share/sdlmame/artwork/
> -share/sdlmame/cheat/
> -share/sdlmame/ctrlr/
> +@sample share/sdlmame/artwork/
> +@sample share/sdlmame/cheat/
> +@sample share/sdlmame/ctrlr/
> share/sdlmame/history.dat
> share/sdlmame/keymaps/
> share/sdlmame/keymaps/km-be.txt
> @@ -35,6 +35,5 @@ share/sdlmame/keymaps/km-ch.txt
> share/sdlmame/keymaps/km-de.txt
> share/sdlmame/keymaps/km-fr.txt
> share/sdlmame/keymaps/km_it.txt
> -share/sdlmame/roms/
> -share/sdlmame/samples/
> -share/sdlmame/ui.bdf
> +@sample share/sdlmame/roms/
> +@sample share/sdlmame/samples/
>
