From owner-freebsd-ports Fri Jul 12 12:30:30 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C3FDB37B401 for ; Fri, 12 Jul 2002 12:30:03 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A96B643E88 for ; Fri, 12 Jul 2002 12:30:02 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6CJU2JU085716 for ; Fri, 12 Jul 2002 12:30:02 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6CJU2Re085715; Fri, 12 Jul 2002 12:30:02 -0700 (PDT) Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5472F37B400 for ; Fri, 12 Jul 2002 12:21:01 -0700 (PDT) Received: from www.freebsd.org (www.FreeBSD.org [216.136.204.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id 06F6743E58 for ; Fri, 12 Jul 2002 12:21:01 -0700 (PDT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.12.4/8.12.4) with ESMTP id g6CJL0OT006149 for ; Fri, 12 Jul 2002 12:21:00 -0700 (PDT) (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.12.4/8.12.4/Submit) id g6CJL00F006148; Fri, 12 Jul 2002 12:21:00 -0700 (PDT) Message-Id: <200207121921.g6CJL00F006148@www.freebsd.org> Date: Fri, 12 Jul 2002 12:21:00 -0700 (PDT) From: KATO Tsuguru To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-1.0 Subject: ports/40495: Update port: emulators/bochs to 1.4.1 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 40495 >Category: ports >Synopsis: Update port: emulators/bochs to 1.4.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Jul 12 12:30:02 PDT 2002 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.6-RELEASE i386 >Organization: >Environment: >Description: - Update to version 1.4.1 Remove file: files/patch-main.cc >How-To-Repeat: >Fix: diff -urN /usr/ports/emulators/bochs/Makefile emulators/bochs/Makefile --- /usr/ports/emulators/bochs/Makefile Fri Jun 21 19:09:05 2002 +++ emulators/bochs/Makefile Wed Jul 10 05:41:02 2002 @@ -7,7 +7,7 @@ # PORTNAME= bochs -PORTVERSION= 1.4 +PORTVERSION= 1.4.1 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ @@ -16,30 +16,30 @@ MAINTAINER= ports@FreeBSD.org -.include - -.if ${XFREE86_VERSION} == 4 -BUILD_DEPENDS+= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients -RUN_DEPENDS+= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients -.endif - # Global variables # USE_XLIB= yes +USE_REINPLACE= yes USE_GMAKE= yes -USE_AUTOCONF= yes -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --enable-cdrom \ - --disable-split-hd +USE_AUTOCONF_VER= 213 +CONFIGURE_ARGS= --disable-split-hd -CFLAGS+= -fno-rtti -fno-exceptions -fomit-frame-pointer \ - -I${X11BASE}/include +CFLAGS+= -fno-rtti -fno-exceptions -fomit-frame-pointer # PREFIX isn't honored. force it w/ prefix. MAKE_ARGS= prefix=${PREFIX} +MAN1= bochs.1 bochsrc.1 bximage.1 + +.include + +.if ${XFREE86_VERSION} == 4 +BUILD_DEPENDS+= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients +RUN_DEPENDS+= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients +.endif + .if defined(WITH_BOCHS_PROCESSORS) .if ${WITH_BOCHS_CPU_LEVEL} < 1 || ${WITH_BOCHS_CPU_LEVEL} > 15 .error "WITH_BOCHS_CPU_LEVEL must be an integer value between 1 and 15." @@ -71,8 +71,6 @@ CONFIGURE_ARGS+= --enable-sb16=linux .endif -MAN1= bochs.1 bochsrc.1 bximage.1 - MSG_FILE= ${PKGDIR}/pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message @@ -131,13 +129,13 @@ post-patch: patch-bochsrc patch-mans patch-wrapper patch-message patch-bochsrc: - @${PERL} -pi.fbsd -e ' \ + @${REINPLACE_CMD} -e ' \ s|^vgaromimage:\sbios/|vgaromimage: ${BIOS_DIR}/|; \ s|^romimage:\sfile=bios/|romimage: file=${BIOS_DIR}/|; \ ' ${WRKSRC}/.bochsrc patch-mans: - @${PERL} -pi.fbsd -e ' \ + @${REINPLACE_CMD} -e ' \ s|/usr/local/bochs|${DATADIR}|; \ s|\@VERSION\@|${PORTVERSION}|; \ ' ${WRKSRC}/doc/man/*.1 @@ -165,38 +163,38 @@ install-bios install-fonts install-docs install-bins: - @${INSTALL_PROGRAM} ${WRKSRC}/bochs ${PREFIX}/libexec/bochs.bin - @${INSTALL_PROGRAM} ${WRKSRC}/bximage ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/bochs ${PREFIX}/libexec/bochs.bin + ${INSTALL_PROGRAM} ${WRKSRC}/bximage ${PREFIX}/bin install-mans: .for mansect in 1 .for man in ${MAN${mansect}} - @${INSTALL_MAN} ${WRKSRC}/doc/man/${man} \ + ${INSTALL_MAN} ${WRKSRC}/doc/man/${man} \ ${MAN${mansect}PREFIX}/man/man${mansect} .endfor .endfor install-bochsrc: @${MKDIR} ${DATADIR} - @${INSTALL_DATA} ${WRKSRC}/.bochsrc ${DATADIR}/bochsrc.sample + ${INSTALL_DATA} ${WRKSRC}/.bochsrc ${DATADIR}/bochsrc.sample install-bios: @${MKDIR} ${BIOS_DIR} - @${INSTALL_DATA} ${WRKSRC}/bios/VGABIOS-* ${BIOS_DIR} - @${INSTALL_DATA} ${WRKSRC}/bios/BIOS-* ${BIOS_DIR} + ${INSTALL_DATA} ${WRKSRC}/bios/VGABIOS-* ${BIOS_DIR} + ${INSTALL_DATA} ${WRKSRC}/bios/BIOS-* ${BIOS_DIR} install-fonts: @${MKDIR} ${FONT_DIR} - @${INSTALL_DATA} ${WRKSRC}/font/vga.pcf.gz ${FONT_DIR} + ${INSTALL_DATA} ${WRKSRC}/font/vga.pcf.gz ${FONT_DIR} @${MKFONTDIR} ${FONT_DIR} install-docs: .if !defined(NOPORTDOCS) + @${MKDIR} ${DOCSDIR} + ${INSTALL_MAN} ${WRKSRC}/docs-html/*.txt ${DOCSDIR} @${MKDIR} ${DOCSDIR}/html - @${INSTALL_MAN} ${WRKSRC}/docs-html/*.html ${DOCSDIR}/html - @${INSTALL_DATA} ${WRKSRC}/docs-html/*.gif ${DOCSDIR}/html - @${INSTALL_MAN} ${WRKSRC}/docs-html/*.txt ${DOCSDIR}/html - @${MV} ${DOCSDIR}/html/*.txt ${DOCSDIR} + ${INSTALL_MAN} ${WRKSRC}/docs-html/*.html ${DOCSDIR}/html + ${INSTALL_DATA} ${WRKSRC}/docs-html/*.gif ${DOCSDIR}/html .endif # Post-install @@ -205,7 +203,7 @@ post-install: install-script display-message install-script: - @${INSTALL_SCRIPT} ${WRKDIR}/bochs.sh ${PREFIX}/bin/bochs + ${INSTALL_SCRIPT} ${WRKDIR}/bochs.sh ${PREFIX}/bin/bochs display-message: @${ECHO_MSG} diff -urN /usr/ports/emulators/bochs/distinfo emulators/bochs/distinfo --- /usr/ports/emulators/bochs/distinfo Fri May 17 20:13:42 2002 +++ emulators/bochs/distinfo Wed Jul 10 02:55:59 2002 @@ -1 +1 @@ -MD5 (bochs-1.4.tar.gz) = e8a6ad67f78c63423545806886f8c66a +MD5 (bochs-1.4.1.tar.gz) = 12e591b5cec2e0051e18605483f64678 diff -urN /usr/ports/emulators/bochs/files/patch-main.cc emulators/bochs/files/patch-main.cc --- /usr/ports/emulators/bochs/files/patch-main.cc Wed Jun 19 10:07:13 2002 +++ emulators/bochs/files/patch-main.cc Thu Jan 1 09:00:00 1970 @@ -1,11 +0,0 @@ ---- main.cc.orig Thu May 16 04:26:43 2002 -+++ main.cc Thu May 16 04:26:55 2002 -@@ -1174,7 +1174,7 @@ - BX_MEM(0)->load_ROM(bx_options.vgarom.Opath->getptr (), 0xc0000); - BX_CPU(0)->init (BX_MEM(0)); - #if BX_SUPPORT_APIC -- BX_CPU(0)->local_apic.set_id (i); -+ BX_CPU(0)->local_apic.set_id (0); - #endif - BX_CPU(0)->reset(BX_RESET_HARDWARE); - #else >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message