From owner-freebsd-ports Fri Jan 3 5:30: 4 2003 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4A4D237B401 for ; Fri, 3 Jan 2003 05:30:02 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 73CE143EC5 for ; Fri, 3 Jan 2003 05:30:01 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id h03DU1NS019396 for ; Fri, 3 Jan 2003 05:30:01 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id h03DU1XU019395; Fri, 3 Jan 2003 05:30:01 -0800 (PST) Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D029237B4E9 for ; Fri, 3 Jan 2003 05:29:29 -0800 (PST) Received: from fafoe.dyndns.org (chello212186121237.14.vie.surfer.at [212.186.121.237]) by mx1.FreeBSD.org (Postfix) with ESMTP id BF80543EB2 for ; Fri, 3 Jan 2003 05:29:28 -0800 (PST) (envelope-from stefan@fafoe.dyndns.org) Received: from frog.fafoe (frog.fafoe [192.168.2.101]) by fafoe.dyndns.org (Postfix) with ESMTP id B54EB41F7; Fri, 3 Jan 2003 14:29:26 +0100 (CET) Received: by frog.fafoe (Postfix, from userid 1001) id 53D6C723; Fri, 3 Jan 2003 14:29:26 +0100 (CET) Message-Id: <20030103132926.53D6C723@frog.fafoe> Date: Fri, 3 Jan 2003 14:29:26 +0100 (CET) From: Stefan Farfeleder Reply-To: Stefan Farfeleder To: FreeBSD-gnats-submit@FreeBSD.org Cc: stefan@fafoe.dyndns.org X-Send-Pr-Version: 3.113 Subject: ports/46722: [patch] fix emulators/wine on current Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 46722 >Category: ports >Synopsis: [patch] fix emulators/wine on current >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Fri Jan 03 05:30:00 PST 2003 >Closed-Date: >Last-Modified: >Originator: Stefan Farfeleder >Release: FreeBSD 5.0-CURRENT i386 >Organization: >Environment: System: FreeBSD frog.fafoe 5.0-CURRENT FreeBSD 5.0-CURRENT #9: Sun Dec 29 17:12:05 CET 2002 freebsd@frog.fafoe:/freebsd/current/obj/freebsd/current/src/sys/FROG i386 >Description: A test program of Wine tries to include instead of and stumbles over an #error directive in . >How-To-Repeat: cd /usr/ports/emulators/wine && make <...> gmake[3]: Entering directory `/freebsd/ports/emulators/wine/work/wine-20021219/dlls/winmm/tests' cc -c -I. -I. -I../../../include -I../../../include -O -pipe -mcpu=pentiumpro -g -Wall -mpreferred-stack-boundary=2 -fPIC -DNONAMELESSUNION -DNONAMELESSSTRUCT -D_REENTRANT -D_THREAD_SAFE -o wave.o wave.c In file included from wave.c:21: /usr/include/malloc.h:3:2: #error " has been replaced by " wave.c: In function `wave_generate_la': wave.c:77: warning: implicit declaration of function `malloc' wave.c:77: warning: assignment makes pointer from integer without a cast wave.c: In function `wave_out_test_deviceOut': wave.c:170: warning: implicit declaration of function `free' gmake[3]: *** [wave.o] Error 1 gmake[3]: Leaving directory `/freebsd/ports/emulators/wine/work/wine-20021219/dlls/winmm/tests' gmake[2]: *** [tests] Error 2 gmake[2]: Leaving directory `/freebsd/ports/emulators/wine/work/wine-20021219/dlls/winmm' gmake[1]: *** [winmm] Error 2 gmake[1]: Leaving directory `/freebsd/ports/emulators/wine/work/wine-20021219/dlls' gmake: *** [dlls] Error 2 *** Error code 2 >Fix: I called the diff patch-aa because I could not discover any consistent naming scheme in ports/emulators/wine/files. Feel free to rename it however you like. --- patch-aa begins here --- --- dlls/winmm/tests/wave.c.orig Fri Jan 3 13:48:04 2003 +++ dlls/winmm/tests/wave.c Fri Jan 3 13:48:11 2003 @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include +#include #include #include "wine/test.h" --- patch-aa ends here --- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message