- Update to 0.057

PR:		140818
Submitted by:	Emmanuel Vadot <elbarto@arcadebsd.org> (maintainer)

5 files changed, 59 insertions, 43 deletions

diff --git a/emulators/bsnes/Makefile b/emulators/bsnes/Makefile
index ec37f199df1c..c48824df6892 100644
--- a/emulators/bsnes/Makefile
+++ b/emulators/bsnes/Makefile
@@ -5,11 +5,12 @@
 # $FreeBSD$
 
 PORTNAME=	bsnes
-PORTVERSION=	0.50
+PORTVERSION=	0.57
 CATEGORIES=	emulators
-MASTER_SITES=	http://byuusan.kuro-hitsuji.net/ \
+MASTER_SITES=	http://byuu.org/files/ \
 		ftp://ftp.arcadebsd.org/pub/ArcadeBSD/ports/distfiles/
-DISTNAME=	${PORTNAME}_v${PORTVERSION:S/.//}
+DISTNAME=	${PORTNAME}_v${PORTVERSION:S/.//}${EXTRACT_SUFX} snesreader_v009${EXTRACT_SUFX} \
+		snesfilter_v006${EXTRACT_SUFX} supergameboy_v013
 
 MAINTAINER=	elbarto@ArcadeBSD.org
 COMMENT=	Super Nintendo/Super Famicom emulator
@@ -21,8 +22,9 @@ USE_QT_VER=	4
 QT_COMPONENTS=	qmake_build uic_build moc_build rcc_build gui
 
 ONLY_FOR_ARCHS=	i386 amd64
-WRKSRC=		${WRKDIR}/src/
-MAKE_ENV+=	enable_gzip=true
+WRKSRC=		${WRKDIR}/
+MAKE_ENV+=	moc=moc-qt4
+USE_LDCONFIG=	yes
 
 OPTIONS=	VIDEO_GLX "Build GLX Video Driver" on \
 		VIDEO_XV "Build Xv Video Driver" off \
@@ -95,14 +97,23 @@ IGNORE=	you have to choose at least a audio driver first
 IGNORE=	you have to choose at least an input driver first
 .endif
 
-PLIST_FILES=	bin/bsnes
-
 post-patch:
-	${REINPLACE_CMD} -e 's|VIDEO|${VIDEO_DRIVER}|' ${WRKSRC}/Makefile
-	${REINPLACE_CMD} -e 's|AUDIO|${AUDIO_DRIVER}|' ${WRKSRC}/Makefile
-	${REINPLACE_CMD} -e 's|INPUT|${INPUT_DRIVER}|' ${WRKSRC}/Makefile
+	${REINPLACE_CMD} -e 's|VIDEO|${VIDEO_DRIVER}|' ${WRKSRC}/src/Makefile
+	${REINPLACE_CMD} -e 's|AUDIO|${AUDIO_DRIVER}|' ${WRKSRC}/src/Makefile
+	${REINPLACE_CMD} -e 's|INPUT|${INPUT_DRIVER}|' ${WRKSRC}/src/Makefile
+
+do-build:
+	(cd ${WRKSRC}/src && ${GMAKE} ${MAKE_ENV})
+	(cd ${WRKSRC}/snesreader && ${GMAKE} ${MAKE_ENV})
+	(cd ${WRKSRC}/snesfilter && ${GMAKE} ${MAKE_ENV})
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/../${PORTNAME} ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/
+	${MKDIR} ${PREFIX}/share/pixmaps
+	${INSTALL_DATA} ${WRKSRC}/src/data/bsnes.png ${PREFIX}/share/pixmaps/bsnes.png
+	${MKDIR} ${PREFIX}/share/applications
+	${INSTALL_DATA} ${WRKSRC}/src/data/bsnes.desktop ${PREFIX}/share/applications/bsnes.desktop
+	${INSTALL_DATA} ${WRKSRC}/snesreader/libsnesreader.so ${PREFIX}/lib/
+	${INSTALL_DATA} ${WRKSRC}/snesfilter/libsnesfilter.so ${PREFIX}/lib/
 
 .include <bsd.port.post.mk>
diff --git a/emulators/bsnes/distinfo b/emulators/bsnes/distinfo
index 17bf2cd8f2df..195ccfaa4044 100644
--- a/emulators/bsnes/distinfo
+++ b/emulators/bsnes/distinfo
@@ -1,3 +1,12 @@
-MD5 (bsnes_v050.tar.bz2) = 4110df89063f7b19e3df38bdaecc9cf0
-SHA256 (bsnes_v050.tar.bz2) = 0c1e167693cd250ca4bf5c68aef98f08664a9c1cb4a1b22e1a75dea64035c4b4
-SIZE (bsnes_v050.tar.bz2) = 547963
+MD5 (bsnes_v057.tar.bz2) = 859d4f21da5c8b36a2c2771922e6447c
+SHA256 (bsnes_v057.tar.bz2) = f423c6c0714ab83fdbaa4aa1f303d847bbbaf77b4353458b09d7ce61f1867b2c
+SIZE (bsnes_v057.tar.bz2) = 444914
+MD5 (snesreader_v009.tar.bz2) = 0c5fede1e8a5e97a5cee59e9902ef8cc
+SHA256 (snesreader_v009.tar.bz2) = 120625db61fae9649fb477e83c37605458e0b8a50f73d3082b2876be9fbacae5
+SIZE (snesreader_v009.tar.bz2) = 460024
+MD5 (snesfilter_v006.tar.bz2) = 43011d340e16da167f5c584f6d753bd2
+SHA256 (snesfilter_v006.tar.bz2) = 6a6cb4fcac884c093f25a3bdfe7f06f93c992a4ece8a4947800c7640d95ac559
+SIZE (snesfilter_v006.tar.bz2) = 87050
+MD5 (supergameboy_v013.tar.bz2) = 8941ee749f502ab1fd3d870338ac8aa9
+SHA256 (supergameboy_v013.tar.bz2) = d6c49b4d4f80aa575b7fbc03bea3a150b0afee224d614a85efeaec97e5c5ae04
+SIZE (supergameboy_v013.tar.bz2) = 351644
diff --git a/emulators/bsnes/files/patch-Makefile b/emulators/bsnes/files/patch-Makefile
index 82021d0604f2..abb88a7388d7 100644
--- a/emulators/bsnes/files/patch-Makefile
+++ b/emulators/bsnes/files/patch-Makefile
@@ -1,29 +1,28 @@
---- Makefile.orig	2009-06-07 01:56:29.000000000 +0000
-+++ Makefile	2009-07-03 10:10:19.032836854 +0000
-@@ -6,8 +6,8 @@
+--- src/Makefile.orig	2009-11-01 00:45:19.000000000 +0100
++++ src/Makefile	2009-11-01 00:45:50.000000000 +0100
+@@ -6,9 +6,9 @@
  ### compiler ###
  ################
  
 -c     := $(compiler)
 -cpp   := $(subst cc,++,$(compiler))
+-flags := -O3 -fomit-frame-pointer -Ilib
 +c     := ${CC}
 +cpp   := ${CXX}
- flags := -O3 -fomit-frame-pointer -Ilib
++flags := -O3 -fomit-frame-pointer -Ilib -I${LOCALBASE}/include
  link  :=
  
-@@ -36,6 +36,15 @@
-   ruby += input.carbon
+ # profile-guided instrumentation:
+@@ -25,9 +25,9 @@
+ ifeq ($(platform),x)
+   link += -s
  
-   link += $(if $(findstring audio.openal,$(ruby)),-framework OpenAL)
-+else ifeq ($(platform),bsd)
-+  link += -s
-+  flags += -I${LOCALBASE}/include
-+
+-  ruby := video.glx video.xv video.qtraster video.sdl
+-  ruby += audio.alsa audio.openal audio.oss audio.pulseaudio audio.ao
+-  ruby += input.sdl input.x
 +  ruby := VIDEO
 +  ruby += AUDIO
 +  ruby += INPUT
-+
-+  link += $(if $(findstring audio.openal,$(ruby)),-lopenal)
- else ifeq ($(platform),win)
-   link += -mwindows
- # link += -mconsole
+ 
+   link += $(if $(findstring audio.openal,$(ruby)),-lopenal)
+ else ifeq ($(platform),osx)
diff --git a/emulators/bsnes/files/patch-Makefile-libnall b/emulators/bsnes/files/patch-Makefile-libnall
index fea6fdb99d43..109b2eb63b0e 100644
--- a/emulators/bsnes/files/patch-Makefile-libnall
+++ b/emulators/bsnes/files/patch-Makefile-libnall
@@ -1,16 +1,6 @@
---- lib/nall/Makefile.orig	2009-06-05 08:23:39.000000000 +0000
-+++ lib/nall/Makefile	2009-07-03 10:19:25.113813347 +0000
-@@ -22,6 +22,9 @@
-   else ifneq ($(findstring Darwin,$(uname)),)
-     platform := osx
-     delete = rm -f $1
-+  else ifneq ($(findstring FreeBSD,$(uname)),)
-+    platform := bsd
-+    delete = rm -f $1
-   else
-     platform := x
-     delete = rm -f $1
-@@ -29,11 +32,11 @@
+--- src/lib/nall/Makefile.orig	2009-11-01 00:30:05.000000000 +0100
++++ src/lib/nall/Makefile	2009-11-01 00:30:26.000000000 +0100
+@@ -29,11 +29,11 @@
  endif
  
  ifeq ($(compiler),)
diff --git a/emulators/bsnes/pkg-plist b/emulators/bsnes/pkg-plist
new file mode 100644
index 000000000000..7083f179266b
--- /dev/null
+++ b/emulators/bsnes/pkg-plist
@@ -0,0 +1,7 @@
+bin/bsnes
+lib/libsnesfilter.so
+lib/libsnesreader.so
+lib/libsupergameboy.so
+share/applications/bsnes.desktop
+share/pixmaps/bsnes.png
+@dirrmtry share/applications