From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Nov 24 05:40:01 2009 Return-Path: Delivered-To: freebsd-ports-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 E38991065672 for ; Tue, 24 Nov 2009 05:40: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 BF9EC8FC13 for ; Tue, 24 Nov 2009 05:40:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id nAO5e1Dw073157 for ; Tue, 24 Nov 2009 05:40:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id nAO5e1p5073156; Tue, 24 Nov 2009 05:40:01 GMT (envelope-from gnats) Resent-Date: Tue, 24 Nov 2009 05:40:01 GMT Resent-Message-Id: <200911240540.nAO5e1p5073156@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-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 C958B106566B for ; Tue, 24 Nov 2009 05:34:04 +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 B7A0F8FC0A for ; Tue, 24 Nov 2009 05:34:04 +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 nAO5Y3sh084328 for ; Tue, 24 Nov 2009 05:34:03 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id nAO5Y3Gh084327; Tue, 24 Nov 2009 05:34:03 GMT (envelope-from nobody) Message-Id: <200911240534.nAO5Y3Gh084327@www.freebsd.org> Date: Tue, 24 Nov 2009 05:34:03 GMT From: Emmanuel Vadot To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/140818: Update ports: emulators/bsnes update to v0.057 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Nov 2009 05:40:02 -0000 >Number: 140818 >Category: ports >Synopsis: Update ports: emulators/bsnes update to v0.057 >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: Tue Nov 24 05:40:01 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Emmanuel Vadot >Release: 8.0-PRERELEASE >Organization: ArcadeBSD >Environment: FreeBSD maetel.arcadebsd.org 8.0-PRERELEASE FreeBSD 8.0-PRERELEASE #2: Fri Nov 20 17:55:28 CET 2009 root@maetel.arcadebsd.org:/usr/obj/usr/src/sys/GENERIC i386 >Description: Update port to v0.057. Better patch than last time. >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-24 06:31:01.000000000 +0100 @@ -5,11 +5,12 @@ # $FreeBSD: ports/emulators/bsnes/Makefile,v 1.2 2009/08/28 19:23:31 miwi Exp $ 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 @@ 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 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 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-24 06:31:01.000000000 +0100 @@ -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 -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-24 06:31:01.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-24 06:31:01.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 2009-11-24 06:31:01.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 >Release-Note: >Audit-Trail: >Unformatted: