5 files changed, 47 insertions, 63 deletions

diff --git a/emulators/sdlmess/Makefile b/emulators/sdlmess/Makefile
index 83e50fe45e65..6ec87531b5c7 100644
--- a/emulators/sdlmess/Makefile
+++ b/emulators/sdlmess/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sdlmess
-PORTVERSION=	0.120
+PORTVERSION=	0.122
 CATEGORIES=	emulators
 MASTER_SITES=	ftp://ftp.alepulver.com.ar/distfiles/
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}
@@ -26,8 +26,8 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
 	${MKDIR} ${PREFIX}/libexec/sdlmess
 .for f in obj/sdl/mess/build/file2str obj/sdl/mess/build/png2bdc mess \
-	testkeys dat2html messtest messdocs imgtool romcmp chdman jedutil \
-	makemeta regrep srcclean
+	testkeys dat2html messtest imgtool romcmp chdman jedutil makemeta \
+	regrep srcclean src2html
 	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/libexec/sdlmess
 .endfor
 	${MKDIR} ${DATADIR}
@@ -45,10 +45,4 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "sparc64"
-BROKEN=		Does not compile
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/emulators/sdlmess/distinfo b/emulators/sdlmess/distinfo
index 2088b819a998..705ac3b96c94 100644
--- a/emulators/sdlmess/distinfo
+++ b/emulators/sdlmess/distinfo
@@ -1,3 +1,3 @@
-MD5 (sdlmess0120.zip) = c90d9e9afed66a6eeabc3958adcfc2b3
-SHA256 (sdlmess0120.zip) = d35117f52e363145ff9c933f58d313660d6ca8d22e58018a3d4d51c3dfcfa445
-SIZE (sdlmess0120.zip) = 27756354
+MD5 (sdlmess0122.zip) = 5c159e0ebecf33fb3d4ca213f26b4104
+SHA256 (sdlmess0122.zip) = 8e9e85f11c5171663719992a0fa6ee766eca73285f72bb13f72135c0e1b40ed3
+SIZE (sdlmess0122.zip) = 28795297
diff --git a/emulators/sdlmess/files/patch-makefile.sdl b/emulators/sdlmess/files/patch-makefile.sdl
index d892918261fd..e94ac72ee001 100644
--- a/emulators/sdlmess/files/patch-makefile.sdl
+++ b/emulators/sdlmess/files/patch-makefile.sdl
@@ -1,8 +1,8 @@
---- makefile.sdl.orig	Fri Aug 31 10:41:30 2007
-+++ makefile.sdl	Fri Aug 31 11:22:15 2007
-@@ -66,11 +66,13 @@
- # uncomment next line to include the debugger
- # DEBUG = 1
+--- ./makefile.sdl.orig	Mon Dec 31 13:41:23 2007
++++ ./makefile.sdl	Mon Feb  4 13:15:31 2008
+@@ -99,11 +99,13 @@
+ # uncomment next line to include the internal profiler
+ # PROFILER = 1
  
 +ifeq ($(ARCH),i386)
  # uncomment next line to use DRC MIPS3 engine
@@ -12,10 +12,10 @@
  X86_PPC_DRC = 1
 +endif
  
- # uncomment next line to use DRC Voodoo rasterizers
- # X86_VOODOO_DRC = 1
-@@ -96,7 +98,9 @@
- # CELL = 1
+ 
+ 
+@@ -113,7 +115,9 @@
+ #-------------------------------------------------
  
  # uncomment next line if you are building for a 64-bit target
 -# PTR64 = 1
@@ -23,62 +23,60 @@
 +PTR64 = 1
 +endif
  
- # uncomment next line to build expat as part of MAME build
- BUILD_EXPAT = 1
-@@ -160,8 +164,8 @@
+ # uncomment next line if you are building for a big-endian target
+ # BIGENDIAN = 1
+@@ -186,8 +190,8 @@
  
  # compiler, linker and utilities
  AR = @ar
 -CC = @gcc
 -LD = @gcc
 +CC := @$(CC)
-+LD = @$(CC)
- HHC = @-hhc
++LD := @$(CC)
  MD = -mkdir$(EXE)
  RM = @rm -f
-@@ -258,8 +262,8 @@
+ 
+@@ -211,7 +215,7 @@
  endif
  
- # fullname is prefix+name+suffix
--FULLNAME = $(PREFIX)$(NAME)$(SUFFIX)
--FULLGUINAME = $(PREFIX)$(NAME)gui$(SUFFIX)
+ # fullname is prefix+name+suffix+debugsuffix
+-FULLNAME = $(PREFIX)$(NAME)$(SUFFIX)$(DEBUGSUFFIX)
 +FULLNAME = $(NAME)
-+FULLGUINAME = $(NAME)gui
  
  # add an EXE suffix to get the final emulator name
- EMULATORCLI = $(FULLNAME)$(EXE)
-@@ -325,7 +329,7 @@
+ EMULATOR = $(FULLNAME)$(EXE)
+@@ -276,7 +280,7 @@
  #-------------------------------------------------
  
  # we compile to C89 standard with GNU extensions
 -CFLAGS = -std=gnu89
 +CFLAGS += -std=gnu89
  
- # add -g if we need symbols
- ifdef SYMBOLS
-@@ -356,7 +360,7 @@
+ # this speeds it up a bit by piping between the preprocessor/compiler/assembler
+ CFLAGS += -pipe
+@@ -313,7 +317,7 @@
+ # if we are optimizing, include optimization options
  # and make all errors into warnings
- # but not on 64-bit or debug builds
  ifneq ($(OPTIMIZE),0)
--CFLAGS += $(ARCH) -fno-strict-aliasing
-+CFLAGS += -fno-strict-aliasing
+-CFLAGS += -Werror $(ARCHOPTS) -fno-strict-aliasing
++CFLAGS += $(ARCHOPTS) -fno-strict-aliasing
+ #CFLAGS += $(ARCHOPTS) -fno-strict-aliasing
+ endif
  
- # only -Werror if not PTR64 and not DEBUG
- ifndef PTR64
-@@ -397,6 +401,7 @@
+@@ -339,6 +343,7 @@
  	-I$(SRC)/lib/util \
  	-I$(SRC)/osd \
  	-I$(SRC)/osd/$(OSD) \
 +        -I$(LOCALBASE)/include
  
- ifdef MESS
- CFLAGS += \
-@@ -412,7 +417,7 @@
  
+ 
+@@ -349,7 +354,7 @@
  # LDFLAGS are used generally; LDFLAGSEMULATOR are additional
  # flags only used when linking the core emulator
--LDFLAGS = 
-+LDFLAGS += -L$(LOCALBASE)/lib 
- LDFLAGSEMULATOR =
- 
- # strip symbols and other metadata in non-symbols builds
+ ifneq ($(TARGETOS),macosx)
+-LDFLAGS = -Wl,--warn-common
++LDFLAGS = -Wl,--warn-common -L$(LOCALBASE)/lib
+ else
+ LDFLAGS = 
+ endif
diff --git a/emulators/sdlmess/files/patch-src__mess__mess.mak b/emulators/sdlmess/files/patch-src__mess__mess.mak
deleted file mode 100644
index 14ece8917c77..000000000000
--- a/emulators/sdlmess/files/patch-src__mess__mess.mak
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/mess/mess.mak.orig	Tue Oct 16 11:24:59 2007
-+++ ./src/mess/mess.mak	Thu Nov 29 15:25:32 2007
-@@ -13,7 +13,7 @@
- EMUSRC = $(SRC)/emu
- EMUOBJ = $(OBJ)/emu
- 
--EMU_AUDIO = $(ENUOBJ)/audio
-+EMU_AUDIO = $(EMUOBJ)/audio
- EMU_MACHINE = $(EMUOBJ)/machine
- EMU_VIDEO = $(EMUOBJ)/video
- MAME_AUDIO = $(MAMEOBJ)/audio
diff --git a/emulators/sdlmess/pkg-plist b/emulators/sdlmess/pkg-plist
index 4da7f55d02e9..36b050bc764e 100644
--- a/emulators/sdlmess/pkg-plist
+++ b/emulators/sdlmess/pkg-plist
@@ -7,11 +7,11 @@ libexec/sdlmess/imgtool
 libexec/sdlmess/jedutil
 libexec/sdlmess/makemeta
 libexec/sdlmess/mess
-libexec/sdlmess/messdocs
 libexec/sdlmess/messtest
 libexec/sdlmess/regrep
 libexec/sdlmess/romcmp
 libexec/sdlmess/srcclean
+libexec/sdlmess/src2html
 libexec/sdlmess/testkeys
 %%PORTDOCS%%%%DOCSDIR%%/SDLMESS.txt
 %%PORTDOCS%%%%DOCSDIR%%/whatsnew.txt
@@ -109,6 +109,7 @@ libexec/sdlmess/testkeys
 %%DATADIR%%/hash/ep128.hsi
 %%DATADIR%%/hash/exidy.hsi
 %%DATADIR%%/hash/gameboy.hsi
+%%DATADIR%%/hash/gamecom.hsi
 %%DATADIR%%/hash/gamegear.hsi
 %%DATADIR%%/hash/genesis.hsi
 %%DATADIR%%/hash/ibmpc.hsi
@@ -151,10 +152,12 @@ libexec/sdlmess/testkeys
 %%DATADIR%%/hash/vectrex.hsi
 %%DATADIR%%/hash/vic20.hsi
 %%DATADIR%%/hash/wswan.hsi
+%%DATADIR%%/keymaps/km-be.txt
 %%DATADIR%%/keymaps/km-ch.txt
 %%DATADIR%%/keymaps/km-de.txt
 %%DATADIR%%/keymaps/km-fr-OSX.txt
 %%DATADIR%%/keymaps/km-fr.txt
+%%DATADIR%%/keymaps/km_it.txt
 %%DATADIR%%/sysinfo.dat
 @dirrm %%DATADIR%%/keymaps
 @dirrm %%DATADIR%%/hash