diff --git a/x11-toolkits/fltk/Makefile b/x11-toolkits/fltk/Makefile
index 035326f7622c..533e37882c48 100644
--- a/x11-toolkits/fltk/Makefile
+++ b/x11-toolkits/fltk/Makefile
@@ -1,47 +1,47 @@
 PORTNAME=	fltk
 PORTVERSION=	1.3.9
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	https://www.fltk.org/pub/${PORTNAME}/${PORTVERSION}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Cross-platform C++ graphical user interface toolkit
 WWW=		https://www.fltk.org/
 
 LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libfontconfig.so:x11-fonts/fontconfig
 
 USES=		cpe gl jpeg localbase pkgconfig tar:bz2 xorg
 USE_XORG=	x11 xcursor xext xfixes xft xinerama xrender
 USE_GL=		gl glu
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
 CONFIGURE_ENV=	NROFF=echo
 CPE_VENDOR=	fltk_project
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 PORTEXAMPLES=	*
 
-OPTIONS_DEFINE=	EXAMPLES
+OPTIONS_DEFINE=	CAIRO EXAMPLES
+OPTIONS_SUB=	yes
+
+CAIRO_CONFIGURE_ON=	--enable-cairo
+CAIRO_USES=	gnome
+CAIRO_USE=	GNOME=cairo XORG=pixman
 
 post-patch: .SILENT
-	prefix="${PREFIX}" ; plength=$$(($${#prefix}+10)) ; \
-	${REINPLACE_CMD} -e "\|/etc/fltk|{s||${PREFIX}&|;s|10|$${plength}|;}" \
+	prefix="${PREFIX}" ; fplen=$$(($${#prefix}+10)) ; \
+	${REINPLACE_CMD} -e "\|/etc/fltk|{s||${PREFIX}&|;s|10|$${fplen}|;}" \
 		${WRKSRC}/src/Fl_Preferences.cxx
 	${REINPLACE_CMD} -e 's,$$(docdir)/examples,${EXAMPLESDIR},' \
 		${WRKSRC}/test/Makefile
 	${REINPLACE_CMD} -e '/^INSTALL_[BL]I/s,-m,${STRIP} &, ; \
 		s,^\.SILENT,#&,' ${WRKSRC}/makeinclude.in
 
-post-install:
-.for x in fltk fltk_forms fltk_gl fltk_images
-	${LN} -sf lib${x}.so.${PORTVERSION:R} \
-		${STAGEDIR}${PREFIX}/lib/lib${x}.so.1
-.endfor
-
 .include <bsd.port.mk>
diff --git a/x11-toolkits/fltk/files/patch-cairo_Makefile b/x11-toolkits/fltk/files/patch-cairo_Makefile
new file mode 100644
index 000000000000..afcc1da78f12
--- /dev/null
+++ b/x11-toolkits/fltk/files/patch-cairo_Makefile
@@ -0,0 +1,17 @@
+--- cairo/Makefile.orig	2023-12-09 13:58:40 UTC
++++ cairo/Makefile
+@@ -98,12 +98,13 @@ clean:
+ install: $(CAIROLIBNAME) $(CAIRODSONAME)
+ 	echo "Installing libfltk_cairo$(LIBEXT) in $(libdir)..."
+ 	-$(INSTALL_DIR) $(DESTDIR)$(libdir)
+-	$(INSTALL_LIB) $(CAIROLIBNAME) $(DESTDIR)$(libdir)
++	$(INSTALL_DATA) $(CAIROLIBNAME) $(DESTDIR)$(libdir)
+ 
+ 	if test x$(CAIRODSONAME) = xlibfltk_cairo.so.$(FL_DSO_VERSION); then\
+ 		$(RM) $(DESTDIR)$(libdir)/libfltk_cairo.so*;\
+ 		$(INSTALL_LIB) libfltk_cairo.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir); \
+ 		$(LN) libfltk_cairo.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir)/libfltk_cairo.so;\
++		$(LN) libfltk_cairo.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir)/libfltk_cairo.so.$(FL_DSO_VERSION:R);\
+ 	fi
+ 	if test x$(CAIRODSONAME) = xsrc/libfltk_cairo.sl.$(FL_DSO_VERSION); then\
+ 		$(RM) $(DESTDIR)$(libdir)/libfltk_cairo.sl*;\
diff --git a/x11-toolkits/fltk/files/patch-fltk-config.in b/x11-toolkits/fltk/files/patch-fltk-config.in
deleted file mode 100644
index 5be8cdc224ba..000000000000
--- a/x11-toolkits/fltk/files/patch-fltk-config.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- fltk-config.in.orig	Mon Sep  6 15:20:52 2004
-+++ fltk-config.in	Sat Jun 25 11:45:04 2005
-@@ -180,7 +180,7 @@
- fi
- 
- # Calculate needed libraries
--LDSTATIC="$libdir/libfltk.a $LDLIBS"
-+LDSTATIC="-lm $libdir/libfltk.a $LDLIBS"
- LDLIBS="-lfltk$SHAREDSUFFIX $LDLIBS"
- LIBS="$libdir/libfltk.a"
- 
-@@ -247,7 +247,7 @@
- fi
- 
- if test "$echo_ldflags" = "yes"; then
--    my_libs=
-+    my_libs="-lm"
-     libdirs=$libs
- 
-     for i in $LDLIBS ; do
diff --git a/x11-toolkits/fltk/files/patch-src_Makefile b/x11-toolkits/fltk/files/patch-src_Makefile
new file mode 100644
index 000000000000..3cb89cf6dea1
--- /dev/null
+++ b/x11-toolkits/fltk/files/patch-src_Makefile
@@ -0,0 +1,52 @@
+--- src/Makefile.orig	2023-12-09 13:58:40 UTC
++++ src/Makefile
+@@ -573,13 +573,13 @@ install: $(LIBNAME) $(DSONAME) \
+ 	-$(INSTALL_DIR) $(DESTDIR)$(libdir)
+ 	-$(INSTALL_DIR) $(DESTDIR)$(bindir)
+ 	$(RM) $(DESTDIR)$(libdir)/$(LIBBASENAME)
+-	$(INSTALL_LIB) $(LIBNAME) $(DESTDIR)$(libdir)
+-	$(INSTALL_LIB) $(FLLIBNAME) $(DESTDIR)$(libdir)
+-	$(INSTALL_LIB) $(IMGLIBNAME) $(DESTDIR)$(libdir)
++	$(INSTALL_DATA) $(LIBNAME) $(DESTDIR)$(libdir)
++	$(INSTALL_DATA) $(FLLIBNAME) $(DESTDIR)$(libdir)
++	$(INSTALL_DATA) $(IMGLIBNAME) $(DESTDIR)$(libdir)
+ 	$(RANLIB) $(DESTDIR)$(libdir)/$(LIBBASENAME)
+ 	$(RANLIB) $(DESTDIR)$(libdir)/$(FLLIBBASENAME)
+ 	if test x$(GLLIBNAME) != x; then \
+-		$(INSTALL_LIB) $(GLLIBNAME) $(DESTDIR)$(libdir); \
++		$(INSTALL_DATA) $(GLLIBNAME) $(DESTDIR)$(libdir); \
+ 		$(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBBASENAME); \
+ 	fi
+ 	$(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBBASENAME)
+@@ -587,6 +587,7 @@ install: $(LIBNAME) $(DSONAME) \
+ 		$(RM) $(DESTDIR)$(libdir)/libfltk.so*;\
+ 		$(INSTALL_LIB) libfltk.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir); \
+ 		$(LN) libfltk.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir)/libfltk.so;\
++		$(LN) libfltk.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir)/libfltk.so.$(FL_DSO_VERSION:R);\
+ 	fi
+ 	if test x$(DSONAME) = xlibfltk.sl.$(FL_DSO_VERSION); then\
+ 		$(RM) $(DESTDIR)$(libdir)/libfltk.sl*;\
+@@ -618,6 +619,7 @@ install: $(LIBNAME) $(DSONAME) \
+ 		$(RM) $(DESTDIR)$(libdir)/libfltk_forms.so*;\
+ 		$(INSTALL_LIB) libfltk_forms.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir); \
+ 		$(LN) libfltk_forms.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir)/libfltk_forms.so;\
++		$(LN) libfltk_forms.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir)/libfltk_forms.so.$(FL_DSO_VERSION:R);\
+ 	fi
+ 	if test x$(FLDSONAME) = xlibfltk_forms.sl.$(FL_DSO_VERSION); then\
+ 		$(RM) $(DESTDIR)$(libdir)/libfltk_forms.sl*;\
+@@ -649,6 +651,7 @@ install: $(LIBNAME) $(DSONAME) \
+ 		$(RM) $(DESTDIR)$(libdir)/libfltk_gl.so*;\
+ 		$(INSTALL_LIB) libfltk_gl.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir); \
+ 		$(LN) libfltk_gl.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir)/libfltk_gl.so;\
++		$(LN) libfltk_gl.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir)/libfltk_gl.so.$(FL_DSO_VERSION:R);\
+ 	fi
+ 	if test x$(GLDSONAME) = xlibfltk_gl.sl.$(FL_DSO_VERSION); then\
+ 		$(RM) $(DESTDIR)$(libdir)/libfltk_gl.sl*;\
+@@ -680,6 +683,7 @@ install: $(LIBNAME) $(DSONAME) \
+ 		$(RM) $(DESTDIR)$(libdir)/libfltk_images.so*;\
+ 		$(INSTALL_LIB) libfltk_images.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir); \
+ 		$(LN) libfltk_images.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir)/libfltk_images.so;\
++		$(LN) libfltk_images.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir)/libfltk_images.so.$(FL_DSO_VERSION:R);\
+ 	fi
+ 	if test x$(IMGDSONAME) = xlibfltk_images.sl.$(FL_DSO_VERSION); then\
+ 		$(RM) $(DESTDIR)$(libdir)/libfltk_images.sl*;\
diff --git a/x11-toolkits/fltk/pkg-plist b/x11-toolkits/fltk/pkg-plist
index 6f15df0e1435..46d51d8ba0d4 100644
--- a/x11-toolkits/fltk/pkg-plist
+++ b/x11-toolkits/fltk/pkg-plist
@@ -1,166 +1,170 @@
 bin/fltk-config
 bin/fluid
 include/FL/Enumerations.H
 include/FL/Fl.H
 include/FL/Fl_Adjuster.H
 include/FL/Fl_BMP_Image.H
 include/FL/Fl_Bitmap.H
 include/FL/Fl_Box.H
 include/FL/Fl_Browser.H
 include/FL/Fl_Browser_.H
 include/FL/Fl_Button.H
 include/FL/Fl_Cairo.H
 include/FL/Fl_Cairo_Window.H
 include/FL/Fl_Chart.H
 include/FL/Fl_Check_Browser.H
 include/FL/Fl_Check_Button.H
 include/FL/Fl_Choice.H
 include/FL/Fl_Clock.H
 include/FL/Fl_Color_Chooser.H
 include/FL/Fl_Copy_Surface.H
 include/FL/Fl_Counter.H
 include/FL/Fl_Device.H
 include/FL/Fl_Dial.H
 include/FL/Fl_Double_Window.H
 include/FL/Fl_Export.H
 include/FL/Fl_File_Browser.H
 include/FL/Fl_File_Chooser.H
 include/FL/Fl_File_Icon.H
 include/FL/Fl_File_Input.H
 include/FL/Fl_Fill_Dial.H
 include/FL/Fl_Fill_Slider.H
 include/FL/Fl_Float_Input.H
 include/FL/Fl_FormsBitmap.H
 include/FL/Fl_FormsPixmap.H
 include/FL/Fl_Free.H
 include/FL/Fl_GIF_Image.H
 include/FL/Fl_Gl_Window.H
 include/FL/Fl_Group.H
 include/FL/Fl_Help_Dialog.H
 include/FL/Fl_Help_View.H
 include/FL/Fl_Hold_Browser.H
 include/FL/Fl_Hor_Fill_Slider.H
 include/FL/Fl_Hor_Nice_Slider.H
 include/FL/Fl_Hor_Slider.H
 include/FL/Fl_Hor_Value_Slider.H
 include/FL/Fl_Image.H
 include/FL/Fl_Image_Surface.H
 include/FL/Fl_Input.H
 include/FL/Fl_Input_.H
 include/FL/Fl_Input_Choice.H
 include/FL/Fl_Int_Input.H
 include/FL/Fl_JPEG_Image.H
 include/FL/Fl_Light_Button.H
 include/FL/Fl_Line_Dial.H
 include/FL/Fl_Menu.H
 include/FL/Fl_Menu_.H
 include/FL/Fl_Menu_Bar.H
 include/FL/Fl_Menu_Button.H
 include/FL/Fl_Menu_Item.H
 include/FL/Fl_Menu_Window.H
 include/FL/Fl_Multi_Browser.H
 include/FL/Fl_Multi_Label.H
 include/FL/Fl_Multiline_Input.H
 include/FL/Fl_Multiline_Output.H
 include/FL/Fl_Native_File_Chooser.H
 include/FL/Fl_Nice_Slider.H
 include/FL/Fl_Object.H
 include/FL/Fl_Output.H
 include/FL/Fl_Overlay_Window.H
 include/FL/Fl_PNG_Image.H
 include/FL/Fl_PNM_Image.H
 include/FL/Fl_Pack.H
 include/FL/Fl_Paged_Device.H
 include/FL/Fl_Pixmap.H
 include/FL/Fl_Plugin.H
 include/FL/Fl_Positioner.H
 include/FL/Fl_PostScript.H
 include/FL/Fl_Preferences.H
 include/FL/Fl_Printer.H
 include/FL/Fl_Progress.H
 include/FL/Fl_RGB_Image.H
 include/FL/Fl_Radio_Button.H
 include/FL/Fl_Radio_Light_Button.H
 include/FL/Fl_Radio_Round_Button.H
 include/FL/Fl_Repeat_Button.H
 include/FL/Fl_Return_Button.H
 include/FL/Fl_Roller.H
 include/FL/Fl_Round_Button.H
 include/FL/Fl_Round_Clock.H
 include/FL/Fl_Scroll.H
 include/FL/Fl_Scrollbar.H
 include/FL/Fl_Secret_Input.H
 include/FL/Fl_Select_Browser.H
 include/FL/Fl_Shared_Image.H
 include/FL/Fl_Simple_Counter.H
 include/FL/Fl_Single_Window.H
 include/FL/Fl_Slider.H
 include/FL/Fl_Spinner.H
 include/FL/Fl_Sys_Menu_Bar.H
 include/FL/Fl_Table.H
 include/FL/Fl_Table_Row.H
 include/FL/Fl_Tabs.H
 include/FL/Fl_Text_Buffer.H
 include/FL/Fl_Text_Display.H
 include/FL/Fl_Text_Editor.H
 include/FL/Fl_Tile.H
 include/FL/Fl_Tiled_Image.H
 include/FL/Fl_Timer.H
 include/FL/Fl_Toggle_Button.H
 include/FL/Fl_Toggle_Light_Button.H
 include/FL/Fl_Toggle_Round_Button.H
 include/FL/Fl_Tooltip.H
 include/FL/Fl_Tree.H
 include/FL/Fl_Tree_Item.H
 include/FL/Fl_Tree_Item_Array.H
 include/FL/Fl_Tree_Prefs.H
 include/FL/Fl_Valuator.H
 include/FL/Fl_Value_Input.H
 include/FL/Fl_Value_Output.H
 include/FL/Fl_Value_Slider.H
 include/FL/Fl_Widget.H
 include/FL/Fl_Window.H
 include/FL/Fl_Wizard.H
 include/FL/Fl_XBM_Image.H
 include/FL/Fl_XPM_Image.H
 include/FL/abi-version.h
 include/FL/dirent.h
 include/FL/filename.H
 include/FL/fl_ask.H
 include/FL/fl_draw.H
 include/FL/fl_message.H
 include/FL/fl_show_colormap.H
 include/FL/fl_show_input.H
 include/FL/fl_types.h
 include/FL/fl_utf8.h
 include/FL/forms.H
 include/FL/gl.h
 include/FL/gl2opengl.h
 include/FL/gl_draw.H
 include/FL/glu.h
 include/FL/glut.H
 include/FL/mac.H
 include/FL/math.h
 include/FL/names.h
 include/FL/platform.H
 include/FL/win32.H
 include/FL/x.H
 lib/libfltk.a
 lib/libfltk.so
 lib/libfltk.so.1
 lib/libfltk.so.1.3
+%%CAIRO%%lib/libfltk_cairo.a
+%%CAIRO%%lib/libfltk_cairo.so
+%%CAIRO%%lib/libfltk_cairo.so.1
+%%CAIRO%%lib/libfltk_cairo.so.1.3
 lib/libfltk_forms.a
 lib/libfltk_forms.so
 lib/libfltk_forms.so.1
 lib/libfltk_forms.so.1.3
 lib/libfltk_gl.a
 lib/libfltk_gl.so
 lib/libfltk_gl.so.1
 lib/libfltk_gl.so.1.3
 lib/libfltk_images.a
 lib/libfltk_images.so
 lib/libfltk_images.so.1
 lib/libfltk_images.so.1.3
 man/man1/fltk-config.1.gz
 man/man1/fluid.1.gz
 man/man3/fltk.3.gz