Update virtualjaguar to 2.1.3.

Notable changes:

- GUI now uses Qt 5
- Add new LIB_DEPENDS on audio/libcdio

OK rsadowski@

emulators/virtualjaguar/Makefile

@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.8 2017/07/26 22:45:20 sthen Exp $
+# $OpenBSD: Makefile,v 1.9 2017/10/24 16:48:26 fcambus Exp $
 
 COMMENT =	Atari Jaguar emulator
 
-DISTNAME =	virtualjaguar-2.1.2
-REVISION =	1
+V =		2.1.3
+DISTNAME =	virtualjaguar-${V}
 EXTRACT_SUFX =	.tar.bz2
 
 CATEGORIES =	emulators games
@@ -15,16 +15,17 @@ MAINTAINER =	Frederic Cambus <fcambus@openbsd.org>
 # GPLv3+
 PERMIT_PACKAGE_CDROM =	Yes
 
-WANTLIB +=	GL ICE QtGui QtOpenGL SDL SM X11 Xext Xi Xinerama Xrender
-WANTLIB +=	c fontconfig freetype m pthread ${COMPILER_LIBCXX} z
+WANTLIB +=	${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5OpenGL Qt5Widgets
+WANTLIB +=	SDL c cdio iconv m z
 
 MASTER_SITES=	https://icculus.org/virtualjaguar/tarballs/
 
-MODULES =	x11/qt4
+MODULES =	x11/qt5
 
-LIB_DEPENDS =	devel/sdl
+LIB_DEPENDS =	audio/libcdio \
+		devel/sdl
 
-WRKDIST =	${WRKDIR}/virtualjaguar
+WRKDIST =	${WRKDIR}/linux-${V}
 
 USE_GMAKE =	Yes
 MAKE_FLAGS =	CC="${CC}" \
@@ -38,9 +39,6 @@ MAKE_ENV =	CXXFLAGS="${CXXFLAGS}"
 
 NO_TEST =	Yes
 
-pre-configure:
-	@ln -s ${LOCALBASE}/bin/qmake4 ${WRKDIR}/bin/qmake
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/virtualjaguar ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/docs/virtualjaguar.1 ${PREFIX}/man/man1

emulators/virtualjaguar/distinfo

@@ -1,2 +1,2 @@
-SHA256 (virtualjaguar-2.1.2.tar.bz2) = BNrFGYV++euiTibBq3xz2LlFmcYTqSJZCCYiiWYXU2g=
-SIZE (virtualjaguar-2.1.2.tar.bz2) = 2917041
+SHA256 (virtualjaguar-2.1.3.tar.bz2) = E9DDh6ZZH9I8nOzYQxg0ytRVIjdJRee8zAJ286cgHOo=
+SIZE (virtualjaguar-2.1.3.tar.bz2) = 2911112

emulators/virtualjaguar/patches/patch-Makefile

@@ -1,6 +1,7 @@
-$OpenBSD: patch-Makefile,v 1.1 2017/03/14 10:43:23 fcambus Exp $
---- Makefile.orig	Fri Oct 10 15:54:48 2014
-+++ Makefile	Mon Mar 13 17:25:21 2017
+$OpenBSD: patch-Makefile,v 1.2 2017/10/24 16:48:26 fcambus Exp $
+Index: Makefile
+--- Makefile.orig
++++ Makefile
 @@ -24,8 +24,8 @@ QMAKE_EXTRA := -spec macx-g++
  endif
  
@@ -12,3 +13,12 @@ $OpenBSD: patch-Makefile,v 1.1 2017/03/14 10:43:23 fcambus Exp $
  
  # Add CPPFLAGS
  CFLAGS += $(CPPFLAGS)
+@@ -65,7 +65,7 @@ virtualjaguar: sources libs makefile-qt
+ 
+ makefile-qt: virtualjaguar.pro
+ 	@echo -e "\033[01;33m***\033[00;32m Creating Qt makefile...\033[00m"
+-	$(Q)$(CROSS)qmake -qt=5 $(QMAKE_EXTRA) virtualjaguar.pro -o makefile-qt
++	$(Q)$(CROSS)qmake-qt5 $(QMAKE_EXTRA) virtualjaguar.pro -o makefile-qt
+ 
+ libs: obj/libm68k.a obj/libjaguarcore.a
+ 	@echo -e "\033[01;33m***\033[00;32m Libraries successfully made.\033[00m"

emulators/virtualjaguar/patches/patch-src_cdintf_cpp

@@ -0,0 +1,23 @@
+$OpenBSD: patch-src_cdintf_cpp,v 1.1 2017/10/24 16:48:26 fcambus Exp $
+
+Index: src/cdintf.cpp
+--- src/cdintf.cpp.orig
++++ src/cdintf.cpp
+@@ -36,7 +36,7 @@
+ 
+ 
+ #ifdef HAVE_LIB_CDIO
+-static CdIo_t * cdHandle = NULL;
++static CdIo_t * cdHandle = (CdIo_t *)NULL;
+ #endif
+ 
+ // Exported vars
+@@ -54,7 +54,7 @@ bool CDIntfInit(void)
+ 	// fails, the emulated CD-ROM will not use any of the other CDIntf*
+ 	// functions. Those functions all operate under the assumption that the open
+ 	// call was successful.
+-	cdHandle = cdio_open(NULL, DRIVER_DEVICE);
++	cdHandle = cdio_open((const char *)NULL, DRIVER_DEVICE);
+ 
+ 	if (cdHandle == NULL)
+ 	{

emulators/virtualjaguar/patches/patch-virtualjaguar_pro

@@ -1,7 +1,8 @@
-$OpenBSD: patch-virtualjaguar_pro,v 1.1 2017/03/14 10:43:23 fcambus Exp $
---- virtualjaguar.pro.orig	Fri Oct 10 15:54:48 2014
-+++ virtualjaguar.pro	Mon Mar 13 17:25:21 2017
-@@ -47,8 +47,8 @@ macx  { ICON = res/vj-icon.icns }
+$OpenBSD: patch-virtualjaguar_pro,v 1.2 2017/10/24 16:48:26 fcambus Exp $
+Index: virtualjaguar.pro
+--- virtualjaguar.pro.orig
++++ virtualjaguar.pro
+@@ -53,8 +53,8 @@ macx  { ICON = res/vj-icon.icns }
  # NOTE: May have to put -Wall back in, but only on non-release cycles. It can
  #       cause problems if you're not careful. (Can do this via command line in
  #       qmake)