ports/140155: Update port: emulators/bsnes update to v0.54

Sun Nov 1 01:20:02 UTC 2009

>Number:         140155
>Category:       ports
>Synopsis:       Update port: emulators/bsnes update to v0.54
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 01 01:20:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Emmanuel Vadot
>Release:        8.0-RC2
>Organization:
ArcadeBSD
>Environment:
FreeBSD maetel.arcadebsd.org 8.0-RC2 FreeBSD 8.0-RC2 #1: Mon Oct 26 18:24:56 CET 2009     root at maetel.arcadebsd.org:/usr/obj/usr/src/sys/GENERIC  i386

>Description:
Update port to v0.54
Include snesfilter and snesreader
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -urN /usr/ports/emulators/bsnes/Makefile bsnes/Makefile

--- /usr/ports/emulators/bsnes/Makefile	2009-10-26 18:29:16.000000000 +0100
+++ bsnes/Makefile	2009-11-01 00:59:31.000000000 +0100
@@ -5,11 +5,11 @@
 # $FreeBSD: ports/emulators/bsnes/Makefile,v 1.2 2009/08/28 19:23:31 miwi Exp $
 
 PORTNAME=	bsnes
-PORTVERSION=	0.50
+PORTVERSION=	0.54
 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_v007${EXTRACT_SUFX} snesfilter_v005
 
 MAINTAINER=	elbarto at ArcadeBSD.org
 COMMENT=	Super Nintendo/Super Famicom emulator
@@ -21,8 +21,8 @@
 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
 
 OPTIONS=	VIDEO_GLX "Build GLX Video Driver" on \
 		VIDEO_XV "Build Xv Video Driver" off \
@@ -95,14 +95,19 @@
 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
+	${CP} ${FILESDIR}/Makefile ${WRKSRC}
 
 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 -urN /usr/ports/emulators/bsnes/distinfo bsnes/distinfo
--- /usr/ports/emulators/bsnes/distinfo	2009-10-26 18:29:16.000000000 +0100
+++ bsnes/distinfo	2009-11-01 00:23:34.000000000 +0100
@@ -1,3 +1,9 @@
-MD5 (bsnes_v050.tar.bz2) = 4110df89063f7b19e3df38bdaecc9cf0
-SHA256 (bsnes_v050.tar.bz2) = 0c1e167693cd250ca4bf5c68aef98f08664a9c1cb4a1b22e1a75dea64035c4b4
-SIZE (bsnes_v050.tar.bz2) = 547963
+MD5 (bsnes_v054.tar.bz2) = 499e1665c2cabda399fd0f60c69d0ecd
+SHA256 (bsnes_v054.tar.bz2) = 8c3cff4aabc8c25f89f4bc56327d22a6dc11909662814b5050fad67768015f86
+SIZE (bsnes_v054.tar.bz2) = 441606
+MD5 (snesreader_v007.tar.bz2) = bbf4034d8e5aaf7b9bd7ad5b21b60672
+SHA256 (snesreader_v007.tar.bz2) = 0309dc2d9d572f8109b502a751167b605192d801697a236751477f52487acf2b
+SIZE (snesreader_v007.tar.bz2) = 515265
+MD5 (snesfilter_v005.tar.bz2) = 61d15fbcea4c6956f86366298ee4871c
+SHA256 (snesfilter_v005.tar.bz2) = a5a91423abbf6eb08fae2f15f1fe7d094419f4053daa403f8336662d26c8ef84
+SIZE (snesfilter_v005.tar.bz2) = 89306
diff -urN /usr/ports/emulators/bsnes/files/Makefile bsnes/files/Makefile
--- /usr/ports/emulators/bsnes/files/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ bsnes/files/Makefile	2009-11-01 01:00:39.000000000 +0100
@@ -0,0 +1,4 @@
+all:
+	@gmake -C src
+	@gmake -C snesreader
+	@gmake -C snesfilter
diff -urN /usr/ports/emulators/bsnes/files/patch-Makefile bsnes/files/patch-Makefile
--- /usr/ports/emulators/bsnes/files/patch-Makefile	2009-10-26 18:29:16.000000000 +0100
+++ bsnes/files/patch-Makefile	2009-11-01 00:45:54.000000000 +0100
@@ -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 -urN /usr/ports/emulators/bsnes/files/patch-Makefile-libnall bsnes/files/patch-Makefile-libnall
--- /usr/ports/emulators/bsnes/files/patch-Makefile-libnall	2009-10-26 18:29:16.000000000 +0100
+++ bsnes/files/patch-Makefile-libnall	2009-11-01 00:32:52.000000000 +0100
@@ -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 -urN /usr/ports/emulators/bsnes/files/patch-Makefile-qt-libnall bsnes/files/patch-Makefile-qt-libnall
--- /usr/ports/emulators/bsnes/files/patch-Makefile-qt-libnall	2009-10-26 18:29:16.000000000 +0100
+++ bsnes/files/patch-Makefile-qt-libnall	1970-01-01 01:00:00.000000000 +0100
@@ -1,13 +0,0 @@
---- lib/nall/Makefile-qt.orig	2009-06-15 00:10:35.000000000 +0200
-+++ lib/nall/Makefile-qt	2009-06-15 00:12:05.000000000 +0200
-@@ -30,6 +30,10 @@
-   qtlib += -framework Cocoa
-   qtlib += -framework AppKit
-   qtlib += -framework ApplicationServices
-+else ifeq ($(platform),bsd)
-+  qtinc := `pkg-config --cflags QtCore QtGui`
-+  qtlib := `pkg-config --libs QtCore QtGui`
-+  moc := moc-qt4
- else ifeq ($(platform),win)
-   ifeq ($(qtpath),)
-     # find Qt install directory from PATH environment variable
diff -urN /usr/ports/emulators/bsnes/files/patch-Makefile-snesfilter bsnes/files/patch-Makefile-snesfilter
--- /usr/ports/emulators/bsnes/files/patch-Makefile-snesfilter	1970-01-01 01:00:00.000000000 +0100
+++ bsnes/files/patch-Makefile-snesfilter	2009-11-01 00:59:14.000000000 +0100
@@ -0,0 +1,15 @@
+--- snesfilter/Makefile.orig	2009-11-01 00:58:19.000000000 +0100
++++ snesfilter/Makefile	2009-11-01 00:58:36.000000000 +0100
+@@ -1,9 +1,9 @@
+ include nall/Makefile
+ include nall/Makefile-qt
+ 
+-c     := $(compiler)
+-cpp   := $(subst cc,++,$(compiler))
+-flags := -O3 -I. -fomit-frame-pointer $(qtinc)
++c     := ${CC}
++cpp   := ${CXX}
++flags := -O3 -I. -fomit-frame-pointer $(qtinc) -I${LOCALBASE}/include
+ link  := -s
+ 
+ ifeq ($(platform),x)
diff -urN /usr/ports/emulators/bsnes/files/patch-Makefile-snesfilter-libnal bsnes/files/patch-Makefile-snesfilter-libnal
--- /usr/ports/emulators/bsnes/files/patch-Makefile-snesfilter-libnal	1970-01-01 01:00:00.000000000 +0100
+++ bsnes/files/patch-Makefile-snesfilter-libnal	2009-11-01 01:04:28.000000000 +0100
@@ -0,0 +1,16 @@
+--- snesfilter/nall/Makefile.orig	2009-11-01 01:03:43.000000000 +0100
++++ snesfilter/nall/Makefile	2009-11-01 01:04:01.000000000 +0100
+@@ -29,11 +29,11 @@
+ endif
+ 
+ ifeq ($(compiler),)
+-  compiler := gcc
++  compiler := ${CC}
+ endif
+ 
+ ifeq ($(prefix),)
+-  prefix := /usr/local
++  prefix := ${PREFIX}
+ endif
+ 
+ #####
diff -urN /usr/ports/emulators/bsnes/files/patch-Makefile-snesreader bsnes/files/patch-Makefile-snesreader
--- /usr/ports/emulators/bsnes/files/patch-Makefile-snesreader	1970-01-01 01:00:00.000000000 +0100
+++ bsnes/files/patch-Makefile-snesreader	2009-11-01 00:51:48.000000000 +0100
@@ -0,0 +1,15 @@
+--- snesreader/Makefile.orig	2009-11-01 00:50:29.000000000 +0100
++++ snesreader/Makefile	2009-11-01 00:50:49.000000000 +0100
+@@ -1,9 +1,9 @@
+ include nall/Makefile
+ include nall/Makefile-qt
+ 
+-c     := $(compiler)
+-cpp   := $(subst cc,++,$(compiler))
+-flags := -O3 -I. -fomit-frame-pointer
++c     := ${CC}
++cpp   := ${CXX}
++flags := -O3 -I. -fomit-frame-pointer -I${LOCALBASE}/include
+ link  := -s
+ 
+ ifeq ($(platform),x)
diff -urN /usr/ports/emulators/bsnes/files/patch-Makefile-snesreader-libnal bsnes/files/patch-Makefile-snesreader-libnal
--- /usr/ports/emulators/bsnes/files/patch-Makefile-snesreader-libnal	1970-01-01 01:00:00.000000000 +0100
+++ bsnes/files/patch-Makefile-snesreader-libnal	2009-11-01 01:05:11.000000000 +0100
@@ -0,0 +1,16 @@
+--- snesreader/nall/Makefile.orig	2009-11-01 01:04:41.000000000 +0100
++++ snesreader/nall/Makefile	2009-11-01 01:04:55.000000000 +0100
+@@ -29,11 +29,11 @@
+ endif
+ 
+ ifeq ($(compiler),)
+-  compiler := gcc
++  compiler := ${CC}
+ endif
+ 
+ ifeq ($(prefix),)
+-  prefix := /usr/local
++  prefix := ${PREFIX}
+ endif
+ 
+ #####
diff -urN /usr/ports/emulators/bsnes/pkg-plist bsnes/pkg-plist
--- /usr/ports/emulators/bsnes/pkg-plist	1970-01-01 01:00:00.000000000 +0100
+++ bsnes/pkg-plist	2009-11-01 00:59:57.000000000 +0100
@@ -0,0 +1,5 @@
+bin/bsnes
+lib/libsnesreader.so
+lib/libsnesfilter.so
+share/pixmaps/bsnes.png
+share/applications/bsnes.desktop


>Release-Note:
>Audit-Trail:
>Unformatted:

