2 files changed, 63 insertions, 10 deletions

diff --git a/emulators/gxemul/Makefile b/emulators/gxemul/Makefile
index 18994711ca30..1a864b2db659 100644
--- a/emulators/gxemul/Makefile
+++ b/emulators/gxemul/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gxemul
-PORTVERSION=	0.3.2
+PORTVERSION=	0.3.7
 CATEGORIES=	emulators
 MASTER_SITES=	http://gavare.se/gxemul/src/
 
@@ -28,14 +28,21 @@ OPTIONS=	ALWAYS32 "ALWAYS_SIGNEXTEND_32" off \
 		BINTRANS "bintrans" on \
 		CACHES   "cache emulation (experimental)" off \
 		DELAYS   "instruction latency/delay emulation" off \
+		TRACENULL "tracenull support" off \
 		X        "X11 support" on \
 		ALPHA    "Alpha CPU emulation" off \
+		ARM      "ARM CPU emulation" on \
+		AVR      "AVR CPU emulation" off \
 		HPPA     "HPPA CPU emulation" off \
+		I960     "i960 CPU emulation" off \
+		IA64     "ia64 CPU emulation" off \
+		M86K     "m68k CPU emulation" off \
 		MIPS     "MIPS CPU emulation" on \
 		PPC      "PPC CPU emulation" on \
+		SH       "SH CPU emulation" off \
 		SPARC    "SPARC CPU emulation" off \
-		URISC    "URISC CPU emulation" on \
 		X86      "x86 CPU emulation" off \
+		NEWMIPS  "NEWMIPS CPU emulation (experimental)" off \
 		MIPS16   "MIPS16 instruction support (experimental)" off
 
 .include <bsd.port.pre.mk>
@@ -52,6 +59,9 @@ CONFIGURE_ARGS+=--enable-caches
 .if defined(WITH_DELAYS)
 CONFIGURE_ARGS+=--enable-delays
 .endif
+.if defined(WITH_TRACENULL)
+CONFIGURE_ARGS+=--tracenull
+.endif
 .if defined(WITH_X)
 USE_XLIB=	yes
 .else
@@ -59,24 +69,67 @@ CONFIGURE_ARGS+=--disable-x
 .endif
 .if defined(WITH_ALPHA)
 CONFIGURE_ARGS+=--enable-alpha
+.else
+CONFIGURE_ARGS+=--disable-alpha
+.endif
+.if defined(WITH_ARM)
+CONFIGURE_ARGS+=--enable-arm
+.else
+CONFIGURE_ARGS+=--disable-arm
+.endif
+.if defined(WITH_AVR)
+CONFIGURE_ARGS+=--enable-avr
+.else
+CONFIGURE_ARGS+=--disable-avr
 .endif
 .if defined(WITH_HPPA)
 CONFIGURE_ARGS+=--enable-hppa
+.else
+CONFIGURE_ARGS+=--disable-hppa
+.endif
+.if defined(WITH_I960)
+CONFIGURE_ARGS+=--enable-i960
+.else
+CONFIGURE_ARGS+=--disable-i960
+.endif
+.if defined(WITH_IA64)
+CONFIGURE_ARGS+=--enable-ia64
+.else
+CONFIGURE_ARGS+=--disable-ia64
 .endif
-.if !defined(WITH_MIPS)
+.if defined(WITH_M68K)
+CONFIGURE_ARGS+=--enable-m68k
+.else
+CONFIGURE_ARGS+=--disable-m68k
+.endif
+.if defined(WITH_MIPS)
+CONFIGURE_ARGS+=--enable-mips
+.else
 CONFIGURE_ARGS+=--disable-mips
 .endif
-.if !defined(WITH_PPC)
+.if defined(WITH_PPC)
+CONFIGURE_ARGS+=--enable-ppc
+.else
 CONFIGURE_ARGS+=--disable-ppc
 .endif
+.if defined(WITH_SH)
+CONFIGURE_ARGS+=--enable-sh
+.else
+CONFIGURE_ARGS+=--disable-sh
+.endif
 .if defined(WITH_SPARC)
 CONFIGURE_ARGS+=--enable-sparc
-.endif
-.if !defined(WITH_URISC)
-CONFIGURE_ARGS+=--disable-urisc
+.else
+CONFIGURE_ARGS+=--disable-sparc
 .endif
 .if defined(WITH_X86)
 CONFIGURE_ARGS+=--enable-x86
+.else
+CONFIGURE_ARGS+=--disable-x86
+.endif
+
+.if defined(WITH_NEWMIPS)
+CONFIGURE_ARGS+=--enable-newmips
 .endif
 .if defined(WITH_MIPS16)
 CONFIGURE_ARGS+=--enable-mips16
diff --git a/emulators/gxemul/distinfo b/emulators/gxemul/distinfo
index a2b12b2943a5..5cf0a3c3977b 100644
--- a/emulators/gxemul/distinfo
+++ b/emulators/gxemul/distinfo
@@ -1,3 +1,3 @@
-MD5 (gxemul-0.3.2.tar.gz) = 4fb92906454e1de2db8e6bc595e13d75
-SHA256 (gxemul-0.3.2.tar.gz) = 563d1328e02115ceb224817ad9ef13ec4621212b60daf53ca63f87af1446efc5
-SIZE (gxemul-0.3.2.tar.gz) = 1114030
+MD5 (gxemul-0.3.7.tar.gz) = 48301bcba8ee51c0f6bcf462277668c5
+SHA256 (gxemul-0.3.7.tar.gz) = cab162cc986c58de3664a9d68b768376d0268da2e3be48b919be94ca2a5a8603
+SIZE (gxemul-0.3.7.tar.gz) = 1521309