From owner-freebsd-ports-bugs@FreeBSD.ORG Mon May 12 10:30:10 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 DE0AE37B401 for ; Mon, 12 May 2003 10:30:10 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E694443F85 for ; Mon, 12 May 2003 10:30:09 -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 h4CHU9Up032428 for ; Mon, 12 May 2003 10:30:09 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h4CHU9k4032427; Mon, 12 May 2003 10:30:09 -0700 (PDT) Resent-Date: Mon, 12 May 2003 10:30:09 -0700 (PDT) Resent-Message-Id: <200305121730.h4CHU9k4032427@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Tom Carrick Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B95C837B401 for ; Mon, 12 May 2003 10:20:20 -0700 (PDT) Received: from knyghtmare.com (pc2-darl2-5-cust48.midd.cable.ntl.com [81.102.72.48]) by mx1.FreeBSD.org (Postfix) with SMTP id 540CF43FE0 for ; Mon, 12 May 2003 10:20:19 -0700 (PDT) (envelope-from knyghtmare@knyghtmare.com) Received: (qmail 40781 invoked by uid 1000); 12 May 2003 17:20:14 -0000 Message-Id: <20030512172014.40780.qmail@knyghtmare.com> Date: 12 May 2003 17:20:14 -0000 From: Tom Carrick To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/52127: Update port: emulators/dosbox - 0.55 > 0.58 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Tom Carrick List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 May 2003 17:30:11 -0000 >Number: 52127 >Category: ports >Synopsis: Update port: emulators/dosbox - 0.55 > 0.58 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon May 12 10:30:09 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Tom Carrick >Release: FreeBSD 4.8-RELEASE i386 >Organization: none >Environment: System: FreeBSD knyghtmare.com 4.8-RELEASE FreeBSD 4.8-RELEASE #3: Tue May 6 05:15:01 BST 2003 root@knyghtmare.com:/usr/obj/usr/src/sys/KNYGHTMARE i386 >Description: Update from 0.55 to 0.58, various changes, including riddance of the .lang file, an optional config file, and various added compatibilty. >How-To-Repeat: N/A >Fix: diff -ruN dosbox.orig/Makefile dosbox/Makefile --- dosbox.orig/Makefile Sun May 11 11:28:34 2003 +++ dosbox/Makefile Sun May 11 13:10:56 2003 @@ -6,8 +6,7 @@ # PORTNAME= dosbox -PORTVERSION= 0.55 -PORTREVISON= 1 +PORTVERSION= 0.58 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -25,15 +24,13 @@ USE_REINPLACE= yes post-patch: - ${REINPLACE_CMD} -e 's##' \ ${WRKSRC}/src/gui/sdlmain.cpp ${WRKSRC}/src/hardware/mixer.cpp - ${REINPLACE_CMD} -e "s#@@PREFIX@@#${PREFIX}#" \ - ${WRKSRC}/src/misc/messages.cpp - + ${REINPLACE_CMD} -e 's###' ${WRKSRC}/include/timer.h + ${REINPLACE_CMD} -e 's#"SDL_thread.h"##' \ + ${WRKSRC}/src/gui/sdlmain.cpp do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/dosbox ${PREFIX}/bin/dosbox - ${MKDIR} ${PREFIX}/share/dosbox - ${INSTALL_DATA} ${WRKSRC}/src/dosbox.lang ${PREFIX}/share/dosbox .if !defined(NOPORTDOCS) ${MKDIR} ${PREFIX}/share/doc/dosbox ${INSTALL_DATA} ${WRKSRC}/NEWS ${PREFIX}/share/doc/dosbox diff -ruN dosbox.orig/distinfo dosbox/distinfo --- dosbox.orig/distinfo Sun May 11 11:28:34 2003 +++ dosbox/distinfo Sun May 11 11:36:04 2003 @@ -1 +1 @@ -MD5 (dosbox-0.55.tar.gz) = b3daf143cb27f9d43b0683c39e26951a +MD5 (dosbox-0.58.tar.gz) = 91c49a597134f35f899d32a8b253205b diff -ruN dosbox.orig/files/patch-src::gui::sdlmain.cpp dosbox/files/patch-src::gui::sdlmain.cpp --- dosbox.orig/files/patch-src::gui::sdlmain.cpp Thu Jan 1 01:00:00 1970 +++ dosbox/files/patch-src::gui::sdlmain.cpp Sun May 11 14:13:16 2003 @@ -0,0 +1,12 @@ +--- 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 diff -ruN dosbox.orig/files/patch-src::misc::messages.cpp dosbox/files/patch-src::misc::messages.cpp --- dosbox.orig/files/patch-src::misc::messages.cpp Sun May 11 11:28:34 2003 +++ dosbox/files/patch-src::misc::messages.cpp Thu Jan 1 01:00:00 1970 @@ -1,12 +0,0 @@ ---- src/misc/messages.cpp.orig Tue Jul 30 15:13:10 2002 -+++ src/misc/messages.cpp Tue Sep 3 09:29:12 2002 -@@ -101,7 +101,7 @@ - /* Load the messages from "dosbox.lang file" */ - first_message=0; - char filein[CROSS_LEN]; -- strcpy(filein,dosbox_basedir); -- strcat(filein,"dosbox.lang"); -+ strcpy(filein,"@@PREFIX@@/share/dosbox/dosbox.lang"); -+/* strcat(filein,"dosbox.lang"); */ - LoadMessageFile(filein); - } diff -ruN dosbox.orig/pkg-plist dosbox/pkg-plist --- dosbox.orig/pkg-plist Sun May 11 11:28:34 2003 +++ dosbox/pkg-plist Sun May 11 14:41:40 2003 @@ -1,6 +1,4 @@ bin/dosbox -share/dosbox/dosbox.lang -@dirrm share/dosbox %%PORTDOCS%%share/doc/dosbox/NEWS %%PORTDOCS%%share/doc/dosbox/README %%PORTDOCS%%@dirrm share/doc/dosbox >Release-Note: >Audit-Trail: >Unformatted: