From shaun@inerd.com  Thu May 25 23:46:28 2006
Return-Path: <shaun@inerd.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 19C5516B277
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 25 May 2006 23:46:28 +0000 (UTC)
	(envelope-from shaun@inerd.com)
Received: from dione.picobyte.net (host-212-158-207-124.bulldogdsl.com [212.158.207.124])
	by mx1.FreeBSD.org (Postfix) with SMTP id 8531F43D48
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 25 May 2006 23:46:27 +0000 (GMT)
	(envelope-from shaun@inerd.com)
Received: from charon.picobyte.net (charon.picobyte.net [IPv6:2001:4bd0:201e::fe03])
	by dione.picobyte.net (Postfix) with ESMTP
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 26 May 2006 00:46:25 +0100 (BST)
Message-Id: <1148600785.14785@charon.picobyte.net>
Date: Fri, 26 May 2006 00:46:25 +0100
From: Shaun Amott <shaun@inerd.com>
Reply-To: Shaun Amott <shaun@inerd.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: emulators/dosbox: Fix build on 4.x
X-Send-Pr-Version: 3.113
X-GNATS-Notify: knyght@gmail.com

>Number:         97937
>Category:       ports
>Synopsis:       emulators/dosbox: Fix build on 4.x
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu May 25 23:50:14 GMT 2006
>Closed-Date:    Tue May 30 07:04:18 GMT 2006
>Last-Modified:  Tue May 30 07:04:18 GMT 2006
>Originator:     Shaun Amott
>Release:        FreeBSD 6.1-STABLE i386
>Organization:
>Environment:

>Description:

- Fix build on 4.x

Reported by pointyhat.

>How-To-Repeat:

>Fix:

--- dosbox.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/emulators/dosbox/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- Makefile	6 Apr 2006 00:07:11 -0000	1.13
+++ Makefile	25 May 2006 23:21:11 -0000
@@ -27,6 +27,8 @@
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=	--enable-core-inline
 
+USE_GCC=	3.2+
+
 post-patch:
 	@${REINPLACE_CMD} -e 's#\/usr\/share\/doc\/dosbox#${DOCSDIR}#g' \
 		${WRKSRC}/docs/dosbox.1
Index: files/patch-src::cpu::core_dyn_x86.cpp
===================================================================
RCS file: files/patch-src::cpu::core_dyn_x86.cpp
diff -N files/patch-src::cpu::core_dyn_x86.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-src::cpu::core_dyn_x86.cpp	25 May 2006 23:21:11 -0000
@@ -0,0 +1,11 @@
+--- src/cpu/core_dyn_x86.cpp.orig	Thu Feb  9 12:32:52 2006
++++ src/cpu/core_dyn_x86.cpp	Thu May 25 22:58:53 2006
+@@ -22,6 +22,8 @@
+ 
+ #define CHECKED_MEMORY_ACCESS
+ 
++#include <sys/types.h>
++
+ #include <assert.h>
+ #include <stdarg.h>
+ #include <stdio.h>
--- dosbox.diff ends here ---
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Thu May 25 23:52:16 UTC 2006 
State-Changed-Why:  
Awaiting maintainers feedback 

http://www.freebsd.org/cgi/query-pr.cgi?pr=97937 

From: "Tom Carrick" <knyght@gmail.com>
To: bug-followup@FreeBSD.org, shaun@inerd.com
Cc:  
Subject: Re: ports/97937: emulators/dosbox: Fix build on 4.x
Date: Fri, 26 May 2006 09:20:04 +0100

 ------=_Part_19097_1371465.1148631604016
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: quoted-printable
 Content-Disposition: inline
 
 Looks good to me.
 
 ------=_Part_19097_1371465.1148631604016
 Content-Type: text/html; charset=ISO-8859-1
 Content-Transfer-Encoding: quoted-printable
 Content-Disposition: inline
 
 Looks good to me.<br>
 
 ------=_Part_19097_1371465.1148631604016--
State-Changed-From-To: feedback->closed 
State-Changed-By: clsung 
State-Changed-When: Tue May 30 07:04:16 UTC 2006 
State-Changed-Why:  
Committed. Thank You. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=97937 
>Unformatted:
