diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile
index 2686500e708d..9a0953b590d1 100644
--- a/lang/smalltalk/Makefile
+++ b/lang/smalltalk/Makefile
@@ -1,81 +1,77 @@
 PORTNAME=	smalltalk
 PORTVERSION=	3.2.5
 PORTREVISION=	19
 CATEGORIES=	lang
 MASTER_SITES=	GNU
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	GNU Smalltalk
 WWW=		https://smalltalk.gnu.org/
 
 LICENSE=	GPLv2+
 
 BROKEN_powerpc64=	Fails to build: gst-package: did not understand #~
 BROKEN_riscv64=		Fails to link: undefined reference to sbrk
 
 BUILD_DEPENDS=	zip:archivers/zip \
 		gawk:lang/gawk
-LIB_DEPENDS=	libgdbm.so:databases/gdbm \
+LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 		libffi.so:devel/libffi \
-		libltdl.so:devel/libltdl \
-		libcairo.so:graphics/cairo \
-		libexpat.so:textproc/expat2
+		libgdbm.so:databases/gdbm \
+		libgmp.so:math/gmp \
+		libltdl.so:devel/libltdl
 
 USES=		gl gmake gnome iconv libtool makeinfo pathfix pkgconfig \
 		readline shebangfix sqlite tar:xz xorg
 USE_GL=		gl glu glut
-USE_GNOME=	pango
-USE_XORG=	ice sm x11 xi xmu
+USE_GNOME=	cairo
+USE_XORG=	ice sm x11 xi
 GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ENV=	ac_cv_prog_EMACS=no ac_cv_prog_AWK=gawk
 CONFIGURE_ARGS=	--enable-generational-gc=no \
 		--enable-gtk=no \
 		--localstatedir="${PREFIX}/var" \
-		--with-emacs=no \
-		--with-gmp=no
+		--with-emacs=no
 USE_LDCONFIG=	yes
 SHEBANG_LANG=	sed
 sed_OLD_CMD=	/bin/sed
 sed_CMD=	${SED}
 SHEBANG_FILES=	packages/vfs/deb packages/vfs/mailfs \
 		examples/pepe.sed examples/xml.sed
 TEST_TARGET=	check
 
-PLIST_SUB=	VERSION="${PORTVERSION}"
-PORTDATA=	*
-
 INFO=		gst gst-base gst-libs
+PLIST_SUB=	VERSION=${PORTVERSION}
 
 OPTIONS_DEFINE=	PGSQL SDL
 OPTIONS_DEFAULT=	PGSQL SDL
 OPTIONS_SUB=	yes
 
 PGSQL_USES=	pgsql
+
 SDL_USES=	sdl
 SDL_USE=	SDL=image,mixer,sdl,sound,ttf
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/ia64-\*-\* /&|amd64-*-* /' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's/lrintl (truncl/lroundl (truncl/' \
 		${WRKSRC}/libgst/prims.def \
 		${WRKSRC}/libgst/prims.inl
 	@${REINPLACE_CMD} -e '/^gst_SkippedEntityHandler/,+1s/)/, int)/' \
 		${WRKSRC}/packages/xml/expat/expat.c
 	@${REINPLACE_CMD} -e '/^ac_include/s/\\$$/#include <wctype.h> \\/' \
 		${WRKSRC}/snprintfv/configure
 
 post-build:
 	@${SED} -e 's|@bindir@|${PREFIX}/bin|g' \
 		${WRKSRC}/gst-mode.el.in > ${WRKSRC}/gst-mode.el
 
 post-install:
 	@${LN} -sf gst-load.1 ${STAGEDIR}${PREFIX}/share/man/man1/gst-reload.1
-	@${MKDIR} ${STAGEDIR}${DATADIR}/gtk
 	${INSTALL_DATA} ${WRKSRC}/*.el ${STAGEDIR}${PREFIX}/share/emacs/site-lisp
-	@${LS} -1 ${STAGEDIR}${PREFIX}/bin/gst* |grep -v config|${XARGS} ${STRIP_CMD}
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/gst*[^g]
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/smalltalk/*.so
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgst.so
 
 .include <bsd.port.mk>
diff --git a/lang/smalltalk/pkg-plist b/lang/smalltalk/pkg-plist
index cf5d41413e32..6f517c6ecb82 100644
--- a/lang/smalltalk/pkg-plist
+++ b/lang/smalltalk/pkg-plist
@@ -1,76 +1,311 @@
 bin/gst
 bin/gst-blox
 bin/gst-browser
 bin/gst-config
 bin/gst-convert
 bin/gst-doc
 bin/gst-load
 bin/gst-package
 bin/gst-profile
 bin/gst-reload
 bin/gst-remote
 bin/gst-sunit
 include/gst.h
 include/gstpub.h
 lib/libgst.a
 lib/libgst.so
 lib/libgst.so.7
 lib/libgst.so.7.1.3
 lib/smalltalk/dbd-sqlite3-%%VERSION%%.so
 lib/smalltalk/dbd-sqlite3.a
 lib/smalltalk/dbd-sqlite3.so
 lib/smalltalk/digest-%%VERSION%%.so
 lib/smalltalk/digest.a
 lib/smalltalk/digest.so
 lib/smalltalk/expat-%%VERSION%%.so
 lib/smalltalk/expat.a
 lib/smalltalk/expat.so
 lib/smalltalk/gdbm-%%VERSION%%.so
 lib/smalltalk/gdbm.a
 lib/smalltalk/gdbm.so
 lib/smalltalk/gstglut-%%VERSION%%.so
 lib/smalltalk/gstglut.a
 lib/smalltalk/gstglut.so
 lib/smalltalk/gstopengl-%%VERSION%%.so
 lib/smalltalk/gstopengl.a
 lib/smalltalk/gstopengl.so
 lib/smalltalk/i18n-%%VERSION%%.so
 lib/smalltalk/i18n.a
 lib/smalltalk/i18n.so
 lib/smalltalk/iconv-%%VERSION%%.so
 lib/smalltalk/iconv.a
 lib/smalltalk/iconv.so
 %%SDL%%lib/smalltalk/sdl-%%VERSION%%.so
 %%SDL%%lib/smalltalk/sdl.a
 %%SDL%%lib/smalltalk/sdl.so
 lib/smalltalk/zlib-%%VERSION%%.so
 lib/smalltalk/zlib.a
 lib/smalltalk/zlib.so
 libdata/pkgconfig/gnu-smalltalk.pc
 libexec/smalltalk/gnutls-wrapper
 libexec/smalltalk/vfs/deb
 libexec/smalltalk/vfs/lslR
 libexec/smalltalk/vfs/mailfs
 libexec/smalltalk/vfs/patchfs
 libexec/smalltalk/vfs/uar
-libexec/smalltalk/vfs/urar
-libexec/smalltalk/vfs/uzoo
-libexec/smalltalk/vfs/ulha
 libexec/smalltalk/vfs/ucpio
+libexec/smalltalk/vfs/ulha
+libexec/smalltalk/vfs/urar
 libexec/smalltalk/vfs/utar
 libexec/smalltalk/vfs/uzip
+libexec/smalltalk/vfs/uzoo
+share/aclocal/gst-package.m4
+share/aclocal/gst.m4
+share/emacs/site-lisp/gst-mode.el
+share/emacs/site-lisp/smalltalk-mode.el
 share/man/man1/gst-config.1.gz
 share/man/man1/gst-convert.1.gz
 share/man/man1/gst-doc.1.gz
 share/man/man1/gst-load.1.gz
 share/man/man1/gst-package.1.gz
 share/man/man1/gst-profile.1.gz
 share/man/man1/gst-reload.1.gz
 share/man/man1/gst-sunit.1.gz
 share/man/man1/gst.1.gz
+%%DATADIR%%/Announcements.star
+%%DATADIR%%/BLOXBrowser.star
+%%DATADIR%%/CParser.star
+%%DATADIR%%/Cairo.star
+%%SDL%%%%DATADIR%%/CairoSDL.star
+%%DATADIR%%/ClassPublisher.star
+%%DATADIR%%/Compiler.star
+%%DATADIR%%/Complex.star
+%%DATADIR%%/Continuations.star
+%%DATADIR%%/DBD-MySQL.star
+%%PGSQL%%%%DATADIR%%/DBD-PostgreSQL.star
+%%DATADIR%%/DBD-SQLite.star
+%%DATADIR%%/DBI.star
+%%DATADIR%%/DebugTools.star
+%%DATADIR%%/DhbNumericalMethods.star
+%%DATADIR%%/Digest.star
+%%DATADIR%%/GDBM.star
+%%DATADIR%%/GLUT.star
+%%DATADIR%%/GNUPlot.star
+%%DATADIR%%/Glorp.star
+%%DATADIR%%/I18N.star
+%%DATADIR%%/Iconv.star
+%%DATADIR%%/Java.star
+%%SDL%%%%DATADIR%%/LibSDL.star
+%%SDL%%%%DATADIR%%/LibSDL_GL.star
+%%SDL%%%%DATADIR%%/LibSDL_image.star
+%%SDL%%%%DATADIR%%/LibSDL_mixer.star
+%%SDL%%%%DATADIR%%/LibSDL_sound.star
+%%SDL%%%%DATADIR%%/LibSDL_ttf.star
+%%DATADIR%%/Magritte-Seaside.star
+%%DATADIR%%/Magritte.star
+%%DATADIR%%/NCurses.star
+%%DATADIR%%/NetClients.star
+%%DATADIR%%/OpenGL.star
+%%DATADIR%%/Parser.star
+%%DATADIR%%/ProfileTools.star
+%%DATADIR%%/ROE.star
+%%DATADIR%%/SUnit.star
+%%DATADIR%%/SandstoneDb.star
+%%DATADIR%%/Seaside-Core.star
+%%DATADIR%%/Seaside-Development.star
+%%DATADIR%%/Seaside-Examples.star
+%%DATADIR%%/Seaside.star
+%%DATADIR%%/Sockets.star
+%%DATADIR%%/Sport.star
+%%DATADIR%%/Swazoo.star
+%%DATADIR%%/VFSAddOns.star
+%%DATADIR%%/VisualGST.star
+%%DATADIR%%/WebServer.star
+%%DATADIR%%/XML-DOM.star
+%%DATADIR%%/XML-Expat.star
+%%DATADIR%%/XML-ParserTests.star
+%%DATADIR%%/XML-PullParser.star
+%%DATADIR%%/XML-SAXDriver.star
+%%DATADIR%%/XML-SAXParser.star
+%%DATADIR%%/XML-XMLNodeBuilder.star
+%%DATADIR%%/XML-XMLParser.star
+%%DATADIR%%/XPath.star
+%%DATADIR%%/XSL.star
+%%DATADIR%%/ZLib.star
+%%DATADIR%%/examples/Bench.st
+%%DATADIR%%/examples/CairoBlit.st
+%%DATADIR%%/examples/CairoDemo.st
+%%DATADIR%%/examples/Case.st
+%%DATADIR%%/examples/DeltaBlue.st
+%%DATADIR%%/examples/Dinner.st
+%%DATADIR%%/examples/EditStream.st
+%%DATADIR%%/examples/Gen2.st
+%%DATADIR%%/examples/Gen3.st
+%%DATADIR%%/examples/GenClasses.st
+%%DATADIR%%/examples/JSON.st
+%%DATADIR%%/examples/LazyCollection.st
+%%DATADIR%%/examples/Lisp.st
+%%DATADIR%%/examples/Man.st
+%%DATADIR%%/examples/MemUsage.st
+%%DATADIR%%/examples/Methods.st
+%%DATADIR%%/examples/MiniDebugger.st
+%%DATADIR%%/examples/PipeStream.st
+%%DATADIR%%/examples/Prolog.st
+%%DATADIR%%/examples/PrtHier.st
+%%DATADIR%%/examples/Queens.st
+%%DATADIR%%/examples/README
+%%DATADIR%%/examples/RegExp.st
+%%DATADIR%%/examples/Richards.st
+%%DATADIR%%/examples/SortCriter.st
+%%DATADIR%%/examples/Sync.st
+%%DATADIR%%/examples/Tetris.st
+%%DATADIR%%/examples/Timer.st
+%%DATADIR%%/examples/TokenStream.st
+%%DATADIR%%/examples/Tokenizer.st
+%%DATADIR%%/examples/pepe.sed
+%%DATADIR%%/examples/shell
+%%DATADIR%%/examples/xml.sed
+%%DATADIR%%/kernel/AbstNamespc.st
+%%DATADIR%%/kernel/AnsiDates.st
+%%DATADIR%%/kernel/Array.st
+%%DATADIR%%/kernel/ArrayColl.st
+%%DATADIR%%/kernel/Association.st
+%%DATADIR%%/kernel/Autoload.st
+%%DATADIR%%/kernel/Bag.st
+%%DATADIR%%/kernel/Behavior.st
+%%DATADIR%%/kernel/BindingDict.st
+%%DATADIR%%/kernel/BlkClosure.st
+%%DATADIR%%/kernel/BlkContext.st
+%%DATADIR%%/kernel/Boolean.st
+%%DATADIR%%/kernel/Builtins.st
+%%DATADIR%%/kernel/ByteArray.st
+%%DATADIR%%/kernel/CCallable.st
+%%DATADIR%%/kernel/CCallback.st
+%%DATADIR%%/kernel/CFuncs.st
+%%DATADIR%%/kernel/CObject.st
+%%DATADIR%%/kernel/CStruct.st
+%%DATADIR%%/kernel/CType.st
+%%DATADIR%%/kernel/CallinProcess.st
+%%DATADIR%%/kernel/CharArray.st
+%%DATADIR%%/kernel/Character.st
+%%DATADIR%%/kernel/Class.st
+%%DATADIR%%/kernel/ClassDesc.st
+%%DATADIR%%/kernel/Collection.st
+%%DATADIR%%/kernel/CompildCode.st
+%%DATADIR%%/kernel/CompildMeth.st
+%%DATADIR%%/kernel/CompiledBlk.st
+%%DATADIR%%/kernel/ContextPart.st
+%%DATADIR%%/kernel/Continuation.st
+%%DATADIR%%/kernel/DLD.st
+%%DATADIR%%/kernel/Date.st
+%%DATADIR%%/kernel/DeferBinding.st
+%%DATADIR%%/kernel/Delay.st
+%%DATADIR%%/kernel/Dictionary.st
+%%DATADIR%%/kernel/DirMessage.st
+%%DATADIR%%/kernel/Directory.st
+%%DATADIR%%/kernel/DynVariable.st
+%%DATADIR%%/kernel/ExcHandling.st
+%%DATADIR%%/kernel/False.st
+%%DATADIR%%/kernel/File.st
+%%DATADIR%%/kernel/FileDescr.st
+%%DATADIR%%/kernel/FilePath.st
+%%DATADIR%%/kernel/FileSegment.st
+%%DATADIR%%/kernel/FileStream.st
+%%DATADIR%%/kernel/Float.st
+%%DATADIR%%/kernel/FloatD.st
+%%DATADIR%%/kernel/FloatE.st
+%%DATADIR%%/kernel/FloatQ.st
+%%DATADIR%%/kernel/Fraction.st
+%%DATADIR%%/kernel/Generator.st
+%%DATADIR%%/kernel/Getopt.st
+%%DATADIR%%/kernel/HashedColl.st
+%%DATADIR%%/kernel/HomedAssoc.st
+%%DATADIR%%/kernel/IdentDict.st
+%%DATADIR%%/kernel/IdentitySet.st
+%%DATADIR%%/kernel/Integer.st
+%%DATADIR%%/kernel/Interval.st
+%%DATADIR%%/kernel/Iterable.st
+%%DATADIR%%/kernel/LargeInt.st
+%%DATADIR%%/kernel/Link.st
+%%DATADIR%%/kernel/LinkedList.st
+%%DATADIR%%/kernel/LookupKey.st
+%%DATADIR%%/kernel/LookupTable.st
+%%DATADIR%%/kernel/Magnitude.st
+%%DATADIR%%/kernel/MappedColl.st
+%%DATADIR%%/kernel/Memory.st
+%%DATADIR%%/kernel/Message.st
+%%DATADIR%%/kernel/Metaclass.st
+%%DATADIR%%/kernel/MethodDict.st
+%%DATADIR%%/kernel/MethodInfo.st
+%%DATADIR%%/kernel/MthContext.st
+%%DATADIR%%/kernel/Namespace.st
+%%DATADIR%%/kernel/Number.st
+%%DATADIR%%/kernel/ObjDumper.st
+%%DATADIR%%/kernel/ObjMemory.st
+%%DATADIR%%/kernel/Object.st
+%%DATADIR%%/kernel/OrderColl.st
+%%DATADIR%%/kernel/OtherArrays.st
+%%DATADIR%%/kernel/PkgLoader.st
+%%DATADIR%%/kernel/Point.st
+%%DATADIR%%/kernel/PosStream.st
+%%DATADIR%%/kernel/ProcEnv.st
+%%DATADIR%%/kernel/ProcSched.st
+%%DATADIR%%/kernel/Process.st
+%%DATADIR%%/kernel/RWStream.st
+%%DATADIR%%/kernel/Random.st
+%%DATADIR%%/kernel/ReadStream.st
+%%DATADIR%%/kernel/Rectangle.st
+%%DATADIR%%/kernel/RecursionLock.st
+%%DATADIR%%/kernel/Regex.st
+%%DATADIR%%/kernel/RootNamespc.st
+%%DATADIR%%/kernel/RunArray.st
+%%DATADIR%%/kernel/ScaledDec.st
+%%DATADIR%%/kernel/Security.st
+%%DATADIR%%/kernel/Semaphore.st
+%%DATADIR%%/kernel/SeqCollect.st
+%%DATADIR%%/kernel/Set.st
+%%DATADIR%%/kernel/SharedQueue.st
+%%DATADIR%%/kernel/SmallInt.st
+%%DATADIR%%/kernel/SortCollect.st
+%%DATADIR%%/kernel/Stream.st
+%%DATADIR%%/kernel/StreamOps.st
+%%DATADIR%%/kernel/String.st
+%%DATADIR%%/kernel/SymLink.st
+%%DATADIR%%/kernel/Symbol.st
+%%DATADIR%%/kernel/SysDict.st
+%%DATADIR%%/kernel/SysExcept.st
+%%DATADIR%%/kernel/Time.st
+%%DATADIR%%/kernel/Transcript.st
+%%DATADIR%%/kernel/True.st
+%%DATADIR%%/kernel/URL.st
+%%DATADIR%%/kernel/UndefObject.st
+%%DATADIR%%/kernel/UniChar.st
+%%DATADIR%%/kernel/UniString.st
+%%DATADIR%%/kernel/VFS.st
+%%DATADIR%%/kernel/VFSZip.st
+%%DATADIR%%/kernel/ValueAdapt.st
+%%DATADIR%%/kernel/VarBinding.st
+%%DATADIR%%/kernel/WeakObjects.st
+%%DATADIR%%/kernel/WriteStream.st
+%%DATADIR%%/packages.xml
+%%DATADIR%%/scripts/Convert.st
+%%DATADIR%%/scripts/GenDoc.st
+%%DATADIR%%/scripts/Load.st
+%%DATADIR%%/scripts/Package.st
+%%DATADIR%%/scripts/Profile.st
+%%DATADIR%%/scripts/Remote.st
+%%DATADIR%%/scripts/Test.st
+%%DATADIR%%/unsupported/CPP-test.st
+%%DATADIR%%/unsupported/CParseType-test.st
+%%DATADIR%%/unsupported/CString.st
+%%DATADIR%%/unsupported/DLD.st
+%%DATADIR%%/unsupported/Interr.st
+%%DATADIR%%/unsupported/Process.st
+%%DATADIR%%/unsupported/Profile.st
+%%DATADIR%%/unsupported/Sorting.st
+%%DATADIR%%/unsupported/echo.st
+%%DATADIR%%/unsupported/market.st
+%%DATADIR%%/unsupported/resolve.st
+%%DATADIR%%/unsupported/t.st
+%%DATADIR%%/unsupported/torture.st
 var/lib/smalltalk/gst.im
-share/aclocal/gst.m4
-share/aclocal/gst-package.m4
-share/emacs/site-lisp/gst-mode.el
-share/emacs/site-lisp/smalltalk-mode.el
-@dir %%DATADIR%%/gtk