ports/124586: Update port: emulators/bochs to 2.3.7

[KATO Tsuguru]

>Number:         124586
>Category:       ports
>Synopsis:       Update port: emulators/bochs to 2.3.7
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jun 14 18:10:03 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 6.3-RELEASE-p2 i386
>Organization:
>Environment:
>Description:
- Update to version 2.3.7

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/emulators/bochs/Makefile emulators/bochs/Makefile
--- /usr/ports/emulators/bochs/Makefile	2008-04-20 10:13:50.000000000 +0900
+++ emulators/bochs/Makefile	2008-06-07 00:22:48.000000000 +0900
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	bochs
-PORTVERSION=	2.3.6
-PORTREVISION=	1
+PORTVERSION=	2.3.7
 PORTEPOCH=	2
 CATEGORIES=	emulators
 MASTER_SITES=	SF
@@ -18,13 +17,14 @@
 BUILD_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
 RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
 
+USE_GNOME=	gnometarget
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--disable-docbook
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 
-OPTIONS=	CDROM "Enable CDROM support" on \
+OPTIONS=	AES "Enable support of AES CPU extensions" off \
+		CDROM "Enable CDROM support" on \
 		CLGD54XX "Enable Cirrus Logic GD54xx video card" off \
 		DEBUGGER "Enable debugger and disassembler support" off \
 		DEBUGGER_X86 "Enable x86 hardware debugger" off \
@@ -55,9 +55,12 @@
 		WX "Use WxWidgets display interface" off \
 		X11 "Use X11 display interface" on \
 		X86_64 "Enable AMD x86-64 support" off \
-		XPM "Enable XPM library support" off
+		XPM "Enable XPM library support" off \
+		XSAVE "Enable support of XSAVE/XRSTOR CPU extensions" off
 
 CFLAGS+=	-fno-rtti -fno-exceptions -fomit-frame-pointer
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
 
 MANCOMPRESSED=	yes
 MAN1=		bochs.1 bochs-dlx.1 bxcommit.1 bximage.1
@@ -71,6 +74,10 @@
 CONFIGURE_ARGS+=--with-nogui
 .endif
 
+.if defined(WITH_AES)
+CONFIGURE_ARGS+=--enable-aes
+.endif
+
 .if defined(WITHOUT_CDROM)
 CONFIGURE_ARGS+=--disable-cdrom
 .endif
@@ -163,8 +170,9 @@
 CONFIGURE_ARGS+=--enable-show-ips
 .endif
 
-.if defined(WITH_SSE4)
+.if defined(WITH_SSE4) || defined(WITH_AES) || defined(WITH_XSAVE)
 CONFIGURE_ARGS+=--enable-sse=4 --enable-sse-extension
+WITH_CPU_LEVEL=	6
 .endif
 
 .if defined(WITH_SVGA)
@@ -206,7 +214,12 @@
 
 .if defined(WITH_XPM)
 USE_XORG=	xpm
-CONFIGURE_ARGS+=--with-xpm
+.else
+CONFIGURE_ARGS+=--disable-xpm
+.endif
+
+.if defined(WITH_XSAVE)
+CONFIGURE_ARGS+=--enable-xsave
 .endif
 
 .if defined(WITH_CPU_LEVEL)
@@ -256,10 +269,8 @@
 		 ${WRKSRC}/doc/docbook/user/user.dbk ${WRKSRC}/doc/man/*.[15]
 	@${REINPLACE_CMD} -Ee 's|/usr/(include/vga\.h)|${LOCALBASE}/\1|' \
 		${WRKSRC}/gui/svga.cc
-.if defined(WITH_SVGA)
-	@${REINPLACE_CMD} -e 's|-lvga -lvgagl|@LDFLAGS@ &|' \
+	@${REINPLACE_CMD} -Ee 's|(^LOCAL_CXXFLAGS.+=)|\1 @CPPFLAGS@|' \
 		${WRKSRC}/gui/Makefile.in
-.endif
 
 post-install:
 .if defined(WITH_PLUGINS)
diff -urN /usr/ports/emulators/bochs/distinfo emulators/bochs/distinfo
--- /usr/ports/emulators/bochs/distinfo	2007-12-31 01:50:27.000000000 +0900
+++ emulators/bochs/distinfo	2008-06-06 03:06:07.000000000 +0900
@@ -1,3 +1,3 @@
-MD5 (bochs-2.3.6.tar.gz) = 5b666fb64d7ccf9baa0122ec15a3f4b9
-SHA256 (bochs-2.3.6.tar.gz) = 11b4026f0717266d01c59a3f95046077bc046949aa752d0f0773b2b20dfb16aa
-SIZE (bochs-2.3.6.tar.gz) = 3951132
+MD5 (bochs-2.3.7.tar.gz) = a2e5f922505bf16cabd36bb9d571a2c4
+SHA256 (bochs-2.3.7.tar.gz) = 77f27fedadc6431df0a06ee226259a80443524ae9d221c97c5986e3f7927bb04
+SIZE (bochs-2.3.7.tar.gz) = 3989982
>Release-Note:
>Audit-Trail:
>Unformatted: