From nobody@FreeBSD.org  Tue Oct 22 18:48:55 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTP id 7B275614
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 22 Oct 2013 18:48:55 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 684302F1B
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 22 Oct 2013 18:48:55 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id r9MImtu7028042
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 22 Oct 2013 18:48:55 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id r9MImsmr027981;
	Tue, 22 Oct 2013 18:48:54 GMT
	(envelope-from nobody)
Message-Id: <201310221848.r9MImsmr027981@oldred.freebsd.org>
Date: Tue, 22 Oct 2013 18:48:54 GMT
From: Tom Carrick <knyght@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: emulators/dosbox: Fix build for FreeBSD 10.0
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         183213
>Category:       ports
>Synopsis:       emulators/dosbox: Fix build for FreeBSD 10.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    ak
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 22 18:50:00 UTC 2013
>Closed-Date:    Wed Oct 23 22:21:49 UTC 2013
>Last-Modified:  Wed Oct 23 22:21:49 UTC 2013
>Originator:     Tom Carrick
>Release:        FreeBSD 10.0-BETA1
>Organization:
>Environment:
>Description:
Attached patch to fix building in clang, and thus FreeBSD 10.0
>How-To-Repeat:
Attempt to build port with clang
>Fix:
See patch

Patch attached with submission follows:

--- fpu_instructions_x86.h.orig	2010-05-10 18:43:54.000000000 +0100
+++ fpu_instructions_x86.h	2013-10-19 11:05:47.000000000 +0100
@@ -1162,12 +1162,12 @@
 
 static void FPU_FLD_I16(PhysPt addr,Bitu store_to) {
 	fpu.p_regs[8].m1 = (Bit32u)mem_readw(addr);
-	FPUD_LOAD(fild,WORD,)
+	FPUD_LOAD(fild,WORD,s)
 }
 
 static void FPU_FLD_I16_EA(PhysPt addr) {
 	fpu.p_regs[8].m1 = (Bit32u)mem_readw(addr);
-	FPUD_LOAD_EA(fild,WORD,)
+	FPUD_LOAD_EA(fild,WORD,s)
 }
 
 static void FPU_FLD_I32(PhysPt addr,Bitu store_to) {
@@ -1212,7 +1212,7 @@
 }
 
 static void FPU_FST_I16(PhysPt addr) {
-	FPUD_STORE(fistp,WORD,)
+	FPUD_STORE(fistp,WORD,s)
 	mem_writew(addr,(Bit16u)fpu.p_regs[8].m1);
 }
 


>Release-Note:
>Audit-Trail:
Class-Changed-From-To: change-request->maintainer-update 
Class-Changed-By: edwin 
Class-Changed-When: Tue Oct 22 18:50:08 UTC 2013 
Class-Changed-Why:  
Fix category (submitter is maintainer) (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183213 
Responsible-Changed-From-To: freebsd-ports-bugs->ak 
Responsible-Changed-By: ak 
Responsible-Changed-When: Wed Oct 23 18:08:29 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/183213: commit references a PR
Date: Wed, 23 Oct 2013 22:15:23 +0000 (UTC)

 Author: ak
 Date: Wed Oct 23 22:15:15 2013
 New Revision: 331434
 URL: http://svnweb.freebsd.org/changeset/ports/331434
 
 Log:
   - Fix build with clang on i386 [1]
   - Support STAGEDIR
   - Convert to new LIB_DEPENDS syntax
   - Add LICENSE
   
   PR:	ports/183213 [1]
   Submitted by:	Tom Carrick <knyght@gmail.com> (maintainer) [1]
 
 Added:
   head/emulators/dosbox/files/patch-src-fpu-fpu_instructions_x86.h   (contents, props changed)
 Modified:
   head/emulators/dosbox/Makefile
 
 Modified: head/emulators/dosbox/Makefile
 ==============================================================================
 --- head/emulators/dosbox/Makefile	Wed Oct 23 22:12:47 2013	(r331433)
 +++ head/emulators/dosbox/Makefile	Wed Oct 23 22:15:15 2013	(r331434)
 @@ -10,17 +10,17 @@ MASTER_SITES=	SF
  MAINTAINER=	knyght@gmail.com
  COMMENT=	Emulator of a PC with DOS
  
 -LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 +LICENSE=	GPLv2
 +
 +LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png
  
  GNU_CONFIGURE=	yes
  USE_SDL=	sdl net sound
 -PLIST_FILES=	bin/dosbox share/pixmaps/dosbox.ico
 +PLIST_FILES=	bin/dosbox man/man1/dosbox.1.gz share/pixmaps/dosbox.ico
  PORTDOCS=	NEWS README
  
 -MAN1=		dosbox.1
  PKGMESSAGE=	${WRKDIR}/pkg-message
  
 -CPPFLAGS+=		-I${LOCALBASE}/include
  CONFIGURE_ARGS+=	--enable-core-inline
  
  DESKTOP_ENTRIES="DOSBox" "${COMMENT}" \
 @@ -32,27 +32,18 @@ OPTIONS_RADIO_DEBUGGER=DEBUGGER_ENABLE D
  DEBUGGER_ENABLE_DESC=Enable internal debugger
  DEBUGGER_HEAVY_DESC=Enable internal debugger with extra features
  
 -NO_STAGE=	yes
 -.include <bsd.port.options.mk>
 -
 -.if ${PORT_OPTIONS:MDEBUGGER_ENABLE}
 -CONFIGURE_ARGS+=	--enable-debug=yes
 -.elif ${PORT_OPTIONS:MDEBUGGER_HEAVY}
 -CONFIGURE_ARGS+=	--enable-debug=heavy
 -.endif
 +DEBUGGER_ENABLE_CONFIGURE_ON=	--enable-debug=yes
 +DEBUGGER_HEAVY_CONFIGURE_ON=	--enable-debug=heavy
  
  post-patch:
  	@${REINPLACE_CMD} -e 's#\/usr\/share\/doc\/dosbox#${DOCSDIR}#g' \
  		${WRKSRC}/docs/dosbox.1
  
  do-install:
 -	${INSTALL_PROGRAM} ${WRKSRC}/src/dosbox ${PREFIX}/bin/dosbox
 -	${INSTALL_DATA} ${WRKSRC}/src/dosbox.ico ${PREFIX}/share/pixmaps/
 -	${INSTALL_MAN} ${WRKSRC}/docs/dosbox.1 ${MAN1PREFIX}/man/man1/
 -.if ${PORT_OPTIONS:MDOCS}
 -	${MKDIR} ${DOCSDIR}
 -	${INSTALL_DATA} ${WRKSRC}/NEWS ${DOCSDIR}
 -	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 -.endif
 +	${INSTALL_PROGRAM} ${WRKSRC}/src/dosbox ${STAGEDIR}${PREFIX}/bin/dosbox
 +	${INSTALL_DATA} ${WRKSRC}/src/dosbox.ico ${STAGEDIR}${PREFIX}/share/pixmaps/
 +	${INSTALL_MAN} ${WRKSRC}/docs/dosbox.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
 +	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 +	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
  
  .include <bsd.port.mk>
 
 Added: head/emulators/dosbox/files/patch-src-fpu-fpu_instructions_x86.h
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/emulators/dosbox/files/patch-src-fpu-fpu_instructions_x86.h	Wed Oct 23 22:15:15 2013	(r331434)
 @@ -0,0 +1,24 @@
 +Index: src/fpu/fpu_instructions_x86.h
 +@@ -1162,12 +1162,12 @@
 + 
 + static void FPU_FLD_I16(PhysPt addr,Bitu store_to) {
 + 	fpu.p_regs[8].m1 = (Bit32u)mem_readw(addr);
 +-	FPUD_LOAD(fild,WORD,)
 ++	FPUD_LOAD(fild,WORD,s)
 + }
 + 
 + static void FPU_FLD_I16_EA(PhysPt addr) {
 + 	fpu.p_regs[8].m1 = (Bit32u)mem_readw(addr);
 +-	FPUD_LOAD_EA(fild,WORD,)
 ++	FPUD_LOAD_EA(fild,WORD,s)
 + }
 + 
 + static void FPU_FLD_I32(PhysPt addr,Bitu store_to) {
 +@@ -1212,7 +1212,7 @@
 + }
 + 
 + static void FPU_FST_I16(PhysPt addr) {
 +-	FPUD_STORE(fistp,WORD,)
 ++	FPUD_STORE(fistp,WORD,s)
 + 	mem_writew(addr,(Bit16u)fpu.p_regs[8].m1);
 + }
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: ak 
State-Changed-When: Wed Oct 23 22:21:49 UTC 2013 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

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