svn commit: r454975 - in head/emulators/bochs: . files

[Mahdi Mokhtari]

Author: mmokhi
Date: Mon Nov 27 17:33:28 2017
New Revision: 454975
URL: https://svnweb.freebsd.org/changeset/ports/454975

Log:
  emulators/bochs: Update the port to the latest release
  Update the port to the latest release. take maintership as well
  
  Reviewed by:	mat
  Differential Revision:	https://reviews.freebsd.org/D13104

Added:
  head/emulators/bochs/files/patch-iodev_network_eth__socket.cc   (contents, props changed)
Modified:
  head/emulators/bochs/Makefile
  head/emulators/bochs/distinfo
  head/emulators/bochs/pkg-plist

Modified: head/emulators/bochs/Makefile
==============================================================================
--- head/emulators/bochs/Makefile	Mon Nov 27 17:27:32 2017	(r454974)
+++ head/emulators/bochs/Makefile	Mon Nov 27 17:33:28 2017	(r454975)
@@ -2,13 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	bochs
-PORTVERSION=	2.6.8
-PORTREVISION=	4
+PORTVERSION=	2.6.9
 PORTEPOCH=	2
 CATEGORIES=	emulators
 MASTER_SITES=	SF
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	mmokhi at FreeBSD.org
 COMMENT=	IA-32 (x86) PC emulator that runs DOS, Win 95, and more
 
 LICENSE=	LGPL21
@@ -16,6 +15,7 @@ LICENSE=	LGPL21
 BROKEN_i386=		does not build on i386 (../cpu.h:4513:117: error: 'regparm' parameter must be between 0 and 3 inclusive)
 
 USES=		gmake libtool:keepla pkgconfig
+USE_XORG=	x11
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_header_alsa_asoundlib_h=no \
 		ac_cv_header_ltdl_h=no
@@ -269,7 +269,7 @@ post-build:
 	@${LN} -sf .bochsrc ${WRKSRC}/bochsrc-sample.txt
 
 post-install:
-.for f in bochs bximage
+.for f in bochs bxhub bximage
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f}
 .endfor
 

Modified: head/emulators/bochs/distinfo
==============================================================================
--- head/emulators/bochs/distinfo	Mon Nov 27 17:27:32 2017	(r454974)
+++ head/emulators/bochs/distinfo	Mon Nov 27 17:33:28 2017	(r454975)
@@ -1,2 +1,3 @@
-SHA256 (bochs-2.6.8.tar.gz) = 79700ef0914a0973f62d9908ff700ef7def62d4a28ed5de418ef61f3576585ce
-SIZE (bochs-2.6.8.tar.gz) = 5075617
+TIMESTAMP = 1510759198
+SHA256 (bochs-2.6.9.tar.gz) = ee5b677fd9b1b9f484b5aeb4614f43df21993088c0c0571187f93acb0866e98c
+SIZE (bochs-2.6.9.tar.gz) = 5169187

Added: head/emulators/bochs/files/patch-iodev_network_eth__socket.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/bochs/files/patch-iodev_network_eth__socket.cc	Mon Nov 27 17:33:28 2017	(r454975)
@@ -0,0 +1,25 @@
+--- iodev/network/eth_socket.cc.orig	2017-11-15 14:29:17 UTC
++++ iodev/network/eth_socket.cc
+@@ -78,16 +78,21 @@ extern "C" {
+ #ifdef WIN32
+ #include <winsock2.h>
+ #else
++#include <sys/param.h>
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/ioctl.h>
+-#include <netpacket/packet.h>
+ #include <netinet/in.h>
+ #include <net/ethernet.h>
+ #include <net/if.h>
++#if defined(__FreeBSD__)
++#include <sys/types.h>
++#else
++#include <netpacket/packet.h>
+ #include <linux/types.h>
++#endif
+ #include <netdb.h>
+ #define closesocket(s) close(s)
+ typedef int SOCKET;

Modified: head/emulators/bochs/pkg-plist
==============================================================================
--- head/emulators/bochs/pkg-plist	Mon Nov 27 17:27:32 2017	(r454974)
+++ head/emulators/bochs/pkg-plist	Mon Nov 27 17:33:28 2017	(r454975)
@@ -1,4 +1,5 @@
 bin/bochs
+bin/bxhub
 bin/bximage
 man/man1/bochs.1.gz
 man/man1/bochs-dlx.1.gz