Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 8 Apr 2016 12:37:48 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r412736 - in head/emulators/bochs: . files
Message-ID:  <201604081237.u38CbmPL010034@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mat
Date: Fri Apr  8 12:37:48 2016
New Revision: 412736
URL: https://svnweb.freebsd.org/changeset/ports/412736

Log:
  Update to 2.6.8.
  
  PR:		208612
  Submitted by:	tkato432 yahoo com
  Sponsored by:	Absolight

Added:
  head/emulators/bochs/files/patch-iodev_network_slirp_compat.cc   (contents, props changed)
     - copied, changed from r412735, head/emulators/bochs/files/patch-iodev__network__slurp__compat.cc
Deleted:
  head/emulators/bochs/files/patch-Makefile.in
  head/emulators/bochs/files/patch-iodev__network__slurp__compat.cc
Modified:
  head/emulators/bochs/Makefile   (contents, props changed)
  head/emulators/bochs/distinfo   (contents, props changed)
  head/emulators/bochs/pkg-plist   (contents, props changed)

Modified: head/emulators/bochs/Makefile
==============================================================================
--- head/emulators/bochs/Makefile	Fri Apr  8 12:37:42 2016	(r412735)
+++ head/emulators/bochs/Makefile	Fri Apr  8 12:37:48 2016	(r412736)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bochs
-PORTVERSION=	2.6.7
+PORTVERSION=	2.6.8
 PORTEPOCH=	2
 CATEGORIES=	emulators
 MASTER_SITES=	SF
@@ -14,167 +14,208 @@ LICENSE=	LGPL21
 
 USES=		gmake libtool:keepla pkgconfig
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	ac_cv_header_alsa_asoundlib_h=no
+CONFIGURE_ENV=	ac_cv_header_alsa_asoundlib_h=no \
+		ac_cv_header_ltdl_h=no
 CONFIGURE_ARGS=	--disable-docbook --disable-instrumentation
 
 SUB_FILES=	pkg-message
 
-CFLAGS+=	-fno-exceptions -fomit-frame-pointer
-CXXFLAGS+=	-fno-rtti
+CFLAGS+=	-fomit-frame-pointer
+CXXFLAGS+=	-fno-exceptions
+CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=		A20_PIN ALIGN_CHECK ASSERT_CHECK AVX BUSMOUSE \
 			CDROM CHAINING CLGD54XX CONF_MSRS \
-			DISASM DOCS \
+			DEBUGGER DEBUGGER_GUI DEBUGGER_X86 DISASM DOCS \
 			E1000 ES1370 EVEX FPU \
-			GAMEPORT IDLE_HACK IODEBUG \
-			LARGE_RAMFILE LOGGING LONG_PHY_ADDR \
-			MWAIT NE2000 OPTIMIZATIONS PCI PLUGINS PNIC \
-			RAW_SERIAL READLINE REPEAT_SPEED RFB \
-			SB16 SDL SHOW_IPS SMP SVGALIB SVM \
-			TERM TRACE_LINK \
-			USB USB_OHCI USB_XHCI \
-			VMX VNCSERVER VOODOO WXGTK X11 X86_64 XPM
+			GAMEPORT GDB_STUB IDLE_HACK IODEBUG \
+			LARGE_RAMFILE LOGGING LONG_PHY_ADDR MEMTYPE MWAIT \
+			NE2000 OPTIMIZATIONS \
+			PCI PERFMON PNIC PLUGINS USB USB_OHCI USB_XHCI \
+			RAW_SERIAL READLINE REPEAT_SPEED \
+			SB16 SHOW_IPS SMP STATS SVM TRACE_LINK \
+			VMX VOODOO X86_64 XPM
 OPTIONS_DEFINE_i386=	FAST_FUNCCALL
-OPTIONS_RADIO=		DEBUG
-OPTIONS_RADIO_DEBUG=	DEBUGGER GDB_STUB
+OPTIONS_GROUP=		UI
+OPTIONS_GROUP_UI=	RFB SDL1 SDL2 SVGALIB TERM VNCSERVER WXGTK X11
 OPTIONS_DEFAULT=	A20_PIN ALIGN_CHECK CDROM CONF_MSRS DISASM FPU \
-			LOGGING NE2000 OPTIMIZATIONS SB16 X11
+			LARGE_RAMFILE LOGGING NE2000 OPTIMIZATIONS PCI \
+			SB16 SHOW_IPS STATS X11
 
-A20_PIN_DESC=		Enable support for A20 pin
+A20_PIN_DESC=		Support for A20 pin
 A20_PIN_CONFIGURE_ENABLE=	a20-pin
-ALIGN_CHECK_DESC=	Enable alignment check support
+ALIGN_CHECK_DESC=	Alignment check support
 ALIGN_CHECK_CONFIGURE_ENABLE=	alignment-check
-ASSERT_CHECK_DESC=	Enable BX_ASSERT checks
+ASSERT_CHECK_DESC=	BX_ASSERT checks
 ASSERT_CHECK_CONFIGURE_ENABLE=	assert-checks
-AVX_DESC=		Enable AVX instructions support
+ASSERT_CHECK_IMPLIES=	DEBUGGER
+AVX_DESC=		AVX instructions support
 AVX_CONFIGURE_ENABLE=	avx
-BUSMOUSE_DESC=		Enable Busmouse support
+AVX_IMPLIES=		X86_64
+BUSMOUSE_DESC=		Busmouse support
 BUSMOUSE_CONFIGURE_ENABLE=	busmouse
-CDROM_DESC=		Enable CDROM support
+CDROM_DESC=		CDROM support
 CDROM_CONFIGURE_ENABLE=	cdrom
-CHAINING_DESC=		Enable handlers-chaining emulation speedups
+CHAINING_DESC=		Support handlers-chaining emulation speedups
 CHAINING_CONFIGURE_ENABLE=	handlers-chaining
-CLGD54XX_DESC=		Enable Cirrus Logic GD54xx video card
+CHAINING_PREVENTS=	ASSERT_CHECK DEBUGGER DEBUGGER_GUI IODEBUG GDB_STUB \
+			READLINE
+CLGD54XX_DESC=		Cirrus Logic GD54xx video card
 CLGD54XX_CONFIGURE_ENABLE=	clgd54xx
-CONF_MSRS_DESC=		Enable configurable MSR registers support
+CONF_MSRS_DESC=		Configurable MSR registers support
 CONF_MSRS_CONFIGURE_ENABLE=	configurable-msrs
-DEBUG_DESCR=		Enable Debugging, select this and one of DEBUGGER or GDB_STUB (or none)
-DEBUGGER_DESC=		Enable debugger support
+DEBUGGER_DESC=		Debugger support
 DEBUGGER_CONFIGURE_ENABLE=	debugger
-DEBUGGER_X86_DESC=	Enable x86 hardware debugger
+DEBUGGER_IMPLIES=	DISASM
+DEBUGGER_GUI_DESC=	GTK+ 2 GUI debugger support
+DEBUGGER_GUI_USE=	GNOME=gtk20
+DEBUGGER_GUI_CONFIGURE_ENABLE=	debugger-gui
+DEBUGGER_GUI_IMPLIES=	DEBUGGER
+DEBUGGER_X86_DESC=	X86 hardware debugger
 DEBUGGER_X86_CONFIGURE_ENABLE=	x86-debugger
-DISASM_DESC=		Enable disassemler support
+DISASM_DESC=		Disassemler support
 DISASM_CONFIGURE_ENABLE=	disasm
-E1000_DESC=		Enable Intel(R) Gigabit Ethernet support
-E1000_CONFIGURE_ENABLE=		e1000
-ES1370_DESC=		Enable ES1370 soundcard support
+E1000_DESC=		Intel(R) Gigabit Ethernet support
+E1000_CONFIGURE_ENABLE=	e1000
+E1000_IMPLIES=		PCI
+ES1370_DESC=		ES1370 soundcard support
 ES1370_CONFIGURE_ENABLE=	es1370
-EVEX_DESC=		Enable EVEX prefix and AVX-512 extensios support
+ES1370_IMPLIES=		PCI
+EVEX_DESC=		EVEX prefix and AVX-512 extensios support
 EVEX_CONFIGURE_ENABLE=	evex
-FAST_FUNCCALL_DESC=	Enable fast function calls support (x86 only)
+EVEX_IMPLIES=		AVX
+FAST_FUNCCALL_DESC=	Support for fast function calls (x86 only)
 FAST_FUNCCALL_CONFIGURE_ENABLE=	fast-function-calls
-FPU_DESC=		Enable FPU emulator
-FPU_CONFIGURE_ENABLE=		fpu
-GAMEPORT_DESC=		Enable standard PC gameport support
+FPU_DESC=		FPU emulator
+FPU_CONFIGURE_ENABLE=	fpu
+FPU_VARS_OFF=		WITH_CPU_LEVEL=3
+GAMEPORT_DESC=		Standard PC gameport support
 GAMEPORT_CONFIGURE_ENABLE=	gameport
-GDB_STUB_DESC=		Enable GDB stub support
+GDB_STUB_DESC=		GDB stub support
 GDB_STUB_CONFIGURE_ENABLE=	gdb-stub
+GDB_STUB_PREVENTS=	ASSERT_CHECK DEBUGGER DEBUGGER_GUI IODEBUG
 IDLE_HACK_DESC=		Keep Bochs from using all CPU time
 IDLE_HACK_CONFIGURE_ENABLE=	idle-hack
-IODEBUG_DESC=		Enable I/O interface to debugger
+IODEBUG_DESC=		I/O interface to debugger
 IODEBUG_CONFIGURE_ENABLE=	iodebug
-LARGE_RAMFILE_DESC=	Enable large ramfile support
+IODEBUG_IMPLIES=	DEBUGGER
+LARGE_RAMFILE_DESC=	Large ramfile support
 LARGE_RAMFILE_CONFIGURE_ENABLE=	large-ramfile
-LOGGING_DESC=		Enable logging
+LOGGING_DESC=		Logging support
 LOGGING_CONFIGURE_ENABLE=	logging
-LONG_PHY_ADDR_DESC=	Enable support for physical address >= 32bit
+LONG_PHY_ADDR_DESC=	Support for physical address >= 32bit
 LONG_PHY_ADDR_CONFIGURE_ENABLE=	long-phy-address
-MWAIT_DESC=		Enable experimental MONITOR/MWAIT support
-MWAIT_CONFIGURE_ENABLE=		monitor-mwait
-NE2000_DESC=		Enable ne2000 support
+MEMTYPE_DESC=		Memory type calculation support
+MEMTYPE_CONFIGURE_ENABLE=	memtype
+MWAIT_DESC=		MONITOR/MWAIT instructions support (experimemtal)
+MWAIT_CONFIGURE_ENABLE=	monitor-mwait
+NE2000_DESC=		NE2000 support
 NE2000_CONFIGURE_ENABLE=	ne2000
-OPTIMIZATIONS_DESC=	Enable all safe speed optimizations
+OPTIMIZATIONS_DESC=	Compile in all safe speed optimizations
 OPTIMIZATIONS_CONFIGURE_ENABLE=	all-optimizations
-PCI_DESC=		Enable i440FX PCI support
-PCI_CONFIGURE_ENABLE=		pci
-PLUGINS_DESC=		Enable building dynamic loadable plugins
+OPTIMIZATIONS_IMPLIES=	CHAINING FAST_FUNCCALL REPEAT_SPEED TRACE_LINK
+OPTIMIZATIONS_PREVENTS=	ASSERT_CHECK DEBUGGER DEBUGGER_GUI IODEBUG GDB_STUB \
+			READLINE
+PCI_DESC=		Intel(R) i440FX PCI support
+PCI_CONFIGURE_ENABLE=	pci
+PERFMON_DESC=		Hardware performance monitoring emulation (experimental)
+PERFMON_CONFIGURE_ENABLE=	perfmon
 PLUGINS_CONFIGURE_ENABLE=	plugins
-PNIC_DESC=		Enable PCI pseudo NIC (network card) support
-PNIC_CONFIGURE_ENABLE=		pnic
-RAW_SERIAL_DESC=	Use raw serial port access
+PNIC_DESC=		PCI pseudo NIC (network card) support
+PNIC_CONFIGURE_ENABLE=	pnic
+PNIC_IMPLIES=		PCI
+RAW_SERIAL_DESC=	Raw serial port access
 RAW_SERIAL_CONFIGURE_ENABLE=	raw-serial
-READLINE_DESC=		Enable readline support in debugger
+READLINE_DESC=		Readline support in debugger
 READLINE_USES=		readline
 READLINE_CONFIGURE_ENABLE=	readline
-REPEAT_SPEED_DESC=	Enable repeated IO and mem copy speedups
+READLINE_IMPLIES=	DEBUGGER
+REPEAT_SPEED_DESC=	Support repeated IO and mem copy speedups
 REPEAT_SPEED_CONFIGURE_ENABLE=	repeat-speedups
-RFB_DESC=		Use RFB protocol (works with VNC viewer)
+RFB_DESC=		RFB protocol support (works with VNC viewer)
 RFB_CONFIGURE_WITH=	rfb
-SB16_DESC=		Enable Sound Blaster 16 emulation
+SB16_DESC=		Sound Blaster 16 emulation
 SB16_CONFIGURE_ENABLE=	sb16
-SDL_USE=		SDL=sdl
-SDL_CONFIGURE_WITH=	sdl
-SHOW_IPS_DESC=		Enable logging of measured IPS
+SDL1_DESC=		Simple Direct Media Layer 1 support
+SDL1_USE=		SDL=sdl
+SDL1_CONFIGURE_WITH=	sdl
+SDL1_PREVENTS=		SDL2
+SDL2_DESC=		Simple Direct Media Layer 2 support
+SDL2_USE=		SDL=sdl2
+SDL2_CONFIGURE_WITH=	sdl2
+SHOW_IPS_DESC=		Show IPS in status bar or log file
 SHOW_IPS_CONFIGURE_ENABLE=	show-ips
-SMP_DESC=		Enable SMP simulation support (CPU level 6)
+SMP_DESC=		Support for SMP configurations (CPU level 6)
 SMP_CONFIGURE_ENABLE=	smp
+SMP_VARS=		WITH_CPU_LEVEL=6
+SMP_IMPLIES=		FPU
+SMP_PREVENTS=		GDB_STUB
+STATS_DESC=		Statistics collection
+STATS_CONFIGURE_ENABLE=	stats
 SVGALIB_LIB_DEPENDS=	libvga.so:graphics/svgalib
 SVGALIB_CONFIGURE_WITH=	svga
-SVM_DESC=		Enable SVM (AMD: secure virtual machine) emulation
+SVM_DESC=		SVM (AMD: secure virtual machine) emulation
 SVM_CONFIGURE_ENABLE=	svm
+SVM_VARS=		WITH_CPU_LEVEL=6
+SVM_IMPLIES=		X86_64
 TERM_DESC=		Use text only, console based interface
 TERM_CONFIGURE_WITH=	term
-TRACE_LINK_DESC=	Enable trace linking speedups
+TRACE_LINK_DESC=	Support trace linking speedups
 TRACE_LINK_CONFIGURE_ENABLE=	trace-linking
-USB_DESC=		Enable USB UHCI support
+UI_DESC=		User Interface
+USB_DESC=		USB UHCI support
 USB_CONFIGURE_ENABLE=	usb
-USB_OHCI_DESC=		Enable USB OHCI support
+USB_IMPLIES=		PCI
+USB_OHCI_DESC=		USB OHCI support
 USB_OHCI_CONFIGURE_ENABLE=	usb-ohci
-USB_XHCI_DESC=		Enable experimental USB xHCI support
+USB_OHCI_IMPLIES=	PCI
+USB_XHCI_DESC=		USB xHCI support (experimental)
 USB_XHCI_CONFIGURE_ENABLE=	usb-xhci
-VMX_DESC=		Enable Virtialization extensions
-VNCSERVER_DESC= 		Use LibVNCServer (works with VNC viewer)
+USB_XHCI_IMPLIES=	PCI
+VMX_DESC=		Virtialization extensions
+VMX_VARS=		WITH_CPU_LEVEL=6
+VMX_IMPLIES=		FPU
+VNCSERVER_DESC= 	LibVNCServer support (works with VNC viewer)
 VNCSERVER_LIB_DEPENDS=	libvncserver.so:net/libvncserver
 VNCSERVER_CONFIGURE_WITH=	vncsrv
-VOODOO_DESC=		Enable 3dfx Voodoo Graphics emulation
+VOODOO_DESC=		3dfx Voodoo Graphics emulation
 VOODOO_CONFIGURE_ENABLE=	voodoo
-WXGTK_USE=		WX=2.8
+VOODOO_IMPLIES=		PCI
+WXGTK_USES=		compiler:c++11-lib
+WXGTK_USE=		WX=3.0
 WXGTK_CONFIGURE_WITH=	wx
-WXGTK_CONFIGURE_OFF=	--disable-debugger-gui
+WXGTK_CXXFLAGS_OFF=	-fno-rtti
+WXGTK_CPPFLAGS=		$$(pkg-config --cflags gdk-2.0)
+WXGTK_IMPLIES=		X11
 X11_USE=		XORG=xrandr
 X11_CONFIGURE_WITH=	x11
-X86_64_DESC=		Enable x86-64 instructions support
+X86_64_DESC=		Support for x86-64 instructions
 X86_64_CONFIGURE_ENABLE=	x86-64
+X86_64_VARS=		WITH_CPU_LEVEL=6
+X86_64_IMPLIES=		FPU
 XPM_USE=		XORG=xpm
-XOM_CONFIGURE_ENABE=	xpm
+XPM_CONFIGURE_ENABLE=	xpm
+XPM_IMPLIES=		X11
 
 .include <bsd.port.options.mk>
 
-.if empty(PORT_OPTIONS:MTERM) && empty(PORT_OPTIONS:MWXGTK) && empty(PORT_OPTIONS:MX11)
-CONFIGURE_ARGS+=--with-nogui
+.if ${PORT_OPTIONS:MDEBUGGER_GUI} && empty(PORT_OPTIONS:MSDL1) && \
+	empty(PORT_OPTIONS:MSDL2) && empty(PORT_OPTIONS:MX11)
+IGNORE=		option DEBUGGER_GUI requires SDL1, SDL2, or X11 support
 .endif
 
-.if ! ${PORT_OPTIONS:MFPU}
-WITH_CPU_LEVEL=	3
-.endif
-
-.if ${PORT_OPTIONS:MSMP}
-WITH_CPU_LEVEL=	6
+.if ${PORT_OPTIONS:MGAMEPORT} && empty(PORT_OPTIONS:MES1370) && \
+	empty(PORT_OPTIONS:MSB16)
+IGNORE=		option GAMEPORT requires SB16 or ES1370 soundcard support
 .endif
 
 .if ${PORT_OPTIONS:MVMX} && ${PORT_OPTIONS:MX86_64}
 CONFIGURE_ARGS+=--enable-vmx=2
-WITH_CPU_LEVEL=	6
 .endif
 
 .if ${PORT_OPTIONS:MVMX} && empty(PORT_OPTIONS:MX86_64)
 CONFIGURE_ARGS+=--enable-vmx=1
-WITH_CPU_LEVEL=	6
-.endif
-
-.if ${PORT_OPTIONS:MX86_64}
-WITH_CPU_LEVEL=	6
 .endif
 
 .if defined(WITH_CPU_LEVEL)
@@ -184,46 +225,6 @@ IGNORE=		can not install: WITH_CPU_LEVEL
 CONFIGURE_ARGS+=--enable-cpu-level=${WITH_CPU_LEVEL}
 .endif
 
-.if ${PORT_OPTIONS:MGDB_STUB} && ${PORT_OPTIONS:MSMP}
-IGNORE=		GDB_STUB is incompatible with multiprocessor
-.endif
-
-.if ${PORT_OPTIONS:ME1000} && empty(PORT_OPTIONS:MPCI)
-IGNORE=		E1000 network adapter support requires PCI support
-.endif
-
-.if ${PORT_OPTIONS:MES1370} && empty(PORT_OPTIONS:MGAMEPORT)
-IGNORE=		ES1370 soundcard support requires GAMEPORT support
-.endif
-
-.if ${PORT_OPTIONS:MES1370} && empty(PORT_OPTIONS:MPCI)
-IGNORE=		ES1370 soundcard support requires PCI support
-.endif
-
-.if ${PORT_OPTIONS:MEVEX} && empty(PORT_OPTIONS:MAVX)
-IGNORE=		EVEX instructions support requires AVX support
-.endif
-
-.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 ${PORT_OPTIONS:MAVX} && empty(PORT_OPTIONS:MX86_64)
-IGNORE=		AVX instructions support requires X86-64 support
-.endif
-
-.if ${PORT_OPTIONS:MSVM} && empty(PORT_OPTIONS:MX86_64)
-IGNORE=		SVM emulation requires X86-64 support
-.endif
-
-.if ${PORT_OPTIONS:MXPM} && empty(PORT_OPTIONS:MX11)
-IGNORE=		XPM support requires X11 support
-.endif
-
 pre-everything::
 .if !defined(WITH_CPU_LEVEL)
 	@${ECHO_CMD}
@@ -232,6 +233,9 @@ pre-everything::
 .endif
 
 post-patch:
+	@${REINPLACE_CMD} -e \
+		'/DEFAULT_GUI=/s|x11|nogui|' \
+		 ${WRKSRC}/configure
 	@${REINPLACE_CMD} -Ee \
 		's|$$BXSHARE/|${DATADIR}/|; \
 		 s|^#clock: sync=none|clock: sync=realtime|; \
@@ -244,11 +248,14 @@ post-patch:
 		 s|(^sharedir.+=).+|\1 ${DATADIR}|; \
 		 s|(^docdir.+=).+|\1 ${DOCSDIR}|' \
 		 ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -Ee \
+		's|(@GUI_.+FLAGS@)$$|\1 @CPPFLAGS@|' \
+		 ${WRKSRC}/bx_debug/Makefile.in
 	@${REINPLACE_CMD} -e \
 		's|/usr/local/share/bochs|${DATADIR}|; \
 		 s|/usr/local/share/doc/bochs|${DOCSDIR}|' \
 		 ${WRKSRC}/doc/docbook/user/user.dbk ${WRKSRC}/doc/man/*.[15]
-	@${REINPLACE_CMD} -Ee 's|/usr/(include/vga\.h)|${LOCALBASE}/\1|' \
+	@${REINPLACE_CMD} -e 's|</usr/include/|<|' \
 		 ${WRKSRC}/gui/svga.cc
 	@${REINPLACE_CMD} -Ee \
 		's|(^LOCAL_CXXFLAGS.+=)|\1 @CPPFLAGS@|; \
@@ -262,12 +269,16 @@ post-install:
 .for f in bochs bximage
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f}
 .endfor
-.if ${PORT_OPTIONS:MPLUGINS}
+
+post-install-PLUGINS-on:
+	@${FIND} ${STAGEDIR}${PREFIX}/lib/bochs -name "libbx_*.so*" \
+		-type f -print0 | ${XARGS} -0 ${STRIP_CMD}
 	@${FIND} ${STAGEDIR}${PREFIX}/lib/bochs ! -type d | \
 		${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST}
 	@${FIND} ${STAGEDIR}${PREFIX}/lib/bochs -type d -empty | ${SORT} -r | \
 		${SED} 's,^${STAGEDIR}${PREFIX}/,@dir ,' >> ${TMPPLIST}
-.endif
+
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in CHANGES README TODO bochsrc-sample.txt
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} \

Modified: head/emulators/bochs/distinfo
==============================================================================
--- head/emulators/bochs/distinfo	Fri Apr  8 12:37:42 2016	(r412735)
+++ head/emulators/bochs/distinfo	Fri Apr  8 12:37:48 2016	(r412736)
@@ -1,2 +1,2 @@
-SHA256 (bochs-2.6.7.tar.gz) = a4354eeb699662da869b038e225160ec726b883f1b4f425a06cf56cbffbb8282
-SIZE (bochs-2.6.7.tar.gz) = 5045466
+SHA256 (bochs-2.6.8.tar.gz) = 79700ef0914a0973f62d9908ff700ef7def62d4a28ed5de418ef61f3576585ce
+SIZE (bochs-2.6.8.tar.gz) = 5075617

Copied and modified: head/emulators/bochs/files/patch-iodev_network_slirp_compat.cc (from r412735, head/emulators/bochs/files/patch-iodev__network__slurp__compat.cc)
==============================================================================
--- head/emulators/bochs/files/patch-iodev__network__slurp__compat.cc	Fri Apr  8 12:37:42 2016	(r412735, copy source)
+++ head/emulators/bochs/files/patch-iodev_network_slirp_compat.cc	Fri Apr  8 12:37:48 2016	(r412736)
@@ -1,6 +1,6 @@
---- iodev/network/slirp/compat.cc.orig
+--- iodev/network/slirp/compat.cc.orig	2015-05-01 19:41:08 UTC
 +++ iodev/network/slirp/compat.cc
-@@ -127,6 +127,8 @@
+@@ -128,6 +128,8 @@ int qemu_socket(int domain, int type, in
  #define CONFIG_SMBD_COMMAND "/usr/sbin/smbd"
  
  #include <pwd.h>

Modified: head/emulators/bochs/pkg-plist
==============================================================================
--- head/emulators/bochs/pkg-plist	Fri Apr  8 12:37:42 2016	(r412735)
+++ head/emulators/bochs/pkg-plist	Fri Apr  8 12:37:48 2016	(r412736)
@@ -1,7 +1,7 @@
 bin/bochs
 bin/bximage
-man/man1/bochs-dlx.1.gz
 man/man1/bochs.1.gz
+man/man1/bochs-dlx.1.gz
 man/man1/bximage.1.gz
 man/man5/bochsrc.5.gz
 %%DATADIR%%/BIOS-bochs-latest



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604081237.u38CbmPL010034>