[Midnightbsd-cvs] mports [18548] trunk/emulators/dosbox: fix png depends for dosbox

[laffer1 at midnightbsd.org]

Revision: 18548
          http://svnweb.midnightbsd.org/mports/?rev=18548
Author:   laffer1
Date:     2015-04-04 07:57:30 -0400 (Sat, 04 Apr 2015)
Log Message:
-----------
fix png depends for dosbox

Modified Paths:
--------------
    trunk/emulators/dosbox/Makefile
    trunk/emulators/dosbox/pkg-plist

Added Paths:
-----------
    trunk/emulators/dosbox/files/patch-src-fpu-fpu_instructions_x86.h
    trunk/emulators/dosbox/files/patch-src_cpu_core_dyn_x86_risc_x86.h

Modified: trunk/emulators/dosbox/Makefile
===================================================================
--- trunk/emulators/dosbox/Makefile	2015-04-04 11:47:10 UTC (rev 18547)
+++ trunk/emulators/dosbox/Makefile	2015-04-04 11:57:30 UTC (rev 18548)
@@ -2,20 +2,21 @@
 
 PORTNAME=	dosbox
 PORTVERSION=	0.74
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	SF
 
 MAINTAINER=	ports at MidnightBSD.org
-COMMENT=	An emulator of a PC with DOS
+COMMENT=	Emulator of a PC with DOS
+
 LICENSE=	gpl2
 
-LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
 
 GNU_CONFIGURE=	yes
 USE_SDL=	sdl net sound
+PORTDOCS=	NEWS README
 
-MAN1=		dosbox.1
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 CPPFLAGS+=		-I${LOCALBASE}/include
@@ -22,11 +23,17 @@
 CONFIGURE_ARGS+=	--enable-core-inline
 
 DESKTOP_ENTRIES="DOSBox" "${COMMENT}" \
-		"" "dosbox" \
+		"${TRUE_PREFIX}/share/pixmaps/dosbox.ico" "dosbox" \
 		"System;Emulator;" "true"
 
-.include <bsd.mport.options.mk>
+OPTIONS_RADIO=	DEBUGGER
+OPTIONS_RADIO_DEBUGGER=DEBUGGER_ENABLE DEBUGGER_HEAVY
+DEBUGGER_ENABLE_DESC=Enable internal debugger
+DEBUGGER_HEAVY_DESC=Enable internal debugger with extra features
 
+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
@@ -33,12 +40,9 @@
 
 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 ${PREFIX}/man/man1/
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/NEWS ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/INSTALL ${DOCSDIR}
-.endif
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 
 .include <bsd.port.mk>

Added: trunk/emulators/dosbox/files/patch-src-fpu-fpu_instructions_x86.h
===================================================================
--- trunk/emulators/dosbox/files/patch-src-fpu-fpu_instructions_x86.h	                        (rev 0)
+++ trunk/emulators/dosbox/files/patch-src-fpu-fpu_instructions_x86.h	2015-04-04 11:57:30 UTC (rev 18548)
@@ -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);
+ }


Property changes on: trunk/emulators/dosbox/files/patch-src-fpu-fpu_instructions_x86.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/emulators/dosbox/files/patch-src_cpu_core_dyn_x86_risc_x86.h
===================================================================
--- trunk/emulators/dosbox/files/patch-src_cpu_core_dyn_x86_risc_x86.h	                        (rev 0)
+++ trunk/emulators/dosbox/files/patch-src_cpu_core_dyn_x86_risc_x86.h	2015-04-04 11:57:30 UTC (rev 18548)
@@ -0,0 +1,11 @@
+--- src/cpu/core_dyn_x86/risc_x86.h.orig	2014-12-31 12:59:53.015190887 +0000
++++ src/cpu/core_dyn_x86/risc_x86.h	2014-12-31 13:00:30.953180886 +0000
+@@ -138,7 +138,7 @@
+ 		"run_return_adress:					\n"
+ 		"popl %%ebp							\n"
+ 		:"=a" (retval), "=c" (tempflags)
+-		:"r" (tempflags),"r" (code)
++		:"a" (tempflags),"r" (code)
+ 		:"%edx","%ebx","%edi","%esi","cc","memory"
+ 	);
+ 	reg_flags=(reg_flags & ~FMASK_TEST) | (tempflags & FMASK_TEST);


Property changes on: trunk/emulators/dosbox/files/patch-src_cpu_core_dyn_x86_risc_x86.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/emulators/dosbox/pkg-plist
===================================================================
--- trunk/emulators/dosbox/pkg-plist	2015-04-04 11:47:10 UTC (rev 18547)
+++ trunk/emulators/dosbox/pkg-plist	2015-04-04 11:57:30 UTC (rev 18548)
@@ -1,5 +1,6 @@
 bin/dosbox
+man/man1/dosbox.1.gz
+share/pixmaps/dosbox.ico
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%@dirrm %%DOCSDIR%%