4 files changed, 240 insertions, 9 deletions

diff --git a/emulators/qmc2/Makefile b/emulators/qmc2/Makefile
index 4ac96a4a02eb..82dce43c820c 100644
--- a/emulators/qmc2/Makefile
+++ b/emulators/qmc2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	qmc2
-PORTVERSION=	0.1.b10
+PORTVERSION=	0.1.b11
 CATEGORIES=	emulators
 MASTER_SITES=	SF
 
@@ -19,7 +19,7 @@ USE_QT_VER=	4
 MAKE_ENV=	QTDIR="${QTDIR}" QMAKE="${QMAKE}" SYSCONFDIR="${PREFIX}/etc"
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-OPTIONS=	XMAME "Enable support for XMAME instead of SDLMAME" off
+OPTIONS=	XMAME "Use XMAME (old) instead of SDLMAME (new) as emulator" off
 
 .include <bsd.port.pre.mk>
 
diff --git a/emulators/qmc2/distinfo b/emulators/qmc2/distinfo
index 69050a91de75..b26ae5ec3147 100644
--- a/emulators/qmc2/distinfo
+++ b/emulators/qmc2/distinfo
@@ -1,3 +1,3 @@
-MD5 (qmc2-0.1.b10.tar.bz2) = 270b7e579ba70b4626c62e422e124e55
-SHA256 (qmc2-0.1.b10.tar.bz2) = 418e4afedfde1e9fd65cdf6882a393f666e990cddf4c0de5c5ad8376b352c65a
-SIZE (qmc2-0.1.b10.tar.bz2) = 681402
+MD5 (qmc2-0.1.b11.tar.bz2) = 0ffcb89b7f1ce450c36cf74ff238b996
+SHA256 (qmc2-0.1.b11.tar.bz2) = fe2a3001a5dc4f1546b18e99a3be914829fb6555f39ae879869b37313c23f190
+SIZE (qmc2-0.1.b11.tar.bz2) = 919164
diff --git a/emulators/qmc2/files/patch-Makefile b/emulators/qmc2/files/patch-Makefile
index 6887a92f0c3a..f0f64d854dcd 100644
--- a/emulators/qmc2/files/patch-Makefile
+++ b/emulators/qmc2/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	Sun Jul 15 20:58:44 2007
-+++ Makefile	Mon Jul 23 06:06:32 2007
+--- Makefile.orig	Fri Dec 21 14:43:29 2007
++++ Makefile	Thu Jan  3 20:55:16 2008
 @@ -36,9 +36,6 @@
  # you want to compile a specific OS's code branch or if the "uname"
  # command doesn't tell the correct OS name of your system (see also OSREL and
@@ -10,7 +10,7 @@
  
  # OSREL: target system's OS-release - please only change this if you know what
  # you are doing :).
-@@ -77,9 +74,9 @@
+@@ -82,9 +79,9 @@
  # commands are platform/distribution-specific
  include arch/default.cfg
  ifeq '$(OSCFG)' '1'
@@ -23,12 +23,13 @@
  endif
  endif
  ifeq '$(DISTCFG)' '1'
-@@ -204,15 +201,16 @@
+@@ -211,16 +208,17 @@
  
  install: bin lang
  	@echo "Installing QMC2 v$(VERSION)"
 -	@$(MKDIR) $(DESTDIR)/$(PREFIX)/bin $(DESTDIR)/$(PREFIX)/share/$(PROJECT) $(DESTDIR)/$(SYSCONFDIR)/$(PROJECT)
 -	@$(RSYNC) --exclude '*svn*' ./$(PROJECT) $(DESTDIR)/$(PREFIX)/bin
+-	@$(RSYNC) --exclude '*svn*' ./scripts/romalyzer.pl $(DESTDIR)/$(PREFIX)/bin
 -	@$(RSYNC) --exclude '*svn*' ./data/lng/*.qm $(DESTDIR)/$(DATADIR)/$(PROJECT)/lng/
 -	@$(RSYNC) --exclude '*svn*' ./data/opt $(DESTDIR)/$(DATADIR)/$(PROJECT)/
 -	@$(RSYNC) --exclude '*svn*' ./data/img $(DESTDIR)/$(DATADIR)/$(PROJECT)/
@@ -38,6 +39,7 @@
 -	@$(SED) -e "s_DATADIR_$(DATADIR)_g" < ./inst/$(PROJECT).ini.template > $(DESTDIR)/$(SYSCONFDIR)/$(PROJECT)/$(PROJECT).ini
 +	@$(MKDIR) $(DESTDIR)/$(PREFIX)/bin $(DESTDIR)/$(PREFIX)/share/$(PROJECT) $(DESTDIR)/$(SYSCONFDIR)/$(PROJECT) $(DESTDIR)/$(PREFIX)/share/$(PROJECT)/lng
 +	@$(CP) -r ./$(PROJECT) $(DESTDIR)/$(PREFIX)/bin
++	@$(CP) -r ./scripts/romalyzer.pl $(DESTDIR)/$(DATADIR)/$(PROJECT)/
 +	@$(CP) -r ./data/lng/*.qm $(DESTDIR)/$(DATADIR)/$(PROJECT)/lng/
 +	@$(CP) -r ./data/opt $(DESTDIR)/$(DATADIR)/$(PROJECT)/
 +	@$(CP) -r ./data/img $(DESTDIR)/$(DATADIR)/$(PROJECT)/
diff --git a/emulators/qmc2/pkg-plist b/emulators/qmc2/pkg-plist
index ff485ec2a655..5c1a64d8c9a8 100644
--- a/emulators/qmc2/pkg-plist
+++ b/emulators/qmc2/pkg-plist
@@ -41,10 +41,229 @@ etc/qmc2/qmc2.ini.sample
 %%DATADIR%%/img/back.png
 %%DATADIR%%/img/camera.png
 %%DATADIR%%/img/cd.png
+%%DATADIR%%/img/classic/back.png
+%%DATADIR%%/img/classic/camera.png
+%%DATADIR%%/img/classic/cd.png
+%%DATADIR%%/img/classic/clock.png
+%%DATADIR%%/img/classic/colors.png
+%%DATADIR%%/img/classic/configure.png
+%%DATADIR%%/img/classic/controller.png
+%%DATADIR%%/img/classic/down.png
+%%DATADIR%%/img/classic/edit.png
+%%DATADIR%%/img/classic/editcopy.png
+%%DATADIR%%/img/classic/editcut.png
+%%DATADIR%%/img/classic/editdelete.png
+%%DATADIR%%/img/classic/editpaste.png
+%%DATADIR%%/img/classic/edittrash.png
+%%DATADIR%%/img/classic/exit.png
+%%DATADIR%%/img/classic/favorites.png
+%%DATADIR%%/img/classic/fileclose.png
+%%DATADIR%%/img/classic/filefind.png
+%%DATADIR%%/img/classic/filenew.png
+%%DATADIR%%/img/classic/fileopen.png
+%%DATADIR%%/img/classic/fileprint.png
+%%DATADIR%%/img/classic/filesave.png
+%%DATADIR%%/img/classic/filesaveas.png
+%%DATADIR%%/img/classic/find.png
+%%DATADIR%%/img/classic/fonts.png
+%%DATADIR%%/img/classic/forward.png
+%%DATADIR%%/img/classic/ghost.png
+%%DATADIR%%/img/classic/help.png
+%%DATADIR%%/img/classic/hint.png
+%%DATADIR%%/img/classic/hint_small.png
+%%DATADIR%%/img/classic/home.png
+%%DATADIR%%/img/classic/icon.png
+%%DATADIR%%/img/classic/info.png
+%%DATADIR%%/img/classic/keyboard.png
+%%DATADIR%%/img/classic/kill.png
+%%DATADIR%%/img/classic/launch.png
+%%DATADIR%%/img/classic/locale.png
+%%DATADIR%%/img/classic/lock.png
+%%DATADIR%%/img/classic/mame.png
+%%DATADIR%%/img/classic/next-sail.png
+%%DATADIR%%/img/classic/next.png
+%%DATADIR%%/img/classic/no.png
+%%DATADIR%%/img/classic/pencils.png
+%%DATADIR%%/img/classic/previous-sail.png
+%%DATADIR%%/img/classic/previous.png
+%%DATADIR%%/img/classic/qt-logo.png
+%%DATADIR%%/img/classic/redo.png
+%%DATADIR%%/img/classic/reload.png
+%%DATADIR%%/img/classic/rom.png
+%%DATADIR%%/img/classic/search.png
+%%DATADIR%%/img/classic/sound.png
+%%DATADIR%%/img/classic/sphere_blue.png
+%%DATADIR%%/img/classic/sphere_blue_bios.png
+%%DATADIR%%/img/classic/sphere_green.png
+%%DATADIR%%/img/classic/sphere_green_bios.png
+%%DATADIR%%/img/classic/sphere_grey.png
+%%DATADIR%%/img/classic/sphere_grey_bios.png
+%%DATADIR%%/img/classic/sphere_red.png
+%%DATADIR%%/img/classic/sphere_red_bios.png
+%%DATADIR%%/img/classic/sphere_yellowgreen.png
+%%DATADIR%%/img/classic/sphere_yellowgreen_bios.png
+%%DATADIR%%/img/classic/stop.png
+%%DATADIR%%/img/classic/terminate.png
+%%DATADIR%%/img/classic/thumbnail.png
+%%DATADIR%%/img/classic/time.png
+%%DATADIR%%/img/classic/undo.png
+%%DATADIR%%/img/classic/unlock.png
+%%DATADIR%%/img/classic/up.png
+%%DATADIR%%/img/classic/viewmag+.png
+%%DATADIR%%/img/classic/viewmag-.png
+%%DATADIR%%/img/classic/viewmagfit.png
+%%DATADIR%%/img/classic/work.png
+%%DATADIR%%/img/classic/yes.png
 %%DATADIR%%/img/clock.png
 %%DATADIR%%/img/colors.png
 %%DATADIR%%/img/configure.png
 %%DATADIR%%/img/controller.png
+%%DATADIR%%/img/crazy-black/back.png
+%%DATADIR%%/img/crazy-black/camera.png
+%%DATADIR%%/img/crazy-black/cd.png
+%%DATADIR%%/img/crazy-black/clock.png
+%%DATADIR%%/img/crazy-black/colors.png
+%%DATADIR%%/img/crazy-black/configure.png
+%%DATADIR%%/img/crazy-black/controller.png
+%%DATADIR%%/img/crazy-black/down.png
+%%DATADIR%%/img/crazy-black/edit.png
+%%DATADIR%%/img/crazy-black/editcopy.png
+%%DATADIR%%/img/crazy-black/editcut.png
+%%DATADIR%%/img/crazy-black/editdelete.png
+%%DATADIR%%/img/crazy-black/editpaste.png
+%%DATADIR%%/img/crazy-black/edittrash.png
+%%DATADIR%%/img/crazy-black/exit.png
+%%DATADIR%%/img/crazy-black/favorites.png
+%%DATADIR%%/img/crazy-black/fileclose.png
+%%DATADIR%%/img/crazy-black/filefind.png
+%%DATADIR%%/img/crazy-black/filenew.png
+%%DATADIR%%/img/crazy-black/fileopen.png
+%%DATADIR%%/img/crazy-black/fileprint.png
+%%DATADIR%%/img/crazy-black/filesave.png
+%%DATADIR%%/img/crazy-black/filesaveas.png
+%%DATADIR%%/img/crazy-black/find.png
+%%DATADIR%%/img/crazy-black/fonts.png
+%%DATADIR%%/img/crazy-black/forward.png
+%%DATADIR%%/img/crazy-black/ghost.png
+%%DATADIR%%/img/crazy-black/help.png
+%%DATADIR%%/img/crazy-black/hint.png
+%%DATADIR%%/img/crazy-black/hint_small.png
+%%DATADIR%%/img/crazy-black/home.png
+%%DATADIR%%/img/crazy-black/icon.png
+%%DATADIR%%/img/crazy-black/info.png
+%%DATADIR%%/img/crazy-black/keyboard.png
+%%DATADIR%%/img/crazy-black/kill.png
+%%DATADIR%%/img/crazy-black/launch.png
+%%DATADIR%%/img/crazy-black/locale.png
+%%DATADIR%%/img/crazy-black/lock.png
+%%DATADIR%%/img/crazy-black/mame.png
+%%DATADIR%%/img/crazy-black/next-sail.png
+%%DATADIR%%/img/crazy-black/next.png
+%%DATADIR%%/img/crazy-black/no.png
+%%DATADIR%%/img/crazy-black/pencils.png
+%%DATADIR%%/img/crazy-black/previous-sail.png
+%%DATADIR%%/img/crazy-black/previous.png
+%%DATADIR%%/img/crazy-black/qt-logo.png
+%%DATADIR%%/img/crazy-black/redo.png
+%%DATADIR%%/img/crazy-black/reload.png
+%%DATADIR%%/img/crazy-black/rom.png
+%%DATADIR%%/img/crazy-black/search.png
+%%DATADIR%%/img/crazy-black/sound.png
+%%DATADIR%%/img/crazy-black/sphere_blue.png
+%%DATADIR%%/img/crazy-black/sphere_blue_bios.png
+%%DATADIR%%/img/crazy-black/sphere_green.png
+%%DATADIR%%/img/crazy-black/sphere_green_bios.png
+%%DATADIR%%/img/crazy-black/sphere_grey.png
+%%DATADIR%%/img/crazy-black/sphere_grey_bios.png
+%%DATADIR%%/img/crazy-black/sphere_red.png
+%%DATADIR%%/img/crazy-black/sphere_red_bios.png
+%%DATADIR%%/img/crazy-black/sphere_yellowgreen.png
+%%DATADIR%%/img/crazy-black/sphere_yellowgreen_bios.png
+%%DATADIR%%/img/crazy-black/stop.png
+%%DATADIR%%/img/crazy-black/terminate.png
+%%DATADIR%%/img/crazy-black/thumbnail.png
+%%DATADIR%%/img/crazy-black/time.png
+%%DATADIR%%/img/crazy-black/undo.png
+%%DATADIR%%/img/crazy-black/unlock.png
+%%DATADIR%%/img/crazy-black/up.png
+%%DATADIR%%/img/crazy-black/viewmag+.png
+%%DATADIR%%/img/crazy-black/viewmag-.png
+%%DATADIR%%/img/crazy-black/viewmagfit.png
+%%DATADIR%%/img/crazy-black/work.png
+%%DATADIR%%/img/crazy-black/yes.png
+%%DATADIR%%/img/crazy/back.png
+%%DATADIR%%/img/crazy/camera.png
+%%DATADIR%%/img/crazy/cd.png
+%%DATADIR%%/img/crazy/clock.png
+%%DATADIR%%/img/crazy/colors.png
+%%DATADIR%%/img/crazy/configure.png
+%%DATADIR%%/img/crazy/controller.png
+%%DATADIR%%/img/crazy/down.png
+%%DATADIR%%/img/crazy/edit.png
+%%DATADIR%%/img/crazy/editcopy.png
+%%DATADIR%%/img/crazy/editcut.png
+%%DATADIR%%/img/crazy/editdelete.png
+%%DATADIR%%/img/crazy/editpaste.png
+%%DATADIR%%/img/crazy/edittrash.png
+%%DATADIR%%/img/crazy/exit.png
+%%DATADIR%%/img/crazy/favorites.png
+%%DATADIR%%/img/crazy/fileclose.png
+%%DATADIR%%/img/crazy/filefind.png
+%%DATADIR%%/img/crazy/filenew.png
+%%DATADIR%%/img/crazy/fileopen.png
+%%DATADIR%%/img/crazy/fileprint.png
+%%DATADIR%%/img/crazy/filesave.png
+%%DATADIR%%/img/crazy/filesaveas.png
+%%DATADIR%%/img/crazy/find.png
+%%DATADIR%%/img/crazy/fonts.png
+%%DATADIR%%/img/crazy/forward.png
+%%DATADIR%%/img/crazy/ghost.png
+%%DATADIR%%/img/crazy/help.png
+%%DATADIR%%/img/crazy/hint.png
+%%DATADIR%%/img/crazy/hint_small.png
+%%DATADIR%%/img/crazy/home.png
+%%DATADIR%%/img/crazy/icon.png
+%%DATADIR%%/img/crazy/info.png
+%%DATADIR%%/img/crazy/keyboard.png
+%%DATADIR%%/img/crazy/kill.png
+%%DATADIR%%/img/crazy/launch.png
+%%DATADIR%%/img/crazy/locale.png
+%%DATADIR%%/img/crazy/lock.png
+%%DATADIR%%/img/crazy/mame.png
+%%DATADIR%%/img/crazy/next-sail.png
+%%DATADIR%%/img/crazy/next.png
+%%DATADIR%%/img/crazy/no.png
+%%DATADIR%%/img/crazy/pencils.png
+%%DATADIR%%/img/crazy/previous-sail.png
+%%DATADIR%%/img/crazy/previous.png
+%%DATADIR%%/img/crazy/qt-logo.png
+%%DATADIR%%/img/crazy/redo.png
+%%DATADIR%%/img/crazy/reload.png
+%%DATADIR%%/img/crazy/rom.png
+%%DATADIR%%/img/crazy/search.png
+%%DATADIR%%/img/crazy/sound.png
+%%DATADIR%%/img/crazy/sphere_blue.png
+%%DATADIR%%/img/crazy/sphere_blue_bios.png
+%%DATADIR%%/img/crazy/sphere_green.png
+%%DATADIR%%/img/crazy/sphere_green_bios.png
+%%DATADIR%%/img/crazy/sphere_grey.png
+%%DATADIR%%/img/crazy/sphere_grey_bios.png
+%%DATADIR%%/img/crazy/sphere_red.png
+%%DATADIR%%/img/crazy/sphere_red_bios.png
+%%DATADIR%%/img/crazy/sphere_yellowgreen.png
+%%DATADIR%%/img/crazy/sphere_yellowgreen_bios.png
+%%DATADIR%%/img/crazy/stop.png
+%%DATADIR%%/img/crazy/terminate.png
+%%DATADIR%%/img/crazy/thumbnail.png
+%%DATADIR%%/img/crazy/time.png
+%%DATADIR%%/img/crazy/undo.png
+%%DATADIR%%/img/crazy/unlock.png
+%%DATADIR%%/img/crazy/up.png
+%%DATADIR%%/img/crazy/viewmag+.png
+%%DATADIR%%/img/crazy/viewmag-.png
+%%DATADIR%%/img/crazy/viewmagfit.png
+%%DATADIR%%/img/crazy/work.png
+%%DATADIR%%/img/crazy/yes.png
 %%DATADIR%%/img/down.png
 %%DATADIR%%/img/edit.png
 %%DATADIR%%/img/editcopy.png
@@ -71,6 +290,7 @@ etc/qmc2/qmc2.ini.sample
 %%DATADIR%%/img/home.png
 %%DATADIR%%/img/icon.png
 %%DATADIR%%/img/info.png
+%%DATADIR%%/img/keyboard.png
 %%DATADIR%%/img/kill.png
 %%DATADIR%%/img/launch.png
 %%DATADIR%%/img/locale.png
@@ -89,10 +309,15 @@ etc/qmc2/qmc2.ini.sample
 %%DATADIR%%/img/search.png
 %%DATADIR%%/img/sound.png
 %%DATADIR%%/img/sphere_blue.png
+%%DATADIR%%/img/sphere_blue_bios.png
 %%DATADIR%%/img/sphere_green.png
+%%DATADIR%%/img/sphere_green_bios.png
 %%DATADIR%%/img/sphere_grey.png
+%%DATADIR%%/img/sphere_grey_bios.png
 %%DATADIR%%/img/sphere_red.png
+%%DATADIR%%/img/sphere_red_bios.png
 %%DATADIR%%/img/sphere_yellowgreen.png
+%%DATADIR%%/img/sphere_yellowgreen_bios.png
 %%DATADIR%%/img/stop.png
 %%DATADIR%%/img/terminate.png
 %%DATADIR%%/img/thumbnail.png
@@ -113,11 +338,15 @@ etc/qmc2/qmc2.ini.sample
 %%DATADIR%%/opt/XMAME/template-all.xml
 %%DATADIR%%/opt/XMAME/template.xml
 %%DATADIR%%/opt/template.xml
+%%DATADIR%%/romalyzer.pl
 @dirrm %%DATADIR%%/prv
 @dirrm %%DATADIR%%/opt/XMAME
 @dirrm %%DATADIR%%/opt/SDLMAME
 @dirrm %%DATADIR%%/opt
 @dirrm %%DATADIR%%/lng
+@dirrm %%DATADIR%%/img/crazy-black
+@dirrm %%DATADIR%%/img/crazy
+@dirrm %%DATADIR%%/img/classic
 @dirrm %%DATADIR%%/img
 @dirrm %%DATADIR%%/fly
 @dirrm %%DATADIR%%/doc/html/us/img