diff --git a/graphics/grafx2/Makefile b/graphics/grafx2/Makefile
index e4b7b5354c32..404a429f8c29 100644
--- a/graphics/grafx2/Makefile
+++ b/graphics/grafx2/Makefile
@@ -1,50 +1,49 @@
 PORTNAME=	grafx2
-PORTVERSION=	2.8
-DISTVERSIONSUFFIX=	.3091-HEAD-src
-PORTREVISION=	3
+DISTVERSIONPREFIX=	v
+DISTVERSION=	2.9
+DISTVERSIONSUFFIX=	.3219
 CATEGORIES=	graphics
 MASTER_SITES=	http://pulkomandy.tk/projects/GrafX2/downloads/ \
 		LOCAL/ehaupt
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Pixelart-oriented bitmap painting program
 WWW=		https://pulkomandy.tk/projects/GrafX2
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libtiff.so:graphics/tiff \
 		libX11.so:x11/libX11
 
-USES=		desktop-file-utils gmake gnome iconv:wchar_t pkgconfig sdl \
-		tar:tgz
+USES=		desktop-file-utils gmake gnome iconv:wchar_t pkgconfig sdl
 USE_SDL=	image2 sdl2
 
 MAKE_ENV+=	API=${GRAFX2_API} \
 		V=1
 
 CFLAGS+=	-DHAVE_SYS_PARAM_H -DHAVE_SYS_UCRED_H -DHAVE_SYS_MOUNT_H
 
-WRKSRC=		${WRKDIR}/grafx2
+WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSIONPREFIX}${PORTVERSION}
 WRKSRC_SUBDIR=	src
 
 OPTIONS_DEFINE=		LUA TTF
 OPTIONS_DEFAULT=	TTF
 OPTIONS_SUB=		yes
 
 TTF_DESC=	True Type font support
 
 LUA_USES=		lua
 LUA_MAKE_ARGS_OFF=	NOLUA=1
 TTF_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig
 TTF_USE=		SDL=ttf2
 TTF_MAKE_ARGS_OFF=	NOTTF=1
 
 GRAFX2_API=	sdl2
 
 post-install:
 	@${MV} ${STAGEDIR}${PREFIX}/bin/grafx2-${GRAFX2_API} \
 		${STAGEDIR}${PREFIX}/bin/grafx2
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/grafx2
 
 .include <bsd.port.mk>
diff --git a/graphics/grafx2/distinfo b/graphics/grafx2/distinfo
index 9e3e9ae1d2df..b8ef0126a0d6 100644
--- a/graphics/grafx2/distinfo
+++ b/graphics/grafx2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1616843664
-SHA256 (grafx2-2.8.3091-HEAD-src.tgz) = 29d63b194850a7f43bb7f92d2cf1b123ae991f2da00c07df9f6c81e6999c2423
-SIZE (grafx2-2.8.3091-HEAD-src.tgz) = 1127842
+TIMESTAMP = 1714510191
+SHA256 (grafx2-v2.9.3219.tar.gz) = 57c020e2d0a8287537c703ba596c9bc77cef98f409d86e4a625ce08d1a5de4c2
+SIZE (grafx2-v2.9.3219.tar.gz) = 2631545
diff --git a/graphics/grafx2/files/patch-Makefile b/graphics/grafx2/files/patch-Makefile
index 9879e6274655..f83e345c1f77 100644
--- a/graphics/grafx2/files/patch-Makefile
+++ b/graphics/grafx2/files/patch-Makefile
@@ -1,12 +1,12 @@
---- Makefile.orig	2021-03-24 19:59:20 UTC
+--- Makefile.orig	2024-04-29 15:47:02 UTC
 +++ Makefile
-@@ -1242,7 +1242,8 @@ install : $(BIN)
+@@ -1250,7 +1250,8 @@ install : $(BIN)
  	test -d $(DESTDIR)$(datadir)/grafx2/fonts || $(MKDIR) $(DESTDIR)$(datadir)/grafx2/fonts
  	test -d $(DESTDIR)$(datadir)/grafx2/skins || $(MKDIR) $(DESTDIR)$(datadir)/grafx2/skins
  	test -d $(DESTDIR)$(datadir)/grafx2/scripts || $(MKDIR) $(DESTDIR)$(datadir)/grafx2/scripts
 -	test -d $(DESTDIR)$(datadir)/grafx2/scripts/libs || $(MKDIR) $(DESTDIR)$(datadir)/grafx2/scripts/libs
 +	# this is an empty directory on FreeBSD, we don't need it
 +	#test -d $(DESTDIR)$(datadir)/grafx2/scripts/libs || $(MKDIR) $(DESTDIR)$(datadir)/grafx2/scripts/libs
  	test -d $(DESTDIR)$(datadir)/applications || $(MKDIR) $(DESTDIR)$(datadir)/applications
  	test -d $(DESTDIR)$(datadir)/metainfo || $(MKDIR) $(DESTDIR)$(datadir)/metainfo
  	test -d $(DESTDIR)$(pixmapdir) || $(MKDIR) $(DESTDIR)$(pixmapdir)
diff --git a/graphics/grafx2/files/patch-sdlscreen.c b/graphics/grafx2/files/patch-sdlscreen.c
deleted file mode 100644
index 6f75258a549a..000000000000
--- a/graphics/grafx2/files/patch-sdlscreen.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- sdlscreen.c.orig	2023-04-11 14:41:38 UTC
-+++ sdlscreen.c
-@@ -373,17 +373,11 @@ byte * Surface_to_bytefield(SDL_Surface *source, byte
-   byte *src;
-   byte *dest_ptr;
-   int y;
--  int remainder;
-
-   // Support seulement des images 256 couleurs
-   if (source->format->BytesPerPixel != 1)
-     return NULL;
-
--  if (source->w & 3)
--    remainder=4-(source->w&3);
--  else
--    remainder=0;
--
-   if (dest==NULL)
-     dest=(byte *)malloc(source->w*source->h);
-
-@@ -393,7 +387,7 @@ byte * Surface_to_bytefield(SDL_Surface *source, byte
-   {
-     memcpy(dest_ptr, src,source->w);
-     dest_ptr += source->w;
--    src += source->w + remainder;
-+    src += source->pitch;
-   }
-   return dest;
-
diff --git a/graphics/grafx2/pkg-plist b/graphics/grafx2/pkg-plist
index 55c5b12e4599..bf2c786bde4a 100644
--- a/graphics/grafx2/pkg-plist
+++ b/graphics/grafx2/pkg-plist
@@ -1,98 +1,102 @@
 bin/grafx2
 share/applications/grafx2.desktop
 %%DATADIR%%/fonts/8pxfont.png
 %%DATADIR%%/fonts/PF_Arma_5__.png
 %%DATADIR%%/fonts/PF_Easta_7_.png
 %%DATADIR%%/fonts/PF_Easta_7__.png
 %%DATADIR%%/fonts/PF_Ronda_7__.png
 %%DATADIR%%/fonts/PF_Tempesta_5.png
 %%DATADIR%%/fonts/PF_Tempesta_5_.png
 %%DATADIR%%/fonts/PF_Tempesta_5__.png
 %%DATADIR%%/fonts/PF_Tempesta_5___.png
 %%DATADIR%%/fonts/PF_Tempesta_7.png
 %%DATADIR%%/fonts/PF_Tempesta_7_.png
 %%DATADIR%%/fonts/PF_Tempesta_7__.png
 %%DATADIR%%/fonts/PF_Tempesta_7___.png
 %%DATADIR%%/fonts/PF_Westa_7_.png
 %%DATADIR%%/fonts/PF_Westa_7__.png
 %%DATADIR%%/fonts/Tuffy.ttf
 %%DATADIR%%/gfx2.gif
 %%DATADIR%%/gfx2def.ini
 %%DATADIR%%/gfx2.png
 %%DATADIR%%/skins/skin_chrisfx.png
-%%DATADIR%%/skins/unicode_0390-03C9.png
-%%DATADIR%%/skins/unicode_3040-309F.png
 %%LUA%%%%DATADIR%%/scripts/samples/brush/ApplyColor.lua
 %%LUA%%%%DATADIR%%/scripts/samples/brush/Fisheye.lua
 %%LUA%%%%DATADIR%%/scripts/samples/brush/GrayscaleAvg.lua
 %%LUA%%%%DATADIR%%/scripts/samples/brush/GrayscaleDesat.lua
 %%LUA%%%%DATADIR%%/scripts/samples/brush/Halfsmooth.lua
 %%LUA%%%%DATADIR%%/scripts/samples/brush/Waves.lua
 %%LUA%%%%DATADIR%%/scripts/samples/codenetsend.lua
 %%LUA%%%%DATADIR%%/scripts/samples/demo/3DPalette.lua
 %%LUA%%%%DATADIR%%/scripts/samples/demo/Ellipse.lua
 %%LUA%%%%DATADIR%%/scripts/samples/demo/FlipPicture.lua
 %%LUA%%%%DATADIR%%/scripts/samples/demo/SierpinskyCarpet.lua
 %%LUA%%%%DATADIR%%/scripts/samples/demo/SierpinskyTriangle.lua
 %%LUA%%%%DATADIR%%/scripts/samples/demo/Spritesheet.lua
 %%LUA%%%%DATADIR%%/scripts/samples/demo/brush/Amigaball.lua
 %%LUA%%%%DATADIR%%/scripts/samples/demo/brush/ColorSphere.lua
 %%LUA%%%%DATADIR%%/scripts/samples/demo/brush/FindAA.lua
 %%LUA%%%%DATADIR%%/scripts/samples/demo/brush/Mandelbrot.lua
 %%LUA%%%%DATADIR%%/scripts/samples/libs/dawnbringer_lib.lua
 %%LUA%%%%DATADIR%%/scripts/samples/libs/memory.lua
 %%LUA%%%%DATADIR%%/scripts/samples/palette/Desaturate.lua
 %%LUA%%%%DATADIR%%/scripts/samples/palette/ExpandColors.lua
 %%LUA%%%%DATADIR%%/scripts/samples/palette/FillColorCube.lua
 %%LUA%%%%DATADIR%%/scripts/samples/palette/InvertedRGB.lua
 %%LUA%%%%DATADIR%%/scripts/samples/palette/Set3bit.lua
 %%LUA%%%%DATADIR%%/scripts/samples/palette/Set6bit.lua
 %%LUA%%%%DATADIR%%/scripts/samples/palette/SetC64Palette.lua
 %%LUA%%%%DATADIR%%/scripts/samples/palette/ShiftHue.lua
 %%LUA%%%%DATADIR%%/scripts/samples/picture/CellColourReducer.lua
 %%LUA%%%%DATADIR%%/scripts/samples/picture/DrawGridIsometric.lua
 %%LUA%%%%DATADIR%%/scripts/samples/picture/DrawGridOrthogonal_RGB.lua
 %%LUA%%%%DATADIR%%/scripts/samples/picture/DrawgridOrthogonal_Index.lua
 %%LUA%%%%DATADIR%%/scripts/samples/picture/FontConvert.lua
 %%LUA%%%%DATADIR%%/scripts/samples/picture/GlassGridFilter.lua
 %%LUA%%%%DATADIR%%/scripts/samples/picture/PaletteToPicture.lua
 %%LUA%%%%DATADIR%%/scripts/samples/picture/Pic2isometric.lua
 %%LUA%%%%DATADIR%%/scripts/samples/picture/Rainbow-Dark2Bright.lua
 %%LUA%%%%DATADIR%%/scripts/samples/picture/RemapImage2RGB.lua
 %%LUA%%%%DATADIR%%/scripts/samples/picture/RemapImage2RGB_ed.lua
 %%LUA%%%%DATADIR%%/scripts/samples/picture/RemapImageTo3bitPal.lua
 %%LUA%%%%DATADIR%%/scripts/samples/picture/Tiler.lua
 %%LUA%%%%DATADIR%%/scripts/samples/picture/XBitColourXpaceFromPalette.lua
 %%LUA%%%%DATADIR%%/scripts/samples/picture/others-8bit/lib/ostro_other.lua
 %%LUA%%%%DATADIR%%/scripts/samples/picture/others-8bit/ostro_oric.lua
 %%LUA%%%%DATADIR%%/scripts/samples/picture/others-8bit/ostro_zx.lua
 %%LUA%%%%DATADIR%%/scripts/samples/picture/thomson/bayer4_mo5.lua
 %%LUA%%%%DATADIR%%/scripts/samples/picture/thomson/bayer4_to8.lua
 %%LUA%%%%DATADIR%%/scripts/samples/picture/thomson/lib/bayer.lua
 %%LUA%%%%DATADIR%%/scripts/samples/picture/thomson/lib/color.lua
 %%LUA%%%%DATADIR%%/scripts/samples/picture/thomson/lib/color_reduction.lua
 %%LUA%%%%DATADIR%%/scripts/samples/picture/thomson/lib/convex_hull.lua
 %%LUA%%%%DATADIR%%/scripts/samples/picture/thomson/lib/ostromoukhov.lua
 %%LUA%%%%DATADIR%%/scripts/samples/picture/thomson/lib/thomson.lua
 %%LUA%%%%DATADIR%%/scripts/samples/picture/thomson/none_mo5.lua
 %%LUA%%%%DATADIR%%/scripts/samples/picture/thomson/none_to8.lua
 %%LUA%%%%DATADIR%%/scripts/samples/picture/thomson/none_to9.lua
 %%LUA%%%%DATADIR%%/scripts/samples/picture/thomson/ostro_mo5.lua
 %%LUA%%%%DATADIR%%/scripts/samples/picture/thomson/ostro_to7.lua
 %%LUA%%%%DATADIR%%/scripts/samples/picture/thomson/ostro_to8.lua
 %%LUA%%%%DATADIR%%/scripts/samples/picture/thomson/ostro_to9.lua
+%%DATADIR%%/fonts/5pxtinyfont.png
+%%DATADIR%%/fonts/GrafX2_Black.gif
+%%DATADIR%%/fonts/GrafX2_Dark.gif
+%%DATADIR%%/fonts/colorfont.pcx
 %%DATADIR%%/skins/font_Classic.png
 %%DATADIR%%/skins/font_DPaint.png
 %%DATADIR%%/skins/font_Fairlight.png
 %%DATADIR%%/skins/font_Fun.png
 %%DATADIR%%/skins/font_Melon.png
 %%DATADIR%%/skins/font_Seen.png
 %%DATADIR%%/skins/skin_Aurora.png
 %%DATADIR%%/skins/skin_DPaint.png
+%%DATADIR%%/skins/skin_black.png
 %%DATADIR%%/skins/skin_classic.png
+%%DATADIR%%/skins/skin_klin.png
 %%DATADIR%%/skins/skin_modern.png
 %%DATADIR%%/skins/skin_scenish.png
 %%DATADIR%%/skins/unicode_0410-044F.png
 share/icons/hicolor/scalable/apps/grafx2.svg
 share/icons/hicolor/scalable/apps/grafx2.xpm
-share/metainfo/grafx2.appdata.xml
+share/metainfo/eu.grafx2.grafx2.metainfo.xml