Bug 178035 - emulators/bochs: Update to version 2.6.1
Summary: emulators/bochs: Update to version 2.6.1
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Martin Wilke
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-04-21 19:10 UTC by tkato432
Modified: 2013-04-26 08:10 UTC (History)
0 users

See Also:


Attachments
file.diff (3.56 KB, patch)
2013-04-21 19:10 UTC, tkato432
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description tkato432 2013-04-21 19:10:03 UTC
- Update to version 2.6.1
Comment 1 Edwin Groothuis freebsd_committer 2013-04-21 19:10:56 UTC
Responsible Changed
From-To: freebsd-ports-bugs->miwi

miwi@ wants this submitter's PRs (via the GNATS Auto Assign Tool)
Comment 2 Martin Wilke freebsd_committer 2013-04-26 08:04:05 UTC
State Changed
From-To: open->closed

Committed. Thanks!
Comment 3 dfilter service freebsd_committer 2013-04-26 08:04:09 UTC
Author: miwi
Date: Fri Apr 26 07:03:59 2013
New Revision: 316582
URL: http://svnweb.freebsd.org/changeset/ports/316582

Log:
  - Update to 2.6.1
  
  PR:		178035
  Submitted by:	Ports Fury

Modified:
  head/emulators/bochs/Makefile
  head/emulators/bochs/distinfo

Modified: head/emulators/bochs/Makefile
==============================================================================
--- head/emulators/bochs/Makefile	Fri Apr 26 07:03:07 2013	(r316581)
+++ head/emulators/bochs/Makefile	Fri Apr 26 07:03:59 2013	(r316582)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bochs
-PORTVERSION=	2.6
+PORTVERSION=	2.6.1
 PORTEPOCH=	2
 CATEGORIES=	emulators
 MASTER_SITES=	SF
@@ -18,10 +18,10 @@ OPTIONS_DEFINE=	A20_PIN ALIGN_CHECK ASSE
 		E1000 ES1370 FAST_FUNCCALL FPU \
 		GAMEPORT IDLE_HACK IODEBUG \
 		LARGE_RAMFILE LOGGING LONG_PHY_ADDR \
-		MISALIGNEDSSE MWAIT NE2000 OPTIMIZATIONS PCI PLUGINS PNIC \
+		MWAIT NE2000 OPTIMIZATIONS PCI PLUGINS PNIC \
 		RAW_SERIAL READLINE REPEAT_SPEED RFB \
 		SB16 SDL SHOW_IPS SMP SVGA SVM TERM USB USB_OHCI USB_XHCI \
-		VMX WX X11 X86_64 XPM
+		VMX VOODOO WXGTK X11 X86_64 XPM
 OPTIONS_RADIO=	DEBUG
 OPTIONS_RADIO_DEBUG=	DEBUGGER GDB_STUB
 OPTIONS_DEFAULT=A20_PIN ALIGN_CHECK CDROM CONF_MSRS DISASM FPU LOGGING \
@@ -50,7 +50,6 @@ IODEBUG_DESC=	Enable I/O interface to de
 LARGE_RAMFILE_DESC=	Enable large ramfile support
 LOGGING_DESC=	Enable logging
 LONG_PHY_ADDR_DESC=	Enable support for physical address >= 32bit
-MISALIGNEDSSE_DESC=	Enable misaligned SSE support
 MWAIT_DESC=	Enable experimental MONITOR/MWAIT support
 NE2000_DESC=	Enable limited ne2000 support
 OPTIMIZATIONS_DESC=	Enable all safe speed optimizations
@@ -72,7 +71,7 @@ USB_DESC=	Enable limited USB UHCI suppor
 USB_OHCI_DESC=	Enable limited USB OHCI support
 USB_XHCI_DESC=	Enable limited USB xHCI support
 VMX_DESC=	Enable Virtialization extensions
-WX_DESC=	Use WxWidgets display interface
+VOODOO_DESC=	Enable 3dfx Voodoo Graphics emulation
 X86_64_DESC=	Enable AMD x86-64 support
 XPM_DESC=	Enable XPM library support
 
@@ -94,7 +93,7 @@ SUB_FILES=	pkg-message
 
 .include <bsd.port.options.mk>
 
-.if empty(PORT_OPTIONS:MTERM) && empty(PORT_OPTIONS:MWX) && empty(PORT_OPTIONS:MX11)
+.if empty(PORT_OPTIONS:MTERM) && empty(PORT_OPTIONS:MWXGTK) && empty(PORT_OPTIONS:MX11)
 CONFIGURE_ARGS+=--with-nogui
 .endif
 
@@ -186,6 +185,7 @@ CONFIGURE_ARGS+=--disable-fast-function-
 CONFIGURE_ARGS+=--enable-fpu
 .else
 CONFIGURE_ARGS+=--disable-fpu
+WITH_CPU_LEVEL=	3
 .endif
 
 .if ${PORT_OPTIONS:MGAMEPORT}
@@ -230,12 +230,6 @@ CONFIGURE_ARGS+=--enable-long-phy-addres
 CONFIGURE_ARGS+=--disable-long-phy-address
 .endif
 
-.if ${PORT_OPTIONS:MMISALIGNEDSSE}
-CONFIGURE_ARGS+=--enable-misaligned-sse
-.else
-CONFIGURE_ARGS+=--disable-misaligned-sse
-.endif
-
 .if ${PORT_OPTIONS:MMWAIT}
 CONFIGURE_ARGS+=--enable-monitor-mwait
 .else
@@ -361,9 +355,14 @@ WITH_CPU_LEVEL=	6
 CONFIGURE_ARGS+=--disable-vmx
 .endif
 
-.if ${PORT_OPTIONS:MWX}
+.if ${PORT_OPTIONS:MVOODOO}
+CONFIGURE_ARGS+=--enable-voodoo
+.else
+CONFIGURE_ARGS+=--disable-voodoo
+.endif
+
+.if ${PORT_OPTIONS:MWXGTK}
 USE_WX=		2.4+
-CONFIGURE_ENV=	WX_CONFIG="${WX_CONFIG}"
 CONFIGURE_ARGS+=--with-wx
 .else
 CONFIGURE_ARGS+=--disable-debugger-gui
@@ -376,6 +375,7 @@ CONFIGURE_ARGS+=--with-x11
 
 .if ${PORT_OPTIONS:MX86_64}
 CONFIGURE_ARGS+=--enable-x86-64
+WITH_CPU_LEVEL=	6
 .else
 CONFIGURE_ARGS+=--disable-x86-64
 .endif
@@ -403,6 +403,10 @@ CONFIGURE_ENV+=	SOUND_LINK_OPTS="-L${LOC
 IGNORE=		GDB_STUB is incompatible with multiprocessor
 .endif
 
+.if empty(PORT_OPTIONS:MPCI) && ${PORT_OPTIONS:MVOODOO}
+IGNORE=		3dfx Voodoo Graphics emulation requires PCI support
+.endif
+
 pre-everything::
 .if !defined(WITH_CPU_LEVEL)
 	@${ECHO_CMD}

Modified: head/emulators/bochs/distinfo
==============================================================================
--- head/emulators/bochs/distinfo	Fri Apr 26 07:03:07 2013	(r316581)
+++ head/emulators/bochs/distinfo	Fri Apr 26 07:03:59 2013	(r316582)
@@ -1,2 +1,2 @@
-SHA256 (bochs-2.6.tar.gz) = 65123e44a6d2c1148d741da025d16311b9ccd600ef268b911aba73c67eaf86e1
-SIZE (bochs-2.6.tar.gz) = 4212828
+SHA256 (bochs-2.6.1.tar.gz) = cbc565f644adb80aae9565b6c0a355394b8e554d5d30282ad41c63201334261a
+SIZE (bochs-2.6.1.tar.gz) = 4309970
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"