- 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]

2 files changed, 35 insertions, 20 deletions

diff --git a/emulators/dosbox/Makefile b/emulators/dosbox/Makefile
index 4329ff76fea1..63da1ae1a9f1 100644
--- a/emulators/dosbox/Makefile
+++ b/emulators/dosbox/Makefile
@@ -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 DEBUGGER_HEAVY
 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>
diff --git a/emulators/dosbox/files/patch-src-fpu-fpu_instructions_x86.h b/emulators/dosbox/files/patch-src-fpu-fpu_instructions_x86.h
new file mode 100644
index 000000000000..7af25db04960
--- /dev/null
+++ b/emulators/dosbox/files/patch-src-fpu-fpu_instructions_x86.h
@@ -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);
+ }