Index: head/devel/cherivis-devel/Makefile
===================================================================
--- head/devel/cherivis-devel/Makefile	(revision 409856)
+++ head/devel/cherivis-devel/Makefile	(revision 409857)
@@ -1,29 +1,25 @@
 # $FreeBSD$
 
 PORTNAME=	cherivis-devel
-PORTVERSION=	0.1
-PORTREVISION=	3
+PORTVERSION=	0.4
 CATEGORIES=	devel gnustep
 
 MAINTAINER=	theraven@FreeBSD.org
 COMMENT=	Visualisation tool for CHERI / BERI streamtraces
 
 LICENSE=	MIT
 
 BROKEN_FreeBSD_9=	does not build on FreeBSD 9.x
 
 USES=		gnustep
 USE_GITHUB=	yes
 GH_ACCOUNT=	CTSRD-CHERI
 GH_PROJECT=	CheriVis
-GH_TAGNAME=	525aeb4
+GH_TAGNAME=	98c6c04
 
-LLVM_VERSION?=	34
-BUILD_DEPENDS+=	llvm-config${LLVM_VERSION}:${PORTSDIR}/devel/llvm${LLVM_VERSION}
-LIB_DEPENDS+=	libdispatch.so:${PORTSDIR}/devel/libdispatch
+LIB_DEPENDS+=	libcheritrace.so:${PORTSDIR}/devel/cheritrace-devel
 
-MAKE_FLAGS+=		LLVM_CONFIG=llvm-config${LLVM_VERSION}
 USE_GNUSTEP=		back build
 USE_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
 
 .include <bsd.port.mk>
Index: head/devel/cherivis-devel/distinfo
===================================================================
--- head/devel/cherivis-devel/distinfo	(revision 409856)
+++ head/devel/cherivis-devel/distinfo	(revision 409857)
@@ -1,2 +1,2 @@
-SHA256 (CTSRD-CHERI-CheriVis-0.1-525aeb4_GH0.tar.gz) = aed37be21f1f5dcd90a0da5317de45d2b0842f6bbf207b6ad529eecd41bd9325
-SIZE (CTSRD-CHERI-CheriVis-0.1-525aeb4_GH0.tar.gz) = 531498
+SHA256 (CTSRD-CHERI-CheriVis-0.4-98c6c04_GH0.tar.gz) = 3afb838b16c968eab98b3e7b2c2f00678d5d4f7b1087431273dc92a6a568cd38
+SIZE (CTSRD-CHERI-CheriVis-0.4-98c6c04_GH0.tar.gz) = 519466
Index: head/devel/cherivis-devel/pkg-descr
===================================================================
--- head/devel/cherivis-devel/pkg-descr	(revision 409856)
+++ head/devel/cherivis-devel/pkg-descr	(revision 409857)
@@ -1,7 +1,5 @@
 A tool for viewing streamtraces from the BERI and CHERI processors from SRI
 International and the University of Cambridge.  CheriVis uses LLVM to read
 object code and to disassemble MIPS instructions.
 
-The current version of the port only understands traditional MIPS instructions.
-
 WWW: https://github.com/CTSRD-CHERI/CheriVis
Index: head/devel/cherivis-devel/pkg-plist
===================================================================
--- head/devel/cherivis-devel/pkg-plist	(revision 409856)
+++ head/devel/cherivis-devel/pkg-plist	(revision 409857)
@@ -1,9 +1,8 @@
 GNUstep/System/Applications/CheriVis.app/CheriVis
 GNUstep/System/Applications/CheriVis.app/Resources/CheriVis.desktop
-GNUstep/System/Applications/CheriVis.app/Resources/CheriVis.gorm/data.classes
-GNUstep/System/Applications/CheriVis.app/Resources/CheriVis.gorm/data.info
-GNUstep/System/Applications/CheriVis.app/Resources/CheriVis.gorm/objects.gorm
 GNUstep/System/Applications/CheriVis.app/Resources/CheriVis.tiff
+GNUstep/System/Applications/CheriVis.app/Resources/Document.xib
 GNUstep/System/Applications/CheriVis.app/Resources/Info-gnustep.plist
+GNUstep/System/Applications/CheriVis.app/Resources/MainMenu.xib
 GNUstep/System/Applications/CheriVis.app/stamp.make
 GNUstep/System/Tools/CheriVis