7 files changed, 42 insertions, 28 deletions

diff --git a/emulators/qmc2/Makefile b/emulators/qmc2/Makefile
index 655260da7cbe..4ac96a4a02eb 100644
--- a/emulators/qmc2/Makefile
+++ b/emulators/qmc2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	qmc2
-PORTVERSION=	0.1.b9
+PORTVERSION=	0.1.b10
 CATEGORIES=	emulators
 MASTER_SITES=	SF
 
diff --git a/emulators/qmc2/distinfo b/emulators/qmc2/distinfo
index 0b311449548b..69050a91de75 100644
--- a/emulators/qmc2/distinfo
+++ b/emulators/qmc2/distinfo
@@ -1,3 +1,3 @@
-MD5 (qmc2-0.1.b9.tar.bz2) = 9d31f8b2d5de73f66fcde5e0b9771dcf
-SHA256 (qmc2-0.1.b9.tar.bz2) = 56752e9cab2470c5dc52984fe784c15b509f966033bc282cc4ed6780fd049dd7
-SIZE (qmc2-0.1.b9.tar.bz2) = 647379
+MD5 (qmc2-0.1.b10.tar.bz2) = 270b7e579ba70b4626c62e422e124e55
+SHA256 (qmc2-0.1.b10.tar.bz2) = 418e4afedfde1e9fd65cdf6882a393f666e990cddf4c0de5c5ad8376b352c65a
+SIZE (qmc2-0.1.b10.tar.bz2) = 681402
diff --git a/emulators/qmc2/files/patch-Makefile b/emulators/qmc2/files/patch-Makefile
index 4f9d0438c8c7..6887a92f0c3a 100644
--- a/emulators/qmc2/files/patch-Makefile
+++ b/emulators/qmc2/files/patch-Makefile
@@ -1,8 +1,8 @@
---- ./Makefile.orig	Fri Mar 23 15:37:30 2007
-+++ ./Makefile	Mon Jun  4 22:54:25 2007
-@@ -37,9 +37,6 @@
- # you want to test-compile a specific target's code branch or if the "uname"
- # command doesn't tell the correct OS-type of your system (see also OSREL and
+--- Makefile.orig	Sun Jul 15 20:58:44 2007
++++ Makefile	Mon Jul 23 06:06:32 2007
+@@ -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
  # MACHINE)
 -ifndef ARCH
 -ARCH = $(shell uname)
@@ -10,19 +10,23 @@
  
  # OSREL: target system's OS-release - please only change this if you know what
  # you are doing :).
-@@ -66,7 +63,7 @@
- # END OF MAKE OPTIONS
- 
- # commands are platform-specific
+@@ -77,9 +74,9 @@
+ # commands are platform/distribution-specific
+ include arch/default.cfg
+ ifeq '$(OSCFG)' '1'
+-OSCFGFILEEXISTS = $(shell ls "arch/$(ARCH).cfg")
+-ifeq 'arch/$(ARCH).cfg' '$(OSCFGFILEEXISTS)'
 -include arch/$(ARCH).cfg
++OSCFGFILEEXISTS = $(shell ls "arch/FreeBSD.cfg")
++ifeq 'arch/FreeBSD.cfg' '$(OSCFGFILEEXISTS)'
 +include arch/FreeBSD.cfg
- 
- # QMAKEV: qmake version (major release)
- ifndef QMAKEV
-@@ -183,15 +180,16 @@
+ endif
+ endif
+ ifeq '$(DISTCFG)' '1'
+@@ -204,15 +201,16 @@
  
  install: bin lang
- 	@echo "Installing QMC2 build v$(VERSION). Please wait..."
+ 	@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*' ./data/lng/*.qm $(DESTDIR)/$(DATADIR)/$(PROJECT)/lng/
@@ -42,6 +46,6 @@
 +	@$(CP) -r ./data/fly $(DESTDIR)/$(DATADIR)/$(PROJECT)/
 +	@$(SED) -e "s_DATADIR_$(DATADIR)_" < ./inst/$(PROJECT).ini.template > $(DESTDIR)/$(SYSCONFDIR)/$(PROJECT)/$(PROJECT).ini.sample
 +	@test -f $(DESTDIR)/$(SYSCONFDIR)/$(PROJECT)/$(PROJECT).ini || $(CP) $(DESTDIR)/$(SYSCONFDIR)/$(PROJECT)/$(PROJECT).ini.sample $(DESTDIR)/$(SYSCONFDIR)/$(PROJECT)/$(PROJECT).ini
- 	@echo "Installation complete."
+ 	@echo "Installation complete"
  
  clean: Makefile.qmake
diff --git a/emulators/qmc2/files/patch-arch__FreeBSD.cfg b/emulators/qmc2/files/patch-arch__FreeBSD.cfg
index 611fc97b81f8..16def65e7895 100644
--- a/emulators/qmc2/files/patch-arch__FreeBSD.cfg
+++ b/emulators/qmc2/files/patch-arch__FreeBSD.cfg
@@ -1,12 +1,10 @@
---- ./arch/FreeBSD.cfg.orig	Wed Mar 28 14:10:07 2007
-+++ ./arch/FreeBSD.cfg	Mon Jun  4 22:53:48 2007
-@@ -1,7 +1,7 @@
+--- arch/FreeBSD.cfg.orig	Thu May 31 17:07:34 2007
++++ arch/FreeBSD.cfg	Mon Jul 23 06:07:37 2007
+@@ -1,5 +1,5 @@
 -QMAKE    = $(QTDIR)/bin/qmake
 +QMAKE    ?= $(QTDIR)/bin/qmake
  LUPDATE  = $(QTDIR)/bin/lupdate
  LRELEASE = $(QTDIR)/bin/lrelease
 -MAKE     = gmake
 +MAKE     ?= gmake
- MKDIR    = mkdir -p
- RM       = rm -f
- LN       = ln
+ OSNAME   = FreeBSD
diff --git a/emulators/qmc2/files/patch-arch__default.cfg b/emulators/qmc2/files/patch-arch__default.cfg
new file mode 100644
index 000000000000..4fad5ed211d6
--- /dev/null
+++ b/emulators/qmc2/files/patch-arch__default.cfg
@@ -0,0 +1,10 @@
+--- arch/default.cfg.orig	Thu May 31 17:07:34 2007
++++ arch/default.cfg	Mon Jul 23 13:56:14 2007
+@@ -1,7 +1,5 @@
+-QMAKE    = qmake
+ LUPDATE  = lupdate
+ LRELEASE = lrelease
+-MAKE     = make
+ MKDIR    = mkdir -p
+ RM       = rm -f
+ LN       = ln
diff --git a/emulators/qmc2/pkg-message b/emulators/qmc2/pkg-message
index a5f5fa14500d..7f72ed883e1b 100644
--- a/emulators/qmc2/pkg-message
+++ b/emulators/qmc2/pkg-message
@@ -2,11 +2,11 @@
 
 QMC2 has been installed.
 
-You can download game preview images (screenshots) at:
+You can download game preview images (screenshots) and flyer images here:
 
 http://www.mameworld.net/mamecat/download.html
 
-Extract them to a directory (like "~/.qmc/prv") and tell the program where to
-find them in the path configuration.
+Extract them to a directory (like "~/.qmc/prv" and "~/.qmc/fly") and tell the
+program where to find them in the path configuration.
 
 ==============================================================================
diff --git a/emulators/qmc2/pkg-plist b/emulators/qmc2/pkg-plist
index eb9ea25a6de6..ff485ec2a655 100644
--- a/emulators/qmc2/pkg-plist
+++ b/emulators/qmc2/pkg-plist
@@ -69,6 +69,7 @@ etc/qmc2/qmc2.ini.sample
 %%DATADIR%%/img/hint.png
 %%DATADIR%%/img/hint_small.png
 %%DATADIR%%/img/home.png
+%%DATADIR%%/img/icon.png
 %%DATADIR%%/img/info.png
 %%DATADIR%%/img/kill.png
 %%DATADIR%%/img/launch.png
@@ -81,6 +82,7 @@ etc/qmc2/qmc2.ini.sample
 %%DATADIR%%/img/pencils.png
 %%DATADIR%%/img/previous-sail.png
 %%DATADIR%%/img/previous.png
+%%DATADIR%%/img/qt-logo.png
 %%DATADIR%%/img/redo.png
 %%DATADIR%%/img/reload.png
 %%DATADIR%%/img/rom.png