From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Sep 25 18:10:30 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org 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 BB91D16A415 for ; Mon, 25 Sep 2006 18:10:30 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A32E443D5F for ; Mon, 25 Sep 2006 18:10:23 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k8PIANoq035619 for ; Mon, 25 Sep 2006 18:10:23 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k8PIANBn035618; Mon, 25 Sep 2006 18:10:23 GMT (envelope-from gnats) Resent-Date: Mon, 25 Sep 2006 18:10:23 GMT Resent-Message-Id: <200609251810.k8PIANBn035618@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, KATO Tsuguru Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B199A16A40F for ; Mon, 25 Sep 2006 18:00:48 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from nm05omta05b.dion.ne.jp (nm05mta.dion.ne.jp [219.125.112.11]) by mx1.FreeBSD.org (Postfix) with SMTP id DA2EF43D5A for ; Mon, 25 Sep 2006 18:00:41 +0000 (GMT) (envelope-from tkato432@yahoo.com) Received: from localhost ([211.126.34.28]) by nm05mta.dion.ne.jp id <20060926030037975.MAA2.846DC30@nm05mta.dion.ne.jp>; Tue, 26 Sep 2006 03:00:37 +0900 Message-Id: <20060926030010.46409f02.tkato432@yahoo.com> Date: Tue, 26 Sep 2006 03:00:10 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/103635: Update port: emulators/bochs to 2.3 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Sep 2006 18:10:30 -0000 >Number: 103635 >Category: ports >Synopsis: Update port: emulators/bochs to 2.3 >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 Sep 25 18:10:23 GMT 2006 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.11-RELEASE-p22 i386 >Organization: >Environment: >Description: - Update to version 2.3 Remove file: files/patch-ae files/patch-iodev-eth_vde.cc >How-To-Repeat: >Fix: diff -urN /usr/ports/emulators/bochs/Makefile emulators/bochs/Makefile --- /usr/ports/emulators/bochs/Makefile Thu May 18 02:06:04 2006 +++ emulators/bochs/Makefile Sun Sep 17 13:43:02 2006 @@ -7,8 +7,7 @@ # PORTNAME= bochs -PORTVERSION= 2.2.6 -PORTEPOCH= 2 +PORTVERSION= 2.3 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -129,6 +128,7 @@ s|bios/VGABIOS|${DATADIR}/VGABIOS|; \ ' ${WRKSRC}/.bochsrc @${REINPLACE_CMD} -E ' \ + s|install_share install_doc|install_share|; \ s|(^sharedir.+=).+|\1 ${DATADIR}|; \ s|(^docdir.+=).+|\1 ${DOCSDIR}|; \ ' ${WRKSRC}/Makefile.in @@ -141,6 +141,10 @@ post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/CHANGES ${DOCSDIR}/CHANGES + @${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/README + @${INSTALL_DATA} ${WRKSRC}/TODO ${DOCSDIR}/TODO + @${INSTALL_DATA} ${WRKSRC}/.bochsrc ${DOCSDIR}/bochsrc-sample.txt @${INSTALL_DATA} ${WRKSRC}/docs-html/*.txt ${DOCSDIR} @${MKDIR} ${DOCSDIR}/html @${INSTALL_DATA} ${WRKSRC}/docs-html/*.html ${DOCSDIR}/html diff -urN /usr/ports/emulators/bochs/distinfo emulators/bochs/distinfo --- /usr/ports/emulators/bochs/distinfo Fri Mar 17 13:33:34 2006 +++ emulators/bochs/distinfo Sun Sep 17 13:23:17 2006 @@ -1,3 +1,3 @@ -MD5 (bochs-2.2.6.tar.gz) = 961482eb78b55fe3e0e0639e34b4c2c1 -SHA256 (bochs-2.2.6.tar.gz) = 25447ca196794bb2e00d314038f75ad8aeead87dcf34e9501598b900dea639ee -SIZE (bochs-2.2.6.tar.gz) = 3765867 +MD5 (bochs-2.3.tar.gz) = 100c02fbcd402c2b4862d0251be539fd +SHA256 (bochs-2.3.tar.gz) = fd926f3915d0619ddde8dedd02dac661f3233d77f3fc2ec7f94e1e028398497a +SIZE (bochs-2.3.tar.gz) = 3812273 diff -urN /usr/ports/emulators/bochs/files/patch-ae emulators/bochs/files/patch-ae --- /usr/ports/emulators/bochs/files/patch-ae Sun Jan 18 13:33:55 2004 +++ emulators/bochs/files/patch-ae Thu Jan 1 09:00:00 1970 @@ -1,12 +0,0 @@ -$FreeBSD: ports/emulators/bochs/files/patch-ae,v 1.3 2004/01/17 23:22:07 anholt Exp $ ---- bx_debug/lexer.l.orig Tue Apr 10 03:57:02 2001 -+++ bx_debug/lexer.l Sun May 20 13:25:29 2001 -@@ -105,7 +105,7 @@ - \/[0-9]+ { bxlval.sval = strdup(bxtext); return(BX_TOKEN_XFORMAT); } - 0x[0-9a-fA-F]+ { bxlval.uval = strtoul(bxtext+2, NULL, 16); return(BX_TOKEN_NUMERIC); } - 0[0-7]+ { bxlval.uval = strtoul(bxtext+1, NULL, 8); return(BX_TOKEN_NUMERIC); } --[0-9]+L { bxlval.ulval = strtoull(bxtext, NULL, 10); return(BX_TOKEN_LONG_NUMERIC); } -+[0-9]+L { bxlval.ulval = strtouq(bxtext, NULL, 10); return(BX_TOKEN_LONG_NUMERIC); } - [0-9]+ { bxlval.uval = strtoul(bxtext, NULL, 10); return(BX_TOKEN_NUMERIC); } - $[a-zA-Z_][a-zA-Z0-9_]* { bxlval.sval = strdup(bxtext); return(BX_TOKEN_SYMBOLNAME); } - \n { return('\n'); } diff -urN /usr/ports/emulators/bochs/files/patch-iodev-eth_vde.cc emulators/bochs/files/patch-iodev-eth_vde.cc --- /usr/ports/emulators/bochs/files/patch-iodev-eth_vde.cc Sun Mar 19 15:51:29 2006 +++ emulators/bochs/files/patch-iodev-eth_vde.cc Thu Jan 1 09:00:00 1970 @@ -1,27 +0,0 @@ ---- iodev/eth_vde.cc.orig Sat Dec 10 16:37:35 2005 -+++ iodev/eth_vde.cc Sat Mar 18 00:25:18 2006 -@@ -41,18 +41,22 @@ - #include - #include - #include --#include - #include - #include - #include - #include -+#if defined(__linux__) -+#include - #include - #include -+#elif BX_HAVE_NET_IF_H -+#include -+#endif - #include - #include - #include - #include --#include -+#include - - #define SWITCH_MAGIC 0xfeedface - diff -urN /usr/ports/emulators/bochs/pkg-plist emulators/bochs/pkg-plist --- /usr/ports/emulators/bochs/pkg-plist Fri Mar 17 13:33:34 2006 +++ emulators/bochs/pkg-plist Sun Sep 17 13:48:13 2006 @@ -7,9 +7,9 @@ %%DATADIR%%/VGABIOS-elpin-LICENSE %%DATADIR%%/VGABIOS-lgpl-README %%DATADIR%%/VGABIOS-lgpl-latest -%%DATADIR%%/VGABIOS-lgpl-latest-debug %%DATADIR%%/VGABIOS-lgpl-latest-cirrus %%DATADIR%%/VGABIOS-lgpl-latest-cirrus-debug +%%DATADIR%%/VGABIOS-lgpl-latest-debug %%DATADIR%%/keymaps/sdl-pc-de.map %%DATADIR%%/keymaps/sdl-pc-us.map %%DATADIR%%/keymaps/x11-pc-be.map @@ -23,19 +23,19 @@ %%DATADIR%%/keymaps/x11-pc-si.map %%DATADIR%%/keymaps/x11-pc-uk.map %%DATADIR%%/keymaps/x11-pc-us.map -%%DOCSDIR%%/CHANGES -%%DOCSDIR%%/COPYING -%%DOCSDIR%%/README -%%DOCSDIR%%/TODO -%%DOCSDIR%%/bochsrc-sample.txt +%%PORTDOCS%%%%DOCSDIR%%/CHANGES +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/TODO %%PORTDOCS%%%%DOCSDIR%%/biossums.txt +%%PORTDOCS%%%%DOCSDIR%%/bochsrc-sample.txt %%PORTDOCS%%%%DOCSDIR%%/cvs-structure.txt %%PORTDOCS%%%%DOCSDIR%%/html/Linux.html %%PORTDOCS%%%%DOCSDIR%%/html/cosimulation.html %%PORTDOCS%%%%DOCSDIR%%/html/index.html %%PORTDOCS%%%%DOCSDIR%%/html/iodebug.html +%%PORTDOCS%%%%DOCSDIR%%/memory.txt %%PORTDOCS%%%%DOCSDIR%%/random.txt %%PORTDOCS%%@dirrm %%DOCSDIR%%/html +%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%DATADIR%%/keymaps @dirrm %%DATADIR%% -@dirrm %%DOCSDIR%% >Release-Note: >Audit-Trail: >Unformatted: