>Number: 150979
>Category: misc
>Synopsis: update ports: emulators/bsnes Update to v0.70
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Sep 27 01:40:05 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Emmanuel Vadot
>Release: 8.1-STABLE-i386
>Organization:
ArcadeBSD
>Environment:
FreeBSD emeraldas 8.1-STABLE FreeBSD 8.1-STABLE #1: Thu Sep 23 02:06:19 CEST
2010 r...@emeraldas:/usr/obj/usr/src/sys/emeraldas i386
>Description:
Update port to 0.70
Remove useless patch and use environment variable instead.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -uNr /usr/ports/emulators/bsnes/Makefile bsnes/Makefile
--- /usr/ports/emulators/bsnes/Makefile 2010-09-11 21:22:16.000000000 +0200
+++ bsnes/Makefile 2010-09-27 03:29:23.000000000 +0200
@@ -5,7 +5,7 @@
# $FreeBSD: ports/emulators/bsnes/Makefile,v 1.11 2010/09/04 09:31:08 makc Exp
$
PORTNAME= bsnes
-PORTVERSION= 0.68
+PORTVERSION= 0.70
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DISTNAME= ${PORTNAME}_v${PORTVERSION:S/.//}
@@ -22,7 +22,7 @@
ONLY_FOR_ARCHS= i386 amd64
WRKSRC= ${WRKDIR}/
-MAKE_ENV+= moc=moc-qt4
+MAKE_ENV+= moc=moc-qt4 c="${CC} -std=gnu99" cpp="${CXX} -std=gnu++0x"
USE_LDCONFIG= yes
OPTIONS= VIDEO_GLX "Build GLX Video Driver" on \
@@ -97,9 +97,9 @@
.endif
post-patch:
- ${REINPLACE_CMD} -e 's|VIDEO|${VIDEO_DRIVER}|'
${WRKSRC}/bsnes/qt/Makefile
- ${REINPLACE_CMD} -e 's|AUDIO|${AUDIO_DRIVER}|'
${WRKSRC}/bsnes/qt/Makefile
- ${REINPLACE_CMD} -e 's|INPUT|${INPUT_DRIVER}|'
${WRKSRC}/bsnes/qt/Makefile
+ ${REINPLACE_CMD} -e 's|VIDEO|${VIDEO_DRIVER}|'
${WRKSRC}/bsnes/ui-qt/Makefile
+ ${REINPLACE_CMD} -e 's|AUDIO|${AUDIO_DRIVER}|'
${WRKSRC}/bsnes/ui-qt/Makefile
+ ${REINPLACE_CMD} -e 's|INPUT|${INPUT_DRIVER}|'
${WRKSRC}/bsnes/ui-qt/Makefile
do-build:
(cd ${WRKSRC}/bsnes && ${GMAKE} ${MAKE_ENV})
@@ -108,11 +108,11 @@
(cd ${WRKSRC}/supergameboy && ${GMAKE} ${MAKE_ENV})
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/bsnes/out/bsnes-compatibility
${PREFIX}/bin/bsnes
+ ${INSTALL_PROGRAM} ${WRKSRC}/bsnes/out/bsnes ${PREFIX}/bin/
${MKDIR} ${PREFIX}/share/pixmaps
- ${INSTALL_DATA} ${WRKSRC}/bsnes/qt/data/bsnes.png
${PREFIX}/share/pixmaps/bsnes.png
+ ${INSTALL_DATA} ${WRKSRC}/bsnes/ui-qt/data/bsnes.png
${PREFIX}/share/pixmaps/
${MKDIR} ${PREFIX}/share/applications
- ${INSTALL_DATA} ${WRKSRC}/bsnes/qt//data/bsnes.desktop
${PREFIX}/share/applications/bsnes.desktop
+ ${INSTALL_DATA} ${WRKSRC}/bsnes/ui-qt/data/bsnes.desktop
${PREFIX}/share/applications/
${INSTALL_DATA} ${WRKSRC}/snesreader/libsnesreader.so ${PREFIX}/lib/
${INSTALL_DATA} ${WRKSRC}/snesfilter/libsnesfilter.so ${PREFIX}/lib/
${INSTALL_DATA} ${WRKSRC}/supergameboy/libsupergameboy.so ${PREFIX}/lib/
diff -uNr /usr/ports/emulators/bsnes/distinfo bsnes/distinfo
--- /usr/ports/emulators/bsnes/distinfo 2010-09-11 21:22:16.000000000 +0200
+++ bsnes/distinfo 2010-09-27 03:13:36.000000000 +0200
@@ -1,3 +1,3 @@
-MD5 (bsnes_v068.tar.bz2) = 9ff2f6dc64f54f0da538cefade64b3a7
-SHA256 (bsnes_v068.tar.bz2) =
a92cd604674e3beed9a1a3153e9fdf9cbbdc29aff62482e4d2a29c47bd8cffe2
-SIZE (bsnes_v068.tar.bz2) = 945351
+MD5 (bsnes_v070.tar.bz2) = d7977e140abc9f07fe55c3ae420bc281
+SHA256 (bsnes_v070.tar.bz2) =
843fe06200488863510dd4c2923eaef6744977f8d1926cdb0806bb6d470c4b79
+SIZE (bsnes_v070.tar.bz2) = 1020720
diff -uNr /usr/ports/emulators/bsnes/files/patch-Makefile
bsnes/files/patch-Makefile
--- /usr/ports/emulators/bsnes/files/patch-Makefile 1970-01-01
01:00:00.000000000 +0100
+++ bsnes/files/patch-Makefile 2010-09-27 03:24:57.000000000 +0200
@@ -0,0 +1,11 @@
+--- bsnes/Makefile.orig 2010-09-27 03:24:08.000000000 +0200
++++ bsnes/Makefile 2010-09-27 03:24:26.000000000 +0200
+@@ -19,7 +19,7 @@
+
+ # platform
+ ifeq ($(platform),x)
+- link += -s -ldl -lX11 -lXext
++ link += -s -lX11 -lXext
+ else ifeq ($(platform),osx)
+ else ifeq ($(platform),win)
+ link += -mwindows
diff -uNr /usr/ports/emulators/bsnes/files/patch-function.hpp
bsnes/files/patch-function.hpp
--- /usr/ports/emulators/bsnes/files/patch-function.hpp 2010-09-04
11:31:08.000000000 +0200
+++ bsnes/files/patch-function.hpp 1970-01-01 01:00:00.000000000 +0100
@@ -1,15 +0,0 @@
---- bsnes/nall/function.hpp.orig 2010-09-02 13:10:15.000000000 +0200
-+++ bsnes/nall/function.hpp 2010-09-02 13:10:34.000000000 +0200
-@@ -1,7 +1,11 @@
- #ifndef NALL_FUNCTION_HPP
- #define NALL_FUNCTION_HPP
-
--#include <malloc.h>
-+#ifdef __FreeBSD__
-+# include <stdlib.h>
-+#else
-+# include <malloc.h>
-+#endif
- #include <functional>
- #include <type_traits>
-
diff -uNr /usr/ports/emulators/bsnes/files/patch-qt-Makefile
bsnes/files/patch-qt-Makefile
--- /usr/ports/emulators/bsnes/files/patch-qt-Makefile 1970-01-01
01:00:00.000000000 +0100
+++ bsnes/files/patch-qt-Makefile 2010-09-27 03:25:41.000000000 +0200
@@ -0,0 +1,15 @@
+--- bsnes/ui-qt/Makefile.orig 2010-09-27 03:25:04.000000000 +0200
++++ bsnes/ui-qt/Makefile 2010-09-27 03:25:16.000000000 +0200
+@@ -13,9 +13,9 @@
+
+ # platform
+ ifeq ($(platform),x)
+- ruby := video.glx video.xv video.qtraster video.sdl
+- ruby += audio.alsa audio.openal audio.oss audio.pulseaudio
audio.pulseaudiosimple audio.ao
+- ruby += input.sdl input.x
++ ruby := VIDEO
++ ruby += AUDIO
++ ruby += INPUT
+
+ link += $(if $(findstring audio.openal,$(ruby)),-lopenal)
+ else ifeq ($(platform),osx)
diff -uNr /usr/ports/emulators/bsnes/files/patch-snesfilter-Makefile
bsnes/files/patch-snesfilter-Makefile
--- /usr/ports/emulators/bsnes/files/patch-snesfilter-Makefile 2010-09-11
21:22:16.000000000 +0200
+++ bsnes/files/patch-snesfilter-Makefile 1970-01-01 01:00:00.000000000
+0100
@@ -1,13 +0,0 @@
---- snesfilter/Makefile.orig 2010-09-02 13:28:07.000000000 +0200
-+++ snesfilter/Makefile 2010-09-02 13:28:17.000000000 +0200
-@@ -3,8 +3,8 @@
- qtlibs := QtCore QtGui
- include nall/qt/Makefile
-
--c := $(compiler) -std=gnu99
--cpp := $(subst cc,++,$(compiler)) -std=gnu++0x
-+c := $(CC) -std=gnu99
-+cpp := $(CXX) -std=gnu++0x
- flags := -O3 -I. -Iobj -fomit-frame-pointer $(qtinc)
- link :=
-
diff -uNr /usr/ports/emulators/bsnes/files/patch-snesreader-Makefile
bsnes/files/patch-snesreader-Makefile
--- /usr/ports/emulators/bsnes/files/patch-snesreader-Makefile 2010-09-11
21:22:16.000000000 +0200
+++ bsnes/files/patch-snesreader-Makefile 1970-01-01 01:00:00.000000000
+0100
@@ -1,13 +0,0 @@
---- snesreader/Makefile.orig 2010-09-02 13:26:29.000000000 +0200
-+++ snesreader/Makefile 2010-09-02 13:26:42.000000000 +0200
-@@ -3,8 +3,8 @@
- qtlibs := QtCore QtGui
- include nall/qt/Makefile
-
--c := $(compiler) -std=gnu99
--cpp := $(subst cc,++,$(compiler)) -std=gnu++0x
-+c := $(CC) -std=gnu99
-+cpp := $(CXX) -std=gnu++0x
- flags := -O3 -I. -Iobj -fomit-frame-pointer
- link :=
-
diff -uNr /usr/ports/emulators/bsnes/files/patch-src-Makefile
bsnes/files/patch-src-Makefile
--- /usr/ports/emulators/bsnes/files/patch-src-Makefile 2010-09-11
21:22:16.000000000 +0200
+++ bsnes/files/patch-src-Makefile 1970-01-01 01:00:00.000000000 +0100
@@ -1,22 +0,0 @@
---- bsnes/Makefile.orig 2010-09-02 13:02:47.000000000 +0200
-+++ bsnes/Makefile 2010-09-02 13:04:10.000000000 +0200
-@@ -4,8 +4,8 @@
- ui := qt
-
- # compiler
--c := $(compiler) -std=gnu99
--cpp := $(subst cc,++,$(compiler)) -std=gnu++0x
-+c := $(CC)
-+cpp := $(CXX) -std=gnu++0x
- flags := -O3 -fomit-frame-pointer -I. -I$(snes)
- link :=
- objects :=
-@@ -19,7 +19,7 @@
-
- # platform
- ifeq ($(platform),x)
-- link += -s -ldl -lX11 -lXext
-+ link += -s -lX11 -lXext
- else ifeq ($(platform),osx)
- else ifeq ($(platform),win)
- link += -mwindows
diff -uNr /usr/ports/emulators/bsnes/files/patch-src-ui_qt-Makefile
bsnes/files/patch-src-ui_qt-Makefile
--- /usr/ports/emulators/bsnes/files/patch-src-ui_qt-Makefile 2010-09-11
21:22:16.000000000 +0200
+++ bsnes/files/patch-src-ui_qt-Makefile 1970-01-01 01:00:00.000000000
+0100
@@ -1,15 +0,0 @@
---- bsnes/qt/Makefile.orig 2010-09-02 13:05:33.000000000 +0200
-+++ bsnes/qt/Makefile 2010-09-02 13:05:50.000000000 +0200
-@@ -13,9 +13,9 @@
-
- # platform
- ifeq ($(platform),x)
-- ruby := video.glx video.xv video.qtraster video.sdl
-- ruby += audio.alsa audio.openal audio.oss audio.pulseaudio
audio.pulseaudiosimple audio.ao
-- ruby += input.sdl input.x
-+ ruby := VIDEO
-+ ruby += AUDIO
-+ ruby += INPUT
-
- link += $(if $(findstring audio.openal,$(ruby)),-lopenal)
- else ifeq ($(platform),osx)
diff -uNr /usr/ports/emulators/bsnes/files/patch-supergameboy-Makefile
bsnes/files/patch-supergameboy-Makefile
--- /usr/ports/emulators/bsnes/files/patch-supergameboy-Makefile
2010-09-11 21:22:16.000000000 +0200
+++ bsnes/files/patch-supergameboy-Makefile 1970-01-01 01:00:00.000000000
+0100
@@ -1,12 +0,0 @@
---- supergameboy/Makefile.orig 2010-09-02 13:28:45.000000000 +0200
-+++ supergameboy/Makefile 2010-09-02 13:28:55.000000000 +0200
-@@ -1,7 +1,7 @@
- include nall/Makefile
-
--c := $(compiler) -std=gnu99
--cpp := $(subst cc,++,$(compiler)) -std=gnu++0x
-+c := $(CC) -std=gnu99
-+cpp := $(CXX) -std=gnu++0x
- flags := -O3 -fomit-frame-pointer -I. -Icommon -Ilibgambatte/include
-Ilibgambatte/src
- link :=
-
>Release-Note:
>Audit-Trail:
>Unformatted:
_______________________________________________
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
