diff --git a/sci-visualization/gnuplot/gnuplot-5.2.8.recipe b/sci-visualization/gnuplot/gnuplot-5.4.10.recipe
similarity index 51%
rename from sci-visualization/gnuplot/gnuplot-5.2.8.recipe
rename to sci-visualization/gnuplot/gnuplot-5.4.10.recipe
index ff51ce6e4..a935e5eb4 100644
--- a/sci-visualization/gnuplot/gnuplot-5.2.8.recipe
+++ b/sci-visualization/gnuplot/gnuplot-5.4.10.recipe
@@ -4,11 +4,13 @@ visualize mathematical functions and data interactively, but has grown to \
 support many non-interactive uses such as web scripting. It is also used \
 as a plotting engine by third-party applications like Octave."
 HOMEPAGE="http://www.gnuplot.info/"
-COPYRIGHT="1986-1993, 1998, 2004-2019 Thomas Williams, Colin Kelley"
+COPYRIGHT="1986-1993, 1998, 2004 Thomas Williams, Colin Kelley"
 LICENSE="Gnuplot"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://downloads.sourceforge.net/gnuplot/gnuplot-$portVersion.tar.gz"
-CHECKSUM_SHA256="60a6764ccf404a1668c140f11cc1f699290ab70daa1151bb58fed6139a28ac37"
+CHECKSUM_SHA256="975d8c1cc2c41c7cedc4e323aff035d977feb9a97f0296dd2a8a66d197a5b27c"
+
+PATCHES="gnuplot-$portVersion.patchset"
 
 ARCHITECTURES="all !x86_gcc2"
 if [ "$targetArchitecture" = x86_gcc2 ]; then
@@ -26,28 +28,17 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libfontconfig$secondaryArchSuffix
-	lib:libfreetype$secondaryArchSuffix
 	lib:libgd$secondaryArchSuffix
-	lib:libiconv$secondaryArchSuffix
-	lib:libjpeg$secondaryArchSuffix
-	lib:libncurses$secondaryArchSuffix
-	lib:libpng16$secondaryArchSuffix
-	lib:libreadline$secondaryArchSuffix
-	lib:libtiff$secondaryArchSuffix
-	lib:libvpx$secondaryArchSuffix
+	lib:libedit$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
+	lib:libX11$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libcairo$secondaryArchSuffix
-#	devel:libcerf$secondaryArchSuffix
+	xlibe${secondaryArchSuffix}_devel
 	devel:libgd$secondaryArchSuffix
-	devel:libjpeg$secondaryArchSuffix
-#	devel:libpango_1.0$secondaryArchSuffix
-	devel:libreadline$secondaryArchSuffix >= 8
-	devel:libvpx$secondaryArchSuffix
+	devel:libedit$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
@@ -65,15 +56,29 @@ BUILD_PREREQUIRES="
 PATCH()
 {
 	sed -i 's/-rdynamic/-Wl,-export-dynamic/g' demo/plugin/Makefile.am
-	sed -i 's/isnan/std::isnan/g' src/qtterminal/qt_conversion.cpp
 }
 
 BUILD()
 {
 	aclocal
 	automake
+
+	export CFLAGS="-O2" # avoids building with "-g", we're using "make install-strip" anyway.
 	runConfigure --omit-dirs binDir ./configure --bindir="$commandBinDir" \
-		--without-cairo \
+		--with-bitmap-terminals \
+		--with-readline=bsd \
+		--with-cairo=no \
+		--with-lua=no \
+		--with-qt=no \
+		--with-x # Can result in an empty white window. Resizing/moving it seems to help.
+
+		# --with-readline=builtin # doesn't works on Haiku. Gets OA/OB/OC/OD on cursor key presses.
+
+		# Other (less useful) terminals we could enable without further dependencies:
+		# --with-gpic \
+		# --with-mif \
+		# --with-regis \
+		# --with-tgif \
 
 	make $jobArgs
 }
@@ -81,8 +86,22 @@ BUILD()
 INSTALL()
 {
 	make install-strip
+
+	# Remove dirs, if empty (content varies according to "--with-" configure options).
+	gnuplotLibDir=$libDir/gnuplot/${portVersion%.*}
+	if [ -z "$(ls -A $gnuplotLibDir)" ]; then
+		rmdir $gnuplotLibDir $libDir/gnuplot
+	fi
 }
 
+# BEWARE: test doesn't shows any summary at the end.
+# Also, gnuplot_x11 crashes a lot. Be sure to add an "auto-kill" action to
+# ~/config/settings/system/debug_server/settings, eg:
+#
+# executable_actions {
+#	/sources/*/gnuplot_x11	kill
+#}
+
 TEST()
 {
 	make check
diff --git a/sci-visualization/gnuplot/patches/gnuplot-5.4.10.patchset b/sci-visualization/gnuplot/patches/gnuplot-5.4.10.patchset
new file mode 100644
index 000000000..c1b817f55
--- /dev/null
+++ b/sci-visualization/gnuplot/patches/gnuplot-5.4.10.patchset
@@ -0,0 +1,22 @@
+From e690b360d557c491c69cebc6caea6af3b66b61d0 Mon Sep 17 00:00:00 2001
+From: Oscar Lesta <oscar.lesta@gmail.com>
+Date: Wed, 4 Oct 2023 13:07:06 -0300
+Subject: Use XDG_* dirs/vars
+
+
+diff --git a/src/xdg.h b/src/xdg.h
+index 7510444..a0d20b8 100644
+--- a/src/xdg.h
++++ b/src/xdg.h
+@@ -1,7 +1,7 @@
+ #ifndef GNUPLOT_XDG_H
+ #define GNUPLOT_XDG_H
+ 
+-#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
++#if defined(__unix__) || defined(__HAIKU__) || (defined(__APPLE__) && defined(__MACH__))
+ 
+ #define USE_XDG_BASEDIR
+ 
+-- 
+2.45.2
+