View | Details | Raw Unified | Return to bug 58174 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-18 / +22 lines)
Lines 6-12 Link Here
6
#
6
#
7
7
8
PORTNAME=	dosbox
8
PORTNAME=	dosbox
9
PORTVERSION=	0.58
9
PORTVERSION=	0.60
10
CATEGORIES=	emulators
10
CATEGORIES=	emulators
11
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
11
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
12
MASTER_SITE_SUBDIR=	${PORTNAME}
12
MASTER_SITE_SUBDIR=	${PORTNAME}
Lines 14-47 Link Here
14
MAINTAINER=	knyghtmare@knyghtmare.com
14
MAINTAINER=	knyghtmare@knyghtmare.com
15
COMMENT=	An emulator of a PC with DOS
15
COMMENT=	An emulator of a PC with DOS
16
16
17
LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12
17
LIB_DEPENDS=	SDL_net.0:${PORTSDIR}/net/sdl_net \
18
18
		png.5:${PORTSDIR}/graphics/png
19
SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
20
19
21
GNU_CONFIGURE=	yes
20
GNU_CONFIGURE=	yes
22
CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}"
23
24
USE_REINPLACE=	yes
21
USE_REINPLACE=	yes
22
USE_SDL=	yes
23
24
MAN1=		dosbox.1
25
PKGMESSAGE=	${WRKDIR}/pkg-message
26
27
CPPFLAGS+=		-I${LOCALBASE}/include
28
CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
29
CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
30
CONFIGURE_ARGS+=	--enable-core-inline
25
31
26
post-patch:
32
post-patch:
27
	@${REINPLACE_CMD} -e 's#"SDL.h"#<SDL11/SDL.h>#' \
33
	@${REINPLACE_CMD} -e 's#SDL\/#SDL11\/#g' ${WRKSRC}/configure
28
		${WRKSRC}/src/gui/sdlmain.cpp ${WRKSRC}/src/hardware/mixer.cpp
34
	@${REINPLACE_CMD} -e 's#\/usr\/share\/doc\/dosbox#${DOCSDIR}#g' \
29
	@${REINPLACE_CMD} -e 's#<SDL.h>#<SDL11/SDL.h>#' ${WRKSRC}/include/timer.h
35
		${WRKSRC}/docs/dosbox.1
30
	@${REINPLACE_CMD} -e 's#"SDL_thread.h"#<SDL11/SDL_thread.h>#' \
36
	@${SED} 's#%%DOCSDIR%%#${DOCSDIR}#' ${PKGDIR}/pkg-message > \
31
		${WRKSRC}/src/gui/sdlmain.cpp
37
		${WRKDIR}/pkg-message
32
38
33
do-install:
39
do-install:
34
	${INSTALL_PROGRAM} ${WRKSRC}/src/dosbox ${PREFIX}/bin/dosbox
40
	${INSTALL_PROGRAM} ${WRKSRC}/src/dosbox ${PREFIX}/bin/dosbox
41
	${INSTALL_MAN} ${WRKSRC}/docs/dosbox.1 ${PREFIX}/man/man1/
35
.if !defined(NOPORTDOCS)
42
.if !defined(NOPORTDOCS)
36
	${MKDIR} ${PREFIX}/share/doc/dosbox
43
	${MKDIR} ${DOCSDIR}
37
	${INSTALL_DATA} ${WRKSRC}/NEWS ${PREFIX}/share/doc/dosbox
44
	${INSTALL_DATA} ${WRKSRC}/NEWS ${DOCSDIR}
38
	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/dosbox
45
	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
39
.endif
46
.endif
40
47
41
post-install:
48
post-install:
42
	@${ECHO_CMD} "================================================="
49
	@${CAT} ${WRKDIR}/pkg-message
43
	@${ECHO_CMD} "Be sure to read the README for usage instructions"
44
	@${ECHO_CMD} "located in ${PREFIX}/share/doc/dosbox by default"
45
	@${ECHO_CMD} "================================================="
46
50
47
.include <bsd.port.mk>
51
.include <bsd.port.mk>
(-)distinfo (-1 / +1 lines)
Line 1 Link Here
1
MD5 (dosbox-0.58.tar.gz) = 91c49a597134f35f899d32a8b253205b
1
MD5 (dosbox-0.60.tar.gz) = ca68955bcc3585630dcf17bab6ec185a
(-)pkg-descr (-4 / +4 lines)
Lines 4-13 Link Here
4
4
5
Currently emulated is:
5
Currently emulated is:
6
6
7
o CPU:286/386 realmode
7
o CPU:286/386 realmode/pmode
8
o GFX:VGA/EGS/CGA
8
o GFX:VGA/EGS/CGA/SVGA/VESA
9
o SND:PC-Speaker/Tandy 3-Voice/Adlib/SoundBlaster
9
o SND:PC-Speaker/Tandy 3-Voice/Adlib/SoundBlaster
10
o MSC:Keyboard/Mouse
10
o MSC:Keyboard/Mouse
11
o DOS:Director FileSystem/XMS/EMS
11
o DOS:Directory FileSystem/XMS/EMS
12
12
13
WWW: http://dosbox.zophar.net/
13
WWW: http://dosbox.sourceforge.net/
(-)pkg-message (+4 lines)
Added Link Here
1
=================================================
2
Be sure to read the README for usage instructions
3
located in %%DOCSDIR%% by default
4
=================================================
(-)pkg-plist (-4 / +3 lines)
Lines 1-5 Link Here
1
bin/dosbox
1
bin/dosbox
2
%%PORTDOCS%%share/doc/dosbox/NEWS
2
%%PORTDOCS%%%%DOCSDIR%%/NEWS
3
%%PORTDOCS%%share/doc/dosbox/README
3
%%PORTDOCS%%%%DOCSDIR%%/README
4
%%PORTDOCS%%@dirrm share/doc/dosbox
4
%%PORTDOCS%%@dirrm %%DOCSDIR%%
5
@dirrm share/dosbox
(-)files/patch-configure (+11 lines)
Added Link Here
1
--- configure.orig	Sun Oct 19 13:46:59 2003
2
+++ configure	Sun Oct 19 13:47:15 2003
3
@@ -5350,7 +5350,7 @@
4
 
5
   if test x$enable_core_inline = xyes ; then
6
     echo "$as_me:$LINENO: result: enabling inlined memory handling in CPU Core" >&5
7
-echo "${ECHO_T}enabling inlined memory handling in CPU Core" >&6,
8
+echo "${ECHO_T}enabling inlined memory handling in CPU Core" >&6
9
     cat >>confdefs.h <<\_ACEOF
10
 #define C_CORE_INLINE 1
11
 _ACEOF
(-)files/patch-src::gui::sdlmain.cpp (-12 lines)
Removed Link Here
1
--- src/gui/sdlmain.cpp.orig	Sun May 11 14:05:10 2003
2
+++ src/gui/sdlmain.cpp	Sun May 11 14:06:05 2003
3
@@ -39,9 +39,7 @@
4
 //#define DISABLE_JOYSTICK
5
 #define C_GFXTHREADED 1						//Enabled by default
6
 
7
-#if defined(MACOSX)
8
 extern char** environ;
9
-#endif
10
 
11
 struct SDL_Block {
12
 	volatile bool active;						//If this isn't set don't draw

Return to bug 58174