diff --git a/emulators/gxemul/Makefile b/emulators/gxemul/Makefile
index 7f53d8ec6b902..753b69e1c8167 100644
--- a/emulators/gxemul/Makefile
+++ b/emulators/gxemul/Makefile
@@ -1,19 +1,17 @@
 # Created by: Janni
 
 PORTNAME=	gxemul
-PORTVERSION=	0.6.3
+PORTVERSION=	0.7.0
 CATEGORIES=	emulators
 MASTER_SITES=	http://gavare.se/gxemul/src/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	mclay@astate.edu
 COMMENT=	Instruction-level machine emulator
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-valgrind \
-		--without-unittests
 CONFIGURE_ENV=	CXX=${CXX} \
 		LOCALBASE=${LOCALBASE} \
 		PREFIX=${PREFIX}
diff --git a/emulators/gxemul/distinfo b/emulators/gxemul/distinfo
index 80784d3641aa5..4dec1ab0b30cf 100644
--- a/emulators/gxemul/distinfo
+++ b/emulators/gxemul/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1613553517
-SHA256 (gxemul-0.6.3.tar.gz) = 163604d4888218e5fdbc6858b9fc1ec1607d005eadbec424f3a9663e1f2986ed
-SIZE (gxemul-0.6.3.tar.gz) = 6024573
+TIMESTAMP = 1644505943
+SHA256 (gxemul-0.7.0.tar.gz) = 79c4437c6f8ca904f46d33ac36062a65fdcf4a92a248478e408ab11295cf8e83
+SIZE (gxemul-0.7.0.tar.gz) = 5985021
diff --git a/emulators/gxemul/files/patch-configure b/emulators/gxemul/files/patch-configure
index 8cb11e97e73e0..44a604ea7f602 100644
--- a/emulators/gxemul/files/patch-configure
+++ b/emulators/gxemul/files/patch-configure
@@ -1,19 +1,19 @@
---- configure.orig	2018-09-06 07:41:13 UTC
+--- configure.orig	2021-04-22 18:04:21 UTC
 +++ configure
-@@ -360,10 +360,10 @@ if [ z$NOX11 = z ]; then
+@@ -330,10 +330,10 @@ if [ z$NOX11 = z ]; then
  
  	XOK=0
  
 -	XINCLUDE=-I/usr/X11R6/include
 +	XINCLUDE=-I${LOCALBASE}/include
- 	$CXX $CXXFLAGS _test_x11.cc -c -o _test_x11.o $XINCLUDE 2> /dev/null
+ 	$CC $CFLAGS _test_x11.c -c -o _test_x11.o $XINCLUDE 2> /dev/null
  
--	XLIB="-L/usr/X11R6/lib -lX11"
-+	XLIB="-L${LOCALBASE}/lib -lX11"
- 	$CXX $CXXFLAGS _test_x11.o -o _test_x11 $XLIB 2> /dev/null
+-	XLIB="-L/usr/X11R6/lib -lX11 -Wl,-rpath,/usr/X11R6/lib"
++	XLIB="-L${LOCALBASE}/lib -lX11 -Wl,-rpath,${LOCALBASE}/lib"
+ 	$CC $CFLAGS _test_x11.o -o _test_x11 $XLIB 2> /dev/null
  
  	if [ -x _test_x11 ]; then
-@@ -578,22 +578,6 @@ else
+@@ -539,27 +539,6 @@ else
  	fi
  fi
  rm -f _testprog _testprog.error _testprog.stdout
@@ -21,15 +21,20 @@
 -
 -#  -O optimization for non-debug builds. Try -O and -O3.
 -if [ ! z"$DEBUG" = zYES ]; then
--	$CXX $CXXFLAGS -O _testprog.cc -o _testprog 2> /dev/null
+-	printf "checking whether -O3 or -O can be used (non-DEBUG build)... "
+-	$CC $CFLAGS -O _testprog.c -o _testprog 2> /dev/null
 -	if [ -x _testprog ]; then
 -		rm -f _testprog
--		$CXX $CXXFLAGS -O3 _testprog.cc -o _testprog 2> /dev/null
+-		$CC $CFLAGS -O3 _testprog.c -o _testprog 2> /dev/null
 -		if [ -x _testprog ]; then
--			CXXFLAGS="-O3 $CXXFLAGS"
+-			CFLAGS="-O3 $CFLAGS"
+-			printf "yes, -O3\n"
 -		else
--			CXXFLAGS="-O $CXXFLAGS"
+-			CFLAGS="-O $CFLAGS"
+-			printf "yes, -O\n"
 -		fi
+-	else
+-		printf "no\n"
 -	fi
 -fi
 -rm -f _testprog
diff --git a/emulators/gxemul/files/patch-src_devices_dev__wdc.cc b/emulators/gxemul/files/patch-src_devices_dev__wdc.c
similarity index 79%
rename from emulators/gxemul/files/patch-src_devices_dev__wdc.cc
rename to emulators/gxemul/files/patch-src_devices_dev__wdc.c
index fc921947292fa..113adf3b46bab 100644
--- a/emulators/gxemul/files/patch-src_devices_dev__wdc.cc
+++ b/emulators/gxemul/files/patch-src_devices_dev__wdc.c
@@ -1,6 +1,6 @@
---- src/devices/dev_wdc.cc.orig	2014-08-17 08:45:12 UTC
-+++ src/devices/dev_wdc.cc
-@@ -274,12 +274,12 @@ void wdc__read(struct cpu *cpu, struct w
+--- src/devices/dev_wdc.c.orig	2021-04-22 18:04:20 UTC
++++ src/devices/dev_wdc.c
+@@ -274,12 +274,12 @@ void wdc__read(struct cpu *cpu, struct wdc_data *d)
  	    + (int64_t)d->head * d->sectors_per_track[d->drive] +
  	    (int64_t)d->heads[d->drive] * d->sectors_per_track[d->drive] * cyl);
  
@@ -15,7 +15,7 @@
  #endif
  
  	while (count > 0) {
-@@ -320,12 +320,12 @@ void wdc__write(struct cpu *cpu, struct 
+@@ -320,12 +320,12 @@ void wdc__write(struct cpu *cpu, struct wdc_data *d)
  	uint64_t offset = 512 * (d->sector - 1
  	    + (int64_t)d->head * d->sectors_per_track[d->drive] +
  	    (int64_t)d->heads[d->drive] * d->sectors_per_track[d->drive] * cyl);