From owner-svn-ports-head@FreeBSD.ORG Wed May 29 05:29:30 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id E4AF8115; Wed, 29 May 2013 05:29:30 +0000 (UTC) (envelope-from miwi@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id BDC33A5F; Wed, 29 May 2013 05:29:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4T5TUh7022504; Wed, 29 May 2013 05:29:30 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4T5TU1X022499; Wed, 29 May 2013 05:29:30 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201305290529.r4T5TU1X022499@svn.freebsd.org> From: Martin Wilke Date: Wed, 29 May 2013 05:29:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r319346 - head/emulators/bochs X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 May 2013 05:29:31 -0000 Author: miwi Date: Wed May 29 05:29:30 2013 New Revision: 319346 URL: http://svnweb.freebsd.org/changeset/ports/319346 Log: - Update to 2.6.2 PR: 179055 Submitted by: Ports Fury Modified: head/emulators/bochs/Makefile head/emulators/bochs/distinfo Modified: head/emulators/bochs/Makefile ============================================================================== --- head/emulators/bochs/Makefile Wed May 29 05:28:26 2013 (r319345) +++ head/emulators/bochs/Makefile Wed May 29 05:29:30 2013 (r319346) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= bochs -PORTVERSION= 2.6.1 -PORTREVISION= 1 +PORTVERSION= 2.6.2 PORTEPOCH= 2 CATEGORIES= emulators MASTER_SITES= SF @@ -73,7 +72,7 @@ USB_OHCI_DESC= Enable USB OHCI support USB_XHCI_DESC= Enable experimental USB xHCI support VMX_DESC= Enable Virtialization extensions VOODOO_DESC= Enable 3dfx Voodoo Graphics emulation -X86_64_DESC= Enable AMD x86-64 support +X86_64_DESC= Enable x86-64 instructions support USE_GMAKE= yes USE_AUTOTOOLS= libtool @@ -408,23 +407,27 @@ CONFIGURE_ARGS+=--enable-cpu-level=${WIT IGNORE= GDB_STUB is incompatible with multiprocessor .endif -.if empty(PORT_OPTIONS:MGAMEPORT) && ${PORT_OPTIONS:MES1370} +.if ${PORT_OPTIONS:MES1370} && empty(PORT_OPTIONS:MGAMEPORT) IGNORE= ES1370 soundcard support requires GAMEPORT support .endif -.if empty(PORT_OPTIONS:MPCI) && ${PORT_OPTIONS:MES1370} +.if ${PORT_OPTIONS:MES1370} && empty(PORT_OPTIONS:MPCI) IGNORE= ES1370 soundcard support requires PCI support .endif -.if empty(PORT_OPTIONS:MPCI) && ${PORT_OPTIONS:MVOODOO} +.if ${PORT_OPTIONS:MPNIC} && empty(PORT_OPTIONS:MPCI) +IGNORE= PCI pseudo NIC support requires PCI support +.endif + +.if ${PORT_OPTIONS:MVOODOO} && empty(PORT_OPTIONS:MPCI) IGNORE= 3dfx Voodoo Graphics emulation requires PCI support .endif -.if empty(PORT_OPTIONS:MX86_64) && ${PORT_OPTIONS:MAVX} +.if ${PORT_OPTIONS:MAVX} && empty(PORT_OPTIONS:MX86_64) IGNORE= AVX instructions support requires X86-64 support .endif -.if empty(PORT_OPTIONS:MX86_64) && ${PORT_OPTIONS:MSVM} +.if ${PORT_OPTIONS:MSVM} && empty(PORT_OPTIONS:MX86_64) IGNORE= SVM emulation requires X86-64 support .endif Modified: head/emulators/bochs/distinfo ============================================================================== --- head/emulators/bochs/distinfo Wed May 29 05:28:26 2013 (r319345) +++ head/emulators/bochs/distinfo Wed May 29 05:29:30 2013 (r319346) @@ -1,2 +1,2 @@ -SHA256 (bochs-2.6.1.tar.gz) = cbc565f644adb80aae9565b6c0a355394b8e554d5d30282ad41c63201334261a -SIZE (bochs-2.6.1.tar.gz) = 4309970 +SHA256 (bochs-2.6.2.tar.gz) = d973b72b79a5de96ebe9337b8421f19dcd775dce16ed25a0232fa6d543a54b10 +SIZE (bochs-2.6.2.tar.gz) = 4314061