From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Mar 30 20:40:02 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 04F01186 for ; Sat, 30 Mar 2013 20:40:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id E05C0B22 for ; Sat, 30 Mar 2013 20:40:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r2UKe1UC014178 for ; Sat, 30 Mar 2013 20:40:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r2UKe1cE014177; Sat, 30 Mar 2013 20:40:01 GMT (envelope-from gnats) Resent-Date: Sat, 30 Mar 2013 20:40:01 GMT Resent-Message-Id: <201303302040.r2UKe1cE014177@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, Daniel Nebdal Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id D6990ED0 for ; Sat, 30 Mar 2013 20:35:09 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id AF756ADA for ; Sat, 30 Mar 2013 20:35:09 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.5/8.14.5) with ESMTP id r2UKZ9NU069069 for ; Sat, 30 Mar 2013 20:35:09 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.5/8.14.5/Submit) id r2UKZ9KV069068; Sat, 30 Mar 2013 20:35:09 GMT (envelope-from nobody) Message-Id: <201303302035.r2UKZ9KV069068@red.freebsd.org> Date: Sat, 30 Mar 2013 20:35:09 GMT From: Daniel Nebdal To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/177512: Make emulators/snes9express compile again X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Mar 2013 20:40:02 -0000 >Number: 177512 >Category: ports >Synopsis: Make emulators/snes9express compile again >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Mar 30 20:40:01 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Daniel Nebdal >Release: 10-current, sometime early march 2013 >Organization: - >Environment: FreeBSD mimir 10.0-CURRENT FreeBSD 10.0-CURRENT #0: Tue Mar 26 20:25:11 CET 2013 djn@mimir:/usr/obj/usr/src/sys/GENERIC amd64 >Description: I noticed emulators/snes9express wasn't compiling, and took a look. Given clang as cc, it compiled with rather minor fixes, though I haven't tried running it. Patch attached. >How-To-Repeat: >Fix: Attached. I concatenated the three patch files into one to fit it into the one-file attachment here; it should probably be re-split into patch-frend.cc , patch-frend.h , and patch-rom.cc ... or I should read about shell archives. Patch attached with submission follows: --- frend.cc 2009-12-21 23:38:54.000000000 +0100 +++ frend.cc 2013-03-30 21:11:20.702747627 +0100 @@ -373,7 +373,7 @@ /* ############################ dimension ############################## */ template -void dimension::input(std::istream& i) +std::istream& dimension::input(std::istream& i) { std::string buf, buf2; i >> buf; --- frend.h 2009-12-21 05:36:15.000000000 +0100 +++ frend.h 2013-03-30 21:11:44.611746201 +0100 @@ -187,7 +187,7 @@ dimension& operator+=(const dimension& p) { _x+=p._x; _y+=p._y; return *this; } dimension& operator-=(const dimension& p) { _x-=p._x; _y-=p._y; return *this; } void print(std::ostream& o) const; - void input(std::istream& i); + std::istream& input(std::istream& i); }; typedef dimension Point; typedef dimension Size; --- rom.cc 2009-12-22 01:06:07.000000000 +0100 +++ rom.cc 2013-03-30 21:10:25.279746508 +0100 @@ -21,9 +21,7 @@ #include "rom.h" #include "prefs.h" -#ifdef HAVE_ZLIB_H -# include -#endif +#include namespace fr = frend; @@ -209,9 +207,9 @@ }; #ifdef ZLIB_VERSION # define romopen(f) (gzFile*)gzopen(f.c_str(), "rb") -# define romseek gzseek -# define romread gzread -# define romclose gzclose +# define romseek(a, b, c) gzseek(*a, b, c) +# define romread(a, b, c) gzread(*a, b, c) +# define romclose(a) gzclose(*a) gzFile *fptr; #else # define romopen(f) fopen(f.c_str(), "rb") >Release-Note: >Audit-Trail: >Unformatted: