From owner-svn-ports-head@FreeBSD.ORG Wed Oct 23 22:15:16 2013 Return-Path: Delivered-To: svn-ports-head@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 548F5E9A; Wed, 23 Oct 2013 22:15:16 +0000 (UTC) (envelope-from ak@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4099D2518; Wed, 23 Oct 2013 22:15:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NMFGLW071551; Wed, 23 Oct 2013 22:15:16 GMT (envelope-from ak@svn.freebsd.org) Received: (from ak@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NMFFDX071549; Wed, 23 Oct 2013 22:15:15 GMT (envelope-from ak@svn.freebsd.org) Message-Id: <201310232215.r9NMFFDX071549@svn.freebsd.org> From: Alex Kozlov Date: Wed, 23 Oct 2013 22:15:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331434 - in head/emulators/dosbox: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Oct 2013 22:15:16 -0000 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 (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 - -.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 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); + }