From owner-freebsd-bugs@FreeBSD.ORG Thu Sep 2 11:50:01 2010 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C297C1065708 for ; Thu, 2 Sep 2010 11:50:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 850208FC1F for ; Thu, 2 Sep 2010 11:50:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o82Bo1oA068904 for ; Thu, 2 Sep 2010 11:50:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o82Bo1BC068903; Thu, 2 Sep 2010 11:50:01 GMT (envelope-from gnats) Resent-Date: Thu, 2 Sep 2010 11:50:01 GMT Resent-Message-Id: <201009021150.o82Bo1BC068903@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Emmanuel Vadot Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3A0DB1065705 for ; Thu, 2 Sep 2010 11:44:52 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 1E56F8FC12 for ; Thu, 2 Sep 2010 11:44:52 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o82BipaR092953 for ; Thu, 2 Sep 2010 11:44:51 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id o82Bip1W092952; Thu, 2 Sep 2010 11:44:51 GMT (envelope-from nobody) Message-Id: <201009021144.o82Bip1W092952@www.freebsd.org> Date: Thu, 2 Sep 2010 11:44:51 GMT From: Emmanuel Vadot To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: misc/150220: Update ports: emulators/bsnes update to v0.68 X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Sep 2010 11:50:01 -0000 >Number: 150220 >Category: misc >Synopsis: Update ports: emulators/bsnes update to v0.68 >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: Thu Sep 02 11:50:01 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Emmanuel Vadot >Release: 8.1-RELEASE i386 >Organization: ArcadeBSD >Environment: FreeBSD sonic 8.1-RELEASE FreeBSD 8.1-RELEASE #0: Mon Jul 19 02:55:53 UTC 2010 root@almeida.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386 >Description: Update ports to v0.68 >How-To-Repeat: >Fix: Patch attached with submission follows: diff -uNr /usr/ports/emulators/bsnes/Makefile bsnes/Makefile --- /usr/ports/emulators/bsnes/Makefile 2010-08-23 13:29:49.000000000 +0200 +++ bsnes/Makefile 2010-09-02 13:38:36.000000000 +0200 @@ -5,7 +5,7 @@ # $FreeBSD: ports/emulators/bsnes/Makefile,v 1.10 2010/08/02 18:33:00 makc Exp $ PORTNAME= bsnes -PORTVERSION= 0.67 +PORTVERSION= 0.68 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} DISTNAME= ${PORTNAME}_v${PORTVERSION:S/.//} @@ -97,22 +97,22 @@ .endif post-patch: - ${REINPLACE_CMD} -e 's|VIDEO|${VIDEO_DRIVER}|' ${WRKSRC}/src/ui_qt/Makefile - ${REINPLACE_CMD} -e 's|AUDIO|${AUDIO_DRIVER}|' ${WRKSRC}/src/ui_qt/Makefile - ${REINPLACE_CMD} -e 's|INPUT|${INPUT_DRIVER}|' ${WRKSRC}/src/ui_qt/Makefile + ${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 do-build: - (cd ${WRKSRC}/src && ${GMAKE} ${MAKE_ENV}) + (cd ${WRKSRC}/bsnes && ${GMAKE} ${MAKE_ENV}) (cd ${WRKSRC}/snesreader && ${GMAKE} ${MAKE_ENV}) (cd ${WRKSRC}/snesfilter && ${GMAKE} ${MAKE_ENV}) (cd ${WRKSRC}/supergameboy && ${GMAKE} ${MAKE_ENV}) do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/ + ${INSTALL_PROGRAM} ${WRKSRC}/bsnes/out/bsnes-compatibility ${PREFIX}/bin/bsnes ${MKDIR} ${PREFIX}/share/pixmaps - ${INSTALL_DATA} ${WRKSRC}/src/data/bsnes.png ${PREFIX}/share/pixmaps/bsnes.png + ${INSTALL_DATA} ${WRKSRC}/bsnes/qt/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}/bsnes/qt//data/bsnes.desktop ${PREFIX}/share/applications/bsnes.desktop ${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-08-23 13:29:49.000000000 +0200 +++ bsnes/distinfo 2010-09-02 13:01:45.000000000 +0200 @@ -1,3 +1,3 @@ -MD5 (bsnes_v067.tar.bz2) = c0cc823fe0b15a892af9e6d864214e29 -SHA256 (bsnes_v067.tar.bz2) = a44650db00bbf87b2f5fd4fe4b6279904c00642acfbf3dcb46df6aafeb3e74cf -SIZE (bsnes_v067.tar.bz2) = 928328 +MD5 (bsnes_v068.tar.bz2) = 9ff2f6dc64f54f0da538cefade64b3a7 +SHA256 (bsnes_v068.tar.bz2) = a92cd604674e3beed9a1a3153e9fdf9cbbdc29aff62482e4d2a29c47bd8cffe2 +SIZE (bsnes_v068.tar.bz2) = 945351 diff -uNr /usr/ports/emulators/bsnes/files/patch-function.hpp bsnes/files/patch-function.hpp --- /usr/ports/emulators/bsnes/files/patch-function.hpp 1970-01-01 01:00:00.000000000 +0100 +++ bsnes/files/patch-function.hpp 2010-09-02 13:10:39.000000000 +0200 @@ -0,0 +1,15 @@ +--- 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 ++#ifdef __FreeBSD__ ++# include ++#else ++# include ++#endif + #include + #include + diff -uNr /usr/ports/emulators/bsnes/files/patch-serialization.cpp bsnes/files/patch-serialization.cpp --- /usr/ports/emulators/bsnes/files/patch-serialization.cpp 1970-01-01 01:00:00.000000000 +0100 +++ bsnes/files/patch-serialization.cpp 2010-09-02 13:23:57.000000000 +0200 @@ -0,0 +1,11 @@ +--- bsnes/snes/system/serialization.cpp.orig 2010-09-02 13:16:20.000000000 +0200 ++++ bsnes/snes/system/serialization.cpp 2010-09-02 13:23:12.000000000 +0200 +@@ -7,7 +7,7 @@ + char profile[16], description[512]; + memset(&profile, 0, sizeof profile); + memset(&description, 0, sizeof description); +- strlcpy(profile, Info::Profile, sizeof profile); ++ nall::strlcpy(profile, Info::Profile, sizeof profile); + + s.integer(signature); + s.integer(version); diff -uNr /usr/ports/emulators/bsnes/files/patch-snesfilter-Makefile bsnes/files/patch-snesfilter-Makefile --- /usr/ports/emulators/bsnes/files/patch-snesfilter-Makefile 2010-07-11 10:09:03.000000000 +0200 +++ bsnes/files/patch-snesfilter-Makefile 2010-09-02 13:28:42.000000000 +0200 @@ -1,5 +1,5 @@ ---- snesfilter/Makefile.orig 2010-02-28 08:05:38.000000000 +0100 -+++ snesfilter/Makefile 2010-05-17 08:18:59.000000000 +0200 +--- 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 diff -uNr /usr/ports/emulators/bsnes/files/patch-snesreader-Makefile bsnes/files/patch-snesreader-Makefile --- /usr/ports/emulators/bsnes/files/patch-snesreader-Makefile 2010-07-11 10:09:03.000000000 +0200 +++ bsnes/files/patch-snesreader-Makefile 2010-09-02 13:27:48.000000000 +0200 @@ -1,5 +1,5 @@ ---- snesreader/Makefile.orig 2010-05-17 07:48:27.000000000 +0200 -+++ snesreader/Makefile 2010-05-17 07:48:45.000000000 +0200 +--- 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 diff -uNr /usr/ports/emulators/bsnes/files/patch-src-Makefile bsnes/files/patch-src-Makefile --- /usr/ports/emulators/bsnes/files/patch-src-Makefile 2010-07-11 10:09:03.000000000 +0200 +++ bsnes/files/patch-src-Makefile 2010-09-02 13:04:57.000000000 +0200 @@ -1,19 +1,17 @@ ---- src/Makefile.orig 2010-04-14 07:41:49.000000000 +0200 -+++ src/Makefile 2010-05-17 07:46:17.000000000 +0200 -@@ -2,9 +2,9 @@ - ui := ui_qt +--- 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 --flags := -O3 -fomit-frame-pointer -I. +c := $(CC) -+cpp := $(CXX) -+flags := -O3 -fomit-frame-pointer -I. -std=c++0x ++cpp := $(CXX) -std=gnu++0x + flags := -O3 -fomit-frame-pointer -I. -I$(snes) link := objects := - -@@ -17,7 +17,7 @@ +@@ -19,7 +19,7 @@ # platform ifeq ($(platform),x) @@ -21,4 +19,4 @@ + link += -s -lX11 -lXext else ifeq ($(platform),osx) else ifeq ($(platform),win) - link += -mwindows -mthreads + link += -mwindows diff -uNr /usr/ports/emulators/bsnes/files/patch-src-nall-Makefile bsnes/files/patch-src-nall-Makefile --- /usr/ports/emulators/bsnes/files/patch-src-nall-Makefile 2010-07-11 10:09:03.000000000 +0200 +++ bsnes/files/patch-src-nall-Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- src/nall/Makefile.orig 2010-04-16 07:04:44.000000000 +0200 -+++ src/nall/Makefile 2010-04-16 07:05:00.000000000 +0200 -@@ -32,7 +32,7 @@ - ifeq ($(platform),osx) - compiler := gcc-4.2 - else -- compiler := gcc -+ compiler := ${CC} - endif - endif - 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-07-11 10:09:03.000000000 +0200 +++ bsnes/files/patch-src-ui_qt-Makefile 2010-09-02 13:06:16.000000000 +0200 @@ -1,5 +1,5 @@ ---- src/ui_qt/Makefile.orig 2010-04-16 07:06:22.000000000 +0200 -+++ src/ui_qt/Makefile 2010-04-16 07:06:38.000000000 +0200 +--- 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 diff -uNr /usr/ports/emulators/bsnes/files/patch-supergameboy-Makefile bsnes/files/patch-supergameboy-Makefile --- /usr/ports/emulators/bsnes/files/patch-supergameboy-Makefile 2010-07-11 10:09:03.000000000 +0200 +++ bsnes/files/patch-supergameboy-Makefile 2010-09-02 13:29:33.000000000 +0200 @@ -1,5 +1,5 @@ ---- supergameboy/Makefile.orig 2010-05-17 07:50:35.000000000 +0200 -+++ supergameboy/Makefile 2010-05-17 07:50:45.000000000 +0200 +--- 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 >Release-Note: >Audit-Trail: >Unformatted: