From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Oct 19 06:10:29 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AD84616A4B3 for ; Sun, 19 Oct 2003 06:10:29 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id F3F7A43FA3 for ; Sun, 19 Oct 2003 06:10:28 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h9JDAQFY044012 for ; Sun, 19 Oct 2003 06:10:26 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h9JDAQnC044010; Sun, 19 Oct 2003 06:10:26 -0700 (PDT) (envelope-from gnats) Date: Sun, 19 Oct 2003 06:10:26 -0700 (PDT) Message-Id: <200310191310.h9JDAQnC044010@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org From: Marius Strobl Subject: Re: ports/58174: [maintainer update] update emulators/dosbox to 0.60 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Marius Strobl List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Oct 2003 13:10:29 -0000 The following reply was made to PR ports/58174; it has been noted by GNATS. From: Marius Strobl To: Alexander Leidinger Cc: knyghtmare@knyghtmare.com, freebsd-gnats-submit@FreeBSD.org Subject: Re: ports/58174: [maintainer update] update emulators/dosbox to 0.60 Date: Sun, 19 Oct 2003 15:03:05 +0200 --27ZtN5FSuKKSZcBU Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Sun, Oct 19, 2003 at 10:27:29AM +0200, Alexander Leidinger wrote: > On Sun, 19 Oct 2003 01:41:23 +0200 > Marius Strobl wrote: > > > +CONFIGURE_ARGS+= --enable-core-inline=${TRUE} > > Why ${TRUE} (= /path/to/true)? > Shell built-in true by default actually. However, good catch, when merging Tom's and my update patch I took that switch from Tom's patch, looked up its meaning but obviously didn't pay attention to the RHS. Setting it to ${TRUE} seems to be thought as a workaround for a bug in the configure script (resp. configure.in) that would cause the script to barf when run with '--enable-core-inline' or '--enable-core-inline=yes'. However, it didn't enable the inlining either. Attached is an update patch that really enables the inlining: @@ -58,6 +59,7 @@ checking for libasound headers version >= 0.9.0... not present. checking for snd_ctl_open in -lasound... no checking whether byte ordering is bigendian... no +enabling inlined memory handling in CPU Core checking png.h usability... yes checking png.h presence... yes checking for png.h... yes --27ZtN5FSuKKSZcBU Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="emulators::dosbox.diff" Index: Makefile =================================================================== RCS file: /mnt/futile/usr/data/bsd/cvs/fbsd/ports/emulators/dosbox/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- Makefile 16 Aug 2003 11:44:40 -0000 1.4 +++ Makefile 19 Oct 2003 11:54:29 -0000 @@ -6,7 +6,7 @@ # PORTNAME= dosbox -PORTVERSION= 0.58 +PORTVERSION= 0.60 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -14,34 +14,38 @@ MAINTAINER= knyghtmare@knyghtmare.com COMMENT= An emulator of a PC with DOS -LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12 - -SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config +LIB_DEPENDS= SDL_net.0:${PORTSDIR}/net/sdl_net \ + png.5:${PORTSDIR}/graphics/png GNU_CONFIGURE= yes -CONFIGURE_ENV= SDL_CONFIG="${SDL_CONFIG}" - USE_REINPLACE= yes +USE_SDL= yes + +MAN1= dosbox.1 +PKGMESSAGE= ${WRKDIR}/pkg-message + +CPPFLAGS+= -I${LOCALBASE}/include +CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_ARGS+= --enable-core-inline post-patch: - @${REINPLACE_CMD} -e 's#"SDL.h"##' \ - ${WRKSRC}/src/gui/sdlmain.cpp ${WRKSRC}/src/hardware/mixer.cpp - @${REINPLACE_CMD} -e 's###' ${WRKSRC}/include/timer.h - @${REINPLACE_CMD} -e 's#"SDL_thread.h"##' \ - ${WRKSRC}/src/gui/sdlmain.cpp + @${REINPLACE_CMD} -e 's#SDL\/#SDL11\/#g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's#\/usr\/share\/doc\/dosbox#${DOCSDIR}#g' \ + ${WRKSRC}/docs/dosbox.1 + @${SED} 's#%%DOCSDIR%%#${DOCSDIR}#' ${PKGDIR}/pkg-message > \ + ${WRKDIR}/pkg-message do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/dosbox ${PREFIX}/bin/dosbox + ${INSTALL_MAN} ${WRKSRC}/docs/dosbox.1 ${PREFIX}/man/man1/ .if !defined(NOPORTDOCS) - ${MKDIR} ${PREFIX}/share/doc/dosbox - ${INSTALL_DATA} ${WRKSRC}/NEWS ${PREFIX}/share/doc/dosbox - ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/dosbox + ${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/NEWS ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} .endif post-install: - @${ECHO_CMD} "=================================================" - @${ECHO_CMD} "Be sure to read the README for usage instructions" - @${ECHO_CMD} "located in ${PREFIX}/share/doc/dosbox by default" - @${ECHO_CMD} "=================================================" + @${CAT} ${WRKDIR}/pkg-message .include Index: distinfo =================================================================== RCS file: /mnt/futile/usr/data/bsd/cvs/fbsd/ports/emulators/dosbox/distinfo,v retrieving revision 1.2 diff -u -r1.2 distinfo --- distinfo 26 Jul 2003 00:03:00 -0000 1.2 +++ distinfo 18 Oct 2003 10:38:55 -0000 @@ -1 +1 @@ -MD5 (dosbox-0.58.tar.gz) = 91c49a597134f35f899d32a8b253205b +MD5 (dosbox-0.60.tar.gz) = ca68955bcc3585630dcf17bab6ec185a Index: pkg-descr =================================================================== RCS file: /mnt/futile/usr/data/bsd/cvs/fbsd/ports/emulators/dosbox/pkg-descr,v retrieving revision 1.1 diff -u -r1.1 pkg-descr --- pkg-descr 1 May 2003 22:19:27 -0000 1.1 +++ pkg-descr 18 Oct 2003 10:53:45 -0000 @@ -4,10 +4,10 @@ Currently emulated is: -o CPU:286/386 realmode -o GFX:VGA/EGS/CGA +o CPU:286/386 realmode/pmode +o GFX:VGA/EGS/CGA/SVGA/VESA o SND:PC-Speaker/Tandy 3-Voice/Adlib/SoundBlaster o MSC:Keyboard/Mouse -o DOS:Director FileSystem/XMS/EMS +o DOS:Directory FileSystem/XMS/EMS -WWW: http://dosbox.zophar.net/ +WWW: http://dosbox.sourceforge.net/ Index: pkg-message =================================================================== RCS file: pkg-message diff -N pkg-message --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pkg-message 18 Oct 2003 10:38:55 -0000 @@ -0,0 +1,4 @@ +================================================= +Be sure to read the README for usage instructions +located in %%DOCSDIR%% by default +================================================= Index: pkg-plist =================================================================== RCS file: /mnt/futile/usr/data/bsd/cvs/fbsd/ports/emulators/dosbox/pkg-plist,v retrieving revision 1.3 diff -u -r1.3 pkg-plist --- pkg-plist 16 Aug 2003 11:44:40 -0000 1.3 +++ pkg-plist 18 Oct 2003 10:38:55 -0000 @@ -1,5 +1,4 @@ bin/dosbox -%%PORTDOCS%%share/doc/dosbox/NEWS -%%PORTDOCS%%share/doc/dosbox/README -%%PORTDOCS%%@dirrm share/doc/dosbox -@dirrm share/dosbox +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%@dirrm %%DOCSDIR%% Index: files/patch-configure =================================================================== RCS file: files/patch-configure diff -N files/patch-configure --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-configure 19 Oct 2003 11:47:45 -0000 @@ -0,0 +1,11 @@ +--- configure.orig Sun Oct 19 13:46:59 2003 ++++ configure Sun Oct 19 13:47:15 2003 +@@ -5350,7 +5350,7 @@ + + if test x$enable_core_inline = xyes ; then + echo "$as_me:$LINENO: result: enabling inlined memory handling in CPU Core" >&5 +-echo "${ECHO_T}enabling inlined memory handling in CPU Core" >&6, ++echo "${ECHO_T}enabling inlined memory handling in CPU Core" >&6 + cat >>confdefs.h <<\_ACEOF + #define C_CORE_INLINE 1 + _ACEOF Index: files/patch-src::gui::sdlmain.cpp =================================================================== RCS file: files/patch-src::gui::sdlmain.cpp diff -N files/patch-src::gui::sdlmain.cpp --- files/patch-src::gui::sdlmain.cpp 29 Jul 2003 00:49:08 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ ---- src/gui/sdlmain.cpp.orig Sun May 11 14:05:10 2003 -+++ src/gui/sdlmain.cpp Sun May 11 14:06:05 2003 -@@ -39,9 +39,7 @@ - //#define DISABLE_JOYSTICK - #define C_GFXTHREADED 1 //Enabled by default - --#if defined(MACOSX) - extern char** environ; --#endif - - struct SDL_Block { - volatile bool active; //If this isn't set don't draw --27ZtN5FSuKKSZcBU--