CVS commit: pkgsrc/x11/fltk

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/x11/fltk
From: "Michael Baeuerle" <micha%netbsd.org@localhost>
Date: Fri, 31 Jan 2025 12:22:45 +0000

Module Name:    pkgsrc
Committed By:   micha
Date:           Fri Jan 31 12:22:45 UTC 2025

Modified Files:
        pkgsrc/x11/fltk: DESCR Makefile PLIST buildlink3.mk distinfo
Added Files:
        pkgsrc/x11/fltk: options.mk
        pkgsrc/x11/fltk/patches: patch-FL_Fl__Cairo.H patch-cairo_Makefile
            patch-configure patch-documentation_Makefile
            patch-fltk-options_Makefile patch-fluid_Makefile
            patch-makeinclude.in patch-src_Makefile patch-test_Makefile
Removed Files:
        pkgsrc/x11/fltk/patches: patch-aa patch-ab patch-ac patch-ad patch-ae
            patch-af patch-ag patch-ah patch-fluid_Fl__Type.h
            patch-src_fl__draw.cxx

Log Message:
x11/fltk: Update to 1.4.1

Part of FLTK 1.4 transition (Step 1).

- Switch to Github
- Add license
- Take maintainership

Changes in FLTK 1.4.1                                   Released: Dec 12 2024

  FLTK 1.4.1 is a maintenance release with bug fixes and improvements.

  Bug Fixes

  - Fix rounding issues with Fl_RGB_Image::draw() + window scaling (#1128)
  - Fix fullscreen regression on macOS( #1129)
  - Fix fl_draw_image sometimes crashes when window is scaled (#1134)
  - Fix: Can't control scale of Fl_Copy_Surface dimensions on Linux (#1135)
  - Improve output of 'fltk-options -h' and 'fltk-options -L*'
  - Windows: Fix rescale bug while window is maximized or fullscreen
  - Fix graphical glitches on 101 DPI screen (#1138)
  - Fix changed flag for radio buttons (#1146)
  - Fix Fl_Scroll with real *_BOX draws over scrollbars at non-default scales (#1149)
  - Fix drawing bugs on Windows at very large scales (#1144)
  - Fix button down state when triggered by shortcut (#1145)
  - Give access to some Fl_Text_Display member variables (#1153)
  - Fix: Mouse hover + Enter key selects inactive menu items (#1159)
  - Fix hang/infinite loop on submenu with all inactive/invisible items (#1158)
  - Fix triggering callback for inactive menu items (#1159)
  - Fix inconsistencies with Tab/Backspace handling in menus (#1157)
  - Fix Fl_Menu_Item::measure() width calculation (#1164)
  - Fix drawing issue for checkbox buttons with bad box type (#1130)
  - Fix: Window can be moved while menu is open (#1166)

  Image libraries

  - Update bundled libpng to version 1.6.44

  Fixes and Improvements in Fluid:

  - Fix autodocs file leak and memory leak
  - Fix autodoc image memory allocation
  - Fix project modflags when adding shell commands
  - Avoid generating undo on spurious relayout events (#1152)
  - Minor improvements to buffer handling (#1152)
  - Clear cached browser values and cached pointers (#1152)
  - Fix default settings tab
  - Avoid trailing spaces in empty comment lines (#1161)
  - Command line arguments '-v' and '--version' show fltk version
  - Command line argument '--help' shows brief usage information

  Optional ABI changes: these require configure or CMake option
    to define FL_ABI_VERSION = 10401

  - Increase clipping stack size from 10 to 64 entries (#1139)
  - Fix potential (likely false positive) compiler warning in Fl_Help_View

  Documentation Improvements

  - Update build instructions in README.Unix.txt (#67)
  - Update README.Windows.txt
  - Update README.CMake.txt for cross-building (#1154)
  - Document that fl_scroll() doesn't work OK with non-integral scaling factors
  - Add details about fl_override_scale() and clip
  - Clarify use of Fl_Tabs::client_area()
  - Fix Makefile example in chapter "FLTK Basics"

  Improvements and minor Fixes in Test and Demo Programs

  - MSVC: Fix array allocation in test/fltk-versions (#1131)
  - Enable building the CubeView demo w/o requiring '<config.h>'
  - Use a constant frame rate (25 fps) in test/cube demo
  - Add comment linking source code to related information in issue #1149
  - Improve timer statistics in test/cube demo
  - glpuzzle: fix timer and trackball max speed, make smoother animation at 72fps

  Technical Details and Build Procedure Improvements

  - Fix FL_EXPORT qualifiers
  - Fix compiler warnings
  - Remove unnecessary friend declaration
  - Restore building with configure --disable-print (#1147)
  - macOS: Improve procedure to construct best link command
  - Fix: Building with FLTK_BUILD_GL=0 fails on systems without opengl installed (#1151)
  - Don't link to libgtk when using package libdecor-0-dev
  - Update makesrcdist for releases on GitHub (1.4.1 and higher)
  - Update CHANGES.txt for release 1.4.1

Changes in FLTK 1.4.0                                   Released: Nov 17 2024

  Bug Fixes:

  - Windows: Fix "fullscreen_off does not correctly preserve window size" (#1116)
  - Fix rounding issues with Fl_RGB_Image::draw() + Fl_Copy_Surface (#1120, #1124)
  - Windows: Fix "Keyboard shortcut (alt+letter) does not work in input widget" (#1122)
  - macOS: Fix Alt-modifier handling in Fl_Shorcut_Button
  - Windows: Fix flicker/animation when transitioning from fullscreen to maximized
  - Wayland: protect against rounding errors in copy_region()

  Documentation and other Improvements:

  - Revert gtk+ specific "chevron style" arrow drawing (#1117)
  - Update CREDITS.txt
  - Improve 'test/fltk-versions' demo program


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/fltk/DESCR
cvs rdiff -u -r1.89 -r1.90 pkgsrc/x11/fltk/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/x11/fltk/PLIST
cvs rdiff -u -r1.28 -r1.29 pkgsrc/x11/fltk/buildlink3.mk
cvs rdiff -u -r1.29 -r1.30 pkgsrc/x11/fltk/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/fltk/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/fltk/patches/patch-FL_Fl__Cairo.H \
    pkgsrc/x11/fltk/patches/patch-cairo_Makefile \
    pkgsrc/x11/fltk/patches/patch-configure \
    pkgsrc/x11/fltk/patches/patch-documentation_Makefile \
    pkgsrc/x11/fltk/patches/patch-fltk-options_Makefile \
    pkgsrc/x11/fltk/patches/patch-fluid_Makefile \
    pkgsrc/x11/fltk/patches/patch-makeinclude.in \
    pkgsrc/x11/fltk/patches/patch-src_Makefile \
    pkgsrc/x11/fltk/patches/patch-test_Makefile
cvs rdiff -u -r1.8 -r0 pkgsrc/x11/fltk/patches/patch-aa \
    pkgsrc/x11/fltk/patches/patch-ae pkgsrc/x11/fltk/patches/patch-ag
cvs rdiff -u -r1.14 -r0 pkgsrc/x11/fltk/patches/patch-ab
cvs rdiff -u -r1.12 -r0 pkgsrc/x11/fltk/patches/patch-ac
cvs rdiff -u -r1.10 -r0 pkgsrc/x11/fltk/patches/patch-ad
cvs rdiff -u -r1.9 -r0 pkgsrc/x11/fltk/patches/patch-af
cvs rdiff -u -r1.7 -r0 pkgsrc/x11/fltk/patches/patch-ah
cvs rdiff -u -r1.1 -r0 pkgsrc/x11/fltk/patches/patch-fluid_Fl__Type.h \
    pkgsrc/x11/fltk/patches/patch-src_fl__draw.cxx

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/fltk/DESCR
diff -u pkgsrc/x11/fltk/DESCR:1.2 pkgsrc/x11/fltk/DESCR:1.3
--- pkgsrc/x11/fltk/DESCR:1.2   Mon Nov  5 15:24:12 2012
+++ pkgsrc/x11/fltk/DESCR       Fri Jan 31 12:22:44 2025
@@ -1,13 +1,17 @@
-FLTK (pronounced "fulltick") is a LGPL'd C++ graphical user interface
-toolkit for X (UNIX), OpenGL, and Win32.  FLTK was designed to be small and
-modular enough to be statically linked, but also works fine as a shared
-library.  FLTK also includes FLUID, an interactive user interface builder
-program.
+The Fast Light Tool Kit is a cross-platform C++ GUI toolkit for UNIX/Linux
+(X11 or Wayland), Microsoft Windows and macOS.
+FLTK provides modern GUI functionality without bloat and supports 3D graphics
+via OpenGL and its built-in GLUT emulation.
+FLTK also includes FLUID, an interactive user interface builder program.
 
-This is version 1.1.  From the FLTK website:
+From the FLTK website:
 
-  FLTK 1.1.x is the former stable development branch. It is no longer
-  being maintained, and any bug fixes will be applied against FLTK
-  1.3.x.
-
-  We recommend using the active FLTK 1.3.0 branch instead.
+  FLTK 1.4 is a big step forward, adding new widgets and support of Wayland
+  on Linux and FreeBSD systems.
+  Work on FLTK 1.4 began 2016 because it was necessary to break the FLTK 1.3
+  ABI in order to fix some long outstanding problems and to add new features.
+  Resetting the ABI also allowed the removal of 200+ areas of conditional
+  compilation involving ABI guards, greatly simplifying the code.
+  FLTK 1.4 boasts a completely new abstract device driver class hierarchy
+  to isolate platform specific code in one place instead of using #ifdef
+  everywhere, and to make it easier to port to new platforms.

Index: pkgsrc/x11/fltk/Makefile
diff -u pkgsrc/x11/fltk/Makefile:1.89 pkgsrc/x11/fltk/Makefile:1.90
--- pkgsrc/x11/fltk/Makefile:1.89       Thu Jun 10 23:49:55 2021
+++ pkgsrc/x11/fltk/Makefile    Fri Jan 31 12:22:44 2025
@@ -1,53 +1,46 @@
-# $NetBSD: Makefile,v 1.89 2021/06/10 23:49:55 gutteridge Exp $
+# $NetBSD: Makefile,v 1.90 2025/01/31 12:22:44 micha Exp $
 
-DISTNAME=      fltk-1.1.10-source
+DISTNAME=      fltk-1.4.1-source
 PKGNAME=       ${DISTNAME:S/-source//}
-VERS=          ${DISTNAME:S/fltk-//:S/-source//}
-PKGREVISION=   7
 CATEGORIES=    x11
-MASTER_SITES=  http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk/${VERS}/
-MASTER_SITES+= ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/${VERS}/
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=fltk/}
+GITHUB_PROJECT=        fltk
+GITHUB_RELEASE=        release-${PKGVERSION_NOREV}
 EXTRACT_SUFX=  .tar.bz2
 
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+MAINTAINER=    micha%NetBSD.org@localhost
 HOMEPAGE=      https://www.fltk.org/
-COMMENT=       Fast Light Tool Kit for graphical user interfaces (old 1.1 branch)
+COMMENT=       Fast Light Tool Kit for graphical user interfaces
+LICENSE=       gnu-lgpl-v2
 
-WRKSRC=                        ${WRKDIR}/${DISTNAME:S/-source//}
 USE_LANGUAGES=         c c++
+USE_CC_FEATURES+=      c99
+
+USE_TOOLS+=            autoconf gmake nroff pkg-config
 USE_LIBTOOL=           yes
-USE_TOOLS+=            gmake
-TEST_TARGET=           test
 
 PTHREAD_OPTS+=         require
 GNU_CONFIGURE=         yes
+GNU_CONFIGURE_STRICT=  no      # --enable-libtool is not officially known
 CONFIGURE_ARGS+=       --enable-libtool=${LIBTOOL:Q}
+CONFIGURE_ARGS+=       --enable-print
+CONFIGURE_ARGS+=       --enable-svg
 CONFIGURE_ARGS+=       --enable-threads
-CONFIGURE_ARGS+=       ac_cv_have_overlay=yes
-
-.include "../../mk/bsd.prefs.mk"
-
-PLIST_VARS+=           cs      # case-sensitive
-.if !exists(./descr) && ${OPSYS} != "Darwin"
-CONFIGURE_ARGS+=       --with-links
-PLIST.cs=              yes
-.endif
-
-# Fl_Text_Buffer.cxx: In function 'char chooseNullSubsChar(char*)':
-# Fl_Text_Buffer.cxx:1338:34: error: array subscript has type 'char' [-Werror=char-subscripts]
-#      if ( hist[ replacements[ i ] ] == 0 )
-#                                   ^
-# Maybe fix this later.
-BUILDLINK_TRANSFORM+=  rm:-Werror=char-subscripts
+# Use pkgsrc versions of libraries, not package's bundled versions
+CONFIGURE_ARGS+=       --disable-localjpeg
+CONFIGURE_ARGS+=       --disable-localpng
+CONFIGURE_ARGS+=       --disable-localzlib
+# Disable build of test programs
+CONFIGURE_ARGS+=       --disable-test
 
+WRKSRC=                        ${WRKDIR}/${DISTNAME:S/-source//}
 
-BUILDLINK_DEPMETHOD.libXt?=    build
+.include "options.mk"
 
-.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
+BUILDLINK_API_DEPENDS.zlib+=   zlib>=1.2.3
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/x11/fltk/PLIST
diff -u pkgsrc/x11/fltk/PLIST:1.16 pkgsrc/x11/fltk/PLIST:1.17
--- pkgsrc/x11/fltk/PLIST:1.16  Thu May 12 14:52:13 2011
+++ pkgsrc/x11/fltk/PLIST       Fri Jan 31 12:22:44 2025
@@ -1,426 +1,178 @@
-@comment $NetBSD: PLIST,v 1.16 2011/05/12 14:52:13 abs Exp $
+@comment $NetBSD: PLIST,v 1.17 2025/01/31 12:22:44 micha Exp $
 bin/fltk-config
+bin/fltk-options
 bin/fluid
 include/FL/Enumerations.H
-${PLIST.cs}include/FL/Enumerations.h
 include/FL/Fl.H
-${PLIST.cs}include/FL/Fl.h
 include/FL/Fl_Adjuster.H
-${PLIST.cs}include/FL/Fl_Adjuster.h
+include/FL/Fl_Anim_GIF_Image.H
 include/FL/Fl_BMP_Image.H
-${PLIST.cs}include/FL/Fl_BMP_Image.h
 include/FL/Fl_Bitmap.H
-${PLIST.cs}include/FL/Fl_Bitmap.h
 include/FL/Fl_Box.H
-${PLIST.cs}include/FL/Fl_Box.h
 include/FL/Fl_Browser.H
-${PLIST.cs}include/FL/Fl_Browser.h
 include/FL/Fl_Browser_.H
-${PLIST.cs}include/FL/Fl_Browser_.h
 include/FL/Fl_Button.H
-${PLIST.cs}include/FL/Fl_Button.h
+include/FL/Fl_Cairo.H
+include/FL/Fl_Cairo_Window.H
 include/FL/Fl_Chart.H
-${PLIST.cs}include/FL/Fl_Chart.h
 include/FL/Fl_Check_Browser.H
-${PLIST.cs}include/FL/Fl_Check_Browser.h
 include/FL/Fl_Check_Button.H
-${PLIST.cs}include/FL/Fl_Check_Button.h
 include/FL/Fl_Choice.H
-${PLIST.cs}include/FL/Fl_Choice.h
 include/FL/Fl_Clock.H
-${PLIST.cs}include/FL/Fl_Clock.h
 include/FL/Fl_Color_Chooser.H
-${PLIST.cs}include/FL/Fl_Color_Chooser.h
+include/FL/Fl_Copy_Surface.H
 include/FL/Fl_Counter.H
-${PLIST.cs}include/FL/Fl_Counter.h
+include/FL/Fl_Device.H
 include/FL/Fl_Dial.H
-${PLIST.cs}include/FL/Fl_Dial.h
 include/FL/Fl_Double_Window.H
-${PLIST.cs}include/FL/Fl_Double_Window.h
 include/FL/Fl_Export.H
-${PLIST.cs}include/FL/Fl_Export.h
 include/FL/Fl_File_Browser.H
-${PLIST.cs}include/FL/Fl_File_Browser.h
 include/FL/Fl_File_Chooser.H
-${PLIST.cs}include/FL/Fl_File_Chooser.h
 include/FL/Fl_File_Icon.H
-${PLIST.cs}include/FL/Fl_File_Icon.h
 include/FL/Fl_File_Input.H
-${PLIST.cs}include/FL/Fl_File_Input.h
 include/FL/Fl_Fill_Dial.H
-${PLIST.cs}include/FL/Fl_Fill_Dial.h
 include/FL/Fl_Fill_Slider.H
-${PLIST.cs}include/FL/Fl_Fill_Slider.h
+include/FL/Fl_Flex.H
 include/FL/Fl_Float_Input.H
-${PLIST.cs}include/FL/Fl_Float_Input.h
 include/FL/Fl_FormsBitmap.H
-${PLIST.cs}include/FL/Fl_FormsBitmap.h
 include/FL/Fl_FormsPixmap.H
-${PLIST.cs}include/FL/Fl_FormsPixmap.h
 include/FL/Fl_Free.H
-${PLIST.cs}include/FL/Fl_Free.h
 include/FL/Fl_GIF_Image.H
-${PLIST.cs}include/FL/Fl_GIF_Image.h
 include/FL/Fl_Gl_Window.H
-${PLIST.cs}include/FL/Fl_Gl_Window.h
+include/FL/Fl_Graphics_Driver.H
+include/FL/Fl_Grid.H
 include/FL/Fl_Group.H
-${PLIST.cs}include/FL/Fl_Group.h
 include/FL/Fl_Help_Dialog.H
-${PLIST.cs}include/FL/Fl_Help_Dialog.h
 include/FL/Fl_Help_View.H
-${PLIST.cs}include/FL/Fl_Help_View.h
 include/FL/Fl_Hold_Browser.H
-${PLIST.cs}include/FL/Fl_Hold_Browser.h
 include/FL/Fl_Hor_Fill_Slider.H
-${PLIST.cs}include/FL/Fl_Hor_Fill_Slider.h
 include/FL/Fl_Hor_Nice_Slider.H
-${PLIST.cs}include/FL/Fl_Hor_Nice_Slider.h
 include/FL/Fl_Hor_Slider.H
-${PLIST.cs}include/FL/Fl_Hor_Slider.h
 include/FL/Fl_Hor_Value_Slider.H
-${PLIST.cs}include/FL/Fl_Hor_Value_Slider.h
+include/FL/Fl_ICO_Image.H
 include/FL/Fl_Image.H
-${PLIST.cs}include/FL/Fl_Image.h
+include/FL/Fl_Image_Surface.H
 include/FL/Fl_Input.H
-${PLIST.cs}include/FL/Fl_Input.h
 include/FL/Fl_Input_.H
-${PLIST.cs}include/FL/Fl_Input_.h
 include/FL/Fl_Input_Choice.H
-${PLIST.cs}include/FL/Fl_Input_Choice.h
 include/FL/Fl_Int_Input.H
-${PLIST.cs}include/FL/Fl_Int_Input.h
 include/FL/Fl_JPEG_Image.H
-${PLIST.cs}include/FL/Fl_JPEG_Image.h
 include/FL/Fl_Light_Button.H
-${PLIST.cs}include/FL/Fl_Light_Button.h
 include/FL/Fl_Line_Dial.H
-${PLIST.cs}include/FL/Fl_Line_Dial.h
 include/FL/Fl_Menu.H
-${PLIST.cs}include/FL/Fl_Menu.h
 include/FL/Fl_Menu_.H
-${PLIST.cs}include/FL/Fl_Menu_.h
 include/FL/Fl_Menu_Bar.H
-${PLIST.cs}include/FL/Fl_Menu_Bar.h
 include/FL/Fl_Menu_Button.H
-${PLIST.cs}include/FL/Fl_Menu_Button.h
 include/FL/Fl_Menu_Item.H
-${PLIST.cs}include/FL/Fl_Menu_Item.h
 include/FL/Fl_Menu_Window.H
-${PLIST.cs}include/FL/Fl_Menu_Window.h
 include/FL/Fl_Multi_Browser.H
-${PLIST.cs}include/FL/Fl_Multi_Browser.h
 include/FL/Fl_Multi_Label.H
-${PLIST.cs}include/FL/Fl_Multi_Label.h
 include/FL/Fl_Multiline_Input.H
-${PLIST.cs}include/FL/Fl_Multiline_Input.h
 include/FL/Fl_Multiline_Output.H
-${PLIST.cs}include/FL/Fl_Multiline_Output.h
+include/FL/Fl_Native_File_Chooser.H
 include/FL/Fl_Nice_Slider.H
-${PLIST.cs}include/FL/Fl_Nice_Slider.h
 include/FL/Fl_Object.H
-${PLIST.cs}include/FL/Fl_Object.h
 include/FL/Fl_Output.H
-${PLIST.cs}include/FL/Fl_Output.h
 include/FL/Fl_Overlay_Window.H
-${PLIST.cs}include/FL/Fl_Overlay_Window.h
+include/FL/Fl_PDF_File_Surface.H
 include/FL/Fl_PNG_Image.H
-${PLIST.cs}include/FL/Fl_PNG_Image.h
 include/FL/Fl_PNM_Image.H
-${PLIST.cs}include/FL/Fl_PNM_Image.h
 include/FL/Fl_Pack.H
-${PLIST.cs}include/FL/Fl_Pack.h
+include/FL/Fl_Paged_Device.H
 include/FL/Fl_Pixmap.H
-${PLIST.cs}include/FL/Fl_Pixmap.h
+include/FL/Fl_Plugin.H
 include/FL/Fl_Positioner.H
-${PLIST.cs}include/FL/Fl_Positioner.h
+include/FL/Fl_PostScript.H
 include/FL/Fl_Preferences.H
-${PLIST.cs}include/FL/Fl_Preferences.h
+include/FL/Fl_Printer.H
 include/FL/Fl_Progress.H
-${PLIST.cs}include/FL/Fl_Progress.h
 include/FL/Fl_RGB_Image.H
-${PLIST.cs}include/FL/Fl_RGB_Image.h
 include/FL/Fl_Radio_Button.H
-${PLIST.cs}include/FL/Fl_Radio_Button.h
 include/FL/Fl_Radio_Light_Button.H
-${PLIST.cs}include/FL/Fl_Radio_Light_Button.h
 include/FL/Fl_Radio_Round_Button.H
-${PLIST.cs}include/FL/Fl_Radio_Round_Button.h
+include/FL/Fl_Rect.H
 include/FL/Fl_Repeat_Button.H
-${PLIST.cs}include/FL/Fl_Repeat_Button.h
 include/FL/Fl_Return_Button.H
-${PLIST.cs}include/FL/Fl_Return_Button.h
 include/FL/Fl_Roller.H
-${PLIST.cs}include/FL/Fl_Roller.h
 include/FL/Fl_Round_Button.H
-${PLIST.cs}include/FL/Fl_Round_Button.h
 include/FL/Fl_Round_Clock.H
-${PLIST.cs}include/FL/Fl_Round_Clock.h
+include/FL/Fl_SVG_File_Surface.H
+include/FL/Fl_SVG_Image.H
+include/FL/Fl_Scheme.H
+include/FL/Fl_Scheme_Choice.H
 include/FL/Fl_Scroll.H
-${PLIST.cs}include/FL/Fl_Scroll.h
 include/FL/Fl_Scrollbar.H
-${PLIST.cs}include/FL/Fl_Scrollbar.h
 include/FL/Fl_Secret_Input.H
-${PLIST.cs}include/FL/Fl_Secret_Input.h
 include/FL/Fl_Select_Browser.H
-${PLIST.cs}include/FL/Fl_Select_Browser.h
 include/FL/Fl_Shared_Image.H
-${PLIST.cs}include/FL/Fl_Shared_Image.h
+include/FL/Fl_Shortcut_Button.H
 include/FL/Fl_Simple_Counter.H
-${PLIST.cs}include/FL/Fl_Simple_Counter.h
 include/FL/Fl_Single_Window.H
-${PLIST.cs}include/FL/Fl_Single_Window.h
 include/FL/Fl_Slider.H
-${PLIST.cs}include/FL/Fl_Slider.h
 include/FL/Fl_Spinner.H
-${PLIST.cs}include/FL/Fl_Spinner.h
 include/FL/Fl_Sys_Menu_Bar.H
-${PLIST.cs}include/FL/Fl_Sys_Menu_Bar.h
+include/FL/Fl_Table.H
+include/FL/Fl_Table_Row.H
 include/FL/Fl_Tabs.H
-${PLIST.cs}include/FL/Fl_Tabs.h
+include/FL/Fl_Terminal.H
 include/FL/Fl_Text_Buffer.H
-${PLIST.cs}include/FL/Fl_Text_Buffer.h
 include/FL/Fl_Text_Display.H
-${PLIST.cs}include/FL/Fl_Text_Display.h
 include/FL/Fl_Text_Editor.H
-${PLIST.cs}include/FL/Fl_Text_Editor.h
 include/FL/Fl_Tile.H
-${PLIST.cs}include/FL/Fl_Tile.h
 include/FL/Fl_Tiled_Image.H
-${PLIST.cs}include/FL/Fl_Tiled_Image.h
 include/FL/Fl_Timer.H
-${PLIST.cs}include/FL/Fl_Timer.h
 include/FL/Fl_Toggle_Button.H
-${PLIST.cs}include/FL/Fl_Toggle_Button.h
 include/FL/Fl_Toggle_Light_Button.H
-${PLIST.cs}include/FL/Fl_Toggle_Light_Button.h
 include/FL/Fl_Toggle_Round_Button.H
-${PLIST.cs}include/FL/Fl_Toggle_Round_Button.h
 include/FL/Fl_Tooltip.H
-${PLIST.cs}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
-${PLIST.cs}include/FL/Fl_Valuator.h
 include/FL/Fl_Value_Input.H
-${PLIST.cs}include/FL/Fl_Value_Input.h
 include/FL/Fl_Value_Output.H
-${PLIST.cs}include/FL/Fl_Value_Output.h
 include/FL/Fl_Value_Slider.H
-${PLIST.cs}include/FL/Fl_Value_Slider.h
 include/FL/Fl_Widget.H
-${PLIST.cs}include/FL/Fl_Widget.h
+include/FL/Fl_Widget_Surface.H
 include/FL/Fl_Window.H
-${PLIST.cs}include/FL/Fl_Window.h
 include/FL/Fl_Wizard.H
-${PLIST.cs}include/FL/Fl_Wizard.h
 include/FL/Fl_XBM_Image.H
-${PLIST.cs}include/FL/Fl_XBM_Image.h
 include/FL/Fl_XPM_Image.H
-${PLIST.cs}include/FL/Fl_XPM_Image.h
-include/FL/dirent.h
 include/FL/filename.H
-${PLIST.cs}include/FL/filename.h
 include/FL/fl_ask.H
-${PLIST.cs}include/FL/fl_ask.h
+include/FL/fl_attr.h
+include/FL/fl_callback_macros.H
+include/FL/fl_casts.H
+include/FL/fl_config.h
 include/FL/fl_draw.H
-${PLIST.cs}include/FL/fl_draw.h
-${PLIST.cs}include/FL/fl_file_chooser.H
-${PLIST.cs}include/FL/fl_file_chooser.h
 include/FL/fl_message.H
-${PLIST.cs}include/FL/fl_message.h
 include/FL/fl_show_colormap.H
-${PLIST.cs}include/FL/fl_show_colormap.h
 include/FL/fl_show_input.H
-${PLIST.cs}include/FL/fl_show_input.h
+include/FL/fl_string_functions.h
+include/FL/fl_types.h
+include/FL/fl_utf8.h
 include/FL/forms.H
-${PLIST.cs}include/FL/forms.h
 include/FL/gl.h
 include/FL/gl2opengl.h
 include/FL/gl_draw.H
-${PLIST.cs}include/FL/gl_draw.h
 include/FL/glu.h
 include/FL/glut.H
-${PLIST.cs}include/FL/glut.h
 include/FL/mac.H
-${PLIST.cs}include/FL/mac.h
-include/FL/mac.r
 include/FL/math.h
 include/FL/names.h
+include/FL/platform.H
+include/FL/platform_types.h
+include/FL/wayland.H
 include/FL/win32.H
-${PLIST.cs}include/FL/win32.h
 include/FL/x.H
-${PLIST.cs}include/FL/x.h
-${PLIST.cs}include/Fl
+include/FL/x11.H
 lib/libfltk.la
+${PLIST.cairo}lib/libfltk_cairo.la
 lib/libfltk_forms.la
-lib/libfltk_gl.la
+${PLIST.opengl}lib/libfltk_gl.la
 lib/libfltk_images.la
 man/man1/fltk-config.1
+man/man1/fltk-options.1
 man/man1/fluid.1
 man/man3/fltk.3
-share/doc/fltk/FL.gif
-share/doc/fltk/Fl.html
-share/doc/fltk/Fl_Adjuster.html
-share/doc/fltk/Fl_BMP_Image.html
-share/doc/fltk/Fl_Bitmap.html
-share/doc/fltk/Fl_Box.html
-share/doc/fltk/Fl_Browser.html
-share/doc/fltk/Fl_Browser_.html
-share/doc/fltk/Fl_Button.html
-share/doc/fltk/Fl_Chart.html
-share/doc/fltk/Fl_Check_Browser.html
-share/doc/fltk/Fl_Check_Button.gif
-share/doc/fltk/Fl_Check_Button.html
-share/doc/fltk/Fl_Choice.html
-share/doc/fltk/Fl_Clock.html
-share/doc/fltk/Fl_Clock_Output.html
-share/doc/fltk/Fl_Color_Chooser.html
-share/doc/fltk/Fl_Counter.html
-share/doc/fltk/Fl_Dial.html
-share/doc/fltk/Fl_Double_Window.html
-share/doc/fltk/Fl_End.html
-share/doc/fltk/Fl_File_Browser.html
-share/doc/fltk/Fl_File_Chooser.html
-share/doc/fltk/Fl_File_Chooser.jpg
-share/doc/fltk/Fl_File_Icon.html
-share/doc/fltk/Fl_File_Input.gif
-share/doc/fltk/Fl_File_Input.html
-share/doc/fltk/Fl_Float_Input.html
-share/doc/fltk/Fl_Free.html
-share/doc/fltk/Fl_GIF_Image.html
-share/doc/fltk/Fl_Gl_Window.html
-share/doc/fltk/Fl_Group.html
-share/doc/fltk/Fl_Help_Dialog.gif
-share/doc/fltk/Fl_Help_Dialog.html
-share/doc/fltk/Fl_Help_View.html
-share/doc/fltk/Fl_Hold_Browser.html
-share/doc/fltk/Fl_Image.html
-share/doc/fltk/Fl_Input.html
-share/doc/fltk/Fl_Input_.html
-share/doc/fltk/Fl_Input_Choice.html
-share/doc/fltk/Fl_Int_Input.html
-share/doc/fltk/Fl_JPEG_Image.html
-share/doc/fltk/Fl_Light_Button.gif
-share/doc/fltk/Fl_Light_Button.html
-share/doc/fltk/Fl_Menu_.html
-share/doc/fltk/Fl_Menu_Bar.html
-share/doc/fltk/Fl_Menu_Button.html
-share/doc/fltk/Fl_Menu_Item.html
-share/doc/fltk/Fl_Menu_Window.html
-share/doc/fltk/Fl_Multi_Browser.html
-share/doc/fltk/Fl_Multiline_Input.html
-share/doc/fltk/Fl_Multiline_Output.html
-share/doc/fltk/Fl_Output.html
-share/doc/fltk/Fl_Overlay_Window.html
-share/doc/fltk/Fl_PNG_Image.html
-share/doc/fltk/Fl_PNM_Image.html
-share/doc/fltk/Fl_Pack.html
-share/doc/fltk/Fl_Pixmap.html
-share/doc/fltk/Fl_Positioner.html
-share/doc/fltk/Fl_Preferences.html
-share/doc/fltk/Fl_Progress.html
-share/doc/fltk/Fl_RGB_Image.html
-share/doc/fltk/Fl_Repeat_Button.html
-share/doc/fltk/Fl_Return_Button.gif
-share/doc/fltk/Fl_Return_Button.html
-share/doc/fltk/Fl_Roller.gif
-share/doc/fltk/Fl_Roller.html
-share/doc/fltk/Fl_Round_Button.gif
-share/doc/fltk/Fl_Round_Button.html
-share/doc/fltk/Fl_Scroll.gif
-share/doc/fltk/Fl_Scroll.html
-share/doc/fltk/Fl_Scrollbar.html
-share/doc/fltk/Fl_Secret_Input.html
-share/doc/fltk/Fl_Select_Browser.html
-share/doc/fltk/Fl_Shared_Image.html
-share/doc/fltk/Fl_Single_Window.html
-share/doc/fltk/Fl_Slider.html
-share/doc/fltk/Fl_Spinner.html
-share/doc/fltk/Fl_Tabs.html
-share/doc/fltk/Fl_Text_Buffer.html
-share/doc/fltk/Fl_Text_Display.html
-share/doc/fltk/Fl_Text_Editor.html
-share/doc/fltk/Fl_Tile.gif
-share/doc/fltk/Fl_Tile.html
-share/doc/fltk/Fl_Tiled_Image.html
-share/doc/fltk/Fl_Timer.html
-share/doc/fltk/Fl_Toggle_Button.html
-share/doc/fltk/Fl_Tooltip.html
-share/doc/fltk/Fl_Valuator.html
-share/doc/fltk/Fl_Value_Input.gif
-share/doc/fltk/Fl_Value_Input.html
-share/doc/fltk/Fl_Value_Output.gif
-share/doc/fltk/Fl_Value_Output.html
-share/doc/fltk/Fl_Value_Slider.html
-share/doc/fltk/Fl_Widget.html
-share/doc/fltk/Fl_Window.html
-share/doc/fltk/Fl_Wizard.html
-share/doc/fltk/Fl_XBM_Image.html
-share/doc/fltk/Fl_XPM_Image.html
-share/doc/fltk/adjuster1.gif
-share/doc/fltk/advanced.html
-share/doc/fltk/basics.html
-share/doc/fltk/boxtypes.gif
-share/doc/fltk/buttons.gif
-share/doc/fltk/charts.gif
-share/doc/fltk/choice.gif
-share/doc/fltk/clock.gif
-share/doc/fltk/common.html
-share/doc/fltk/counter.gif
-share/doc/fltk/cubeview.gif
-share/doc/fltk/dial.gif
-share/doc/fltk/drawing.html
-share/doc/fltk/editor-replace.gif
-share/doc/fltk/editor.gif
-share/doc/fltk/editor.html
-share/doc/fltk/enumerations.html
-share/doc/fltk/events.html
-share/doc/fltk/examples.html
-share/doc/fltk/fl_alert.gif
-share/doc/fltk/fl_ask.gif
-share/doc/fltk/fl_choice.gif
-share/doc/fltk/fl_color_chooser.jpg
-share/doc/fltk/fl_input.gif
-share/doc/fltk/fl_message.gif
-share/doc/fltk/fl_password.gif
-share/doc/fltk/fl_show_colormap.gif
-share/doc/fltk/fluid-catgets.gif
-share/doc/fltk/fluid-gettext.gif
-share/doc/fltk/fluid-org.gif
-share/doc/fltk/fluid.html
-share/doc/fltk/fluid1.gif
-share/doc/fltk/fluid2.gif
-share/doc/fltk/fluid3-cxx.gif
-share/doc/fltk/fluid3-gui.gif
-share/doc/fltk/fluid3-style.gif
-share/doc/fltk/fluid4.gif
-share/doc/fltk/fluid_prefs.gif
-share/doc/fltk/fluid_widget_cxx.gif
-share/doc/fltk/fluid_widget_gui.gif
-share/doc/fltk/fluid_widget_style.gif
-share/doc/fltk/forms.html
-share/doc/fltk/functions.html
-share/doc/fltk/glut.html
-share/doc/fltk/hello.C.gif
-share/doc/fltk/index.html
-share/doc/fltk/input_choice.jpg
-share/doc/fltk/intro.html
-share/doc/fltk/license.html
-share/doc/fltk/menu.gif
-share/doc/fltk/menu_button.gif
-share/doc/fltk/menubar.gif
-share/doc/fltk/migration.html
-share/doc/fltk/opengl.html
-share/doc/fltk/osissues.html
-share/doc/fltk/positioner.gif
-share/doc/fltk/preface.html
-share/doc/fltk/resizebox1.gif
-share/doc/fltk/resizebox2.gif
-share/doc/fltk/round_clock.gif
-share/doc/fltk/scrollbar.gif
-share/doc/fltk/slider.gif
-share/doc/fltk/subclassing.html
-share/doc/fltk/symbols.gif
-share/doc/fltk/tabs.gif
-share/doc/fltk/text.gif
-share/doc/fltk/valuators.gif
-share/doc/fltk/value_slider.gif
-share/doc/fltk/widgets.html

Index: pkgsrc/x11/fltk/buildlink3.mk
diff -u pkgsrc/x11/fltk/buildlink3.mk:1.28 pkgsrc/x11/fltk/buildlink3.mk:1.29
--- pkgsrc/x11/fltk/buildlink3.mk:1.28  Thu Jan  7 09:08:08 2016
+++ pkgsrc/x11/fltk/buildlink3.mk       Fri Jan 31 12:22:44 2025
@@ -1,21 +1,90 @@
-# $NetBSD: buildlink3.mk,v 1.28 2016/01/07 09:08:08 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.29 2025/01/31 12:22:44 micha Exp $
 
 BUILDLINK_TREE+=       fltk
 
 .if !defined(FLTK_BUILDLINK3_MK)
 FLTK_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.fltk+=   fltk>=1.1.5rc1<1.3
-BUILDLINK_ABI_DEPENDS.fltk?=   fltk>=1.1.10nb7<1.3
+BUILDLINK_API_DEPENDS.fltk+=   fltk>=1.4.1<1.5.0
 BUILDLINK_PKGSRCDIR.fltk?=     ../../x11/fltk
 BUILDLINK_FILES.fltk+=         include/Fl/*
 
-.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
+.include "../../mk/bsd.fast.prefs.mk"
+
+pkgbase := fltk
+.include "../../mk/pkg-build-options.mk"
+
+# For "cairo" option
+.if ${PKG_BUILD_OPTIONS.fltk:Mcairo}
+.  include "../../graphics/cairo/buildlink3.mk"
+.endif
+
+# For "opengl" option
+.if ${PKG_BUILD_OPTIONS.fltk:Mopengl}
+.  if ${PKG_BUILD_OPTIONS.fltk:Mx11}
+.    include "../../graphics/MesaLib/buildlink3.mk"
+.    include "../../graphics/glu/buildlink3.mk"
+.  endif
+.endif
+
+# For "pango" option
+.if ${PKG_BUILD_OPTIONS.fltk:Mpango}
+.  if ${PKG_BUILD_OPTIONS.fltk:Mx11}
+.    include "../../devel/pango/buildlink3.mk"
+.  endif
+.endif
+
+# For "wayland" option
+.if ${PKG_BUILD_OPTIONS.fltk:Mwayland}
+.  include "../../devel/wayland/buildlink3.mk"
+.endif
+
+# For "x11" option
+.if ${PKG_BUILD_OPTIONS.fltk:Mx11}
+.  include "../../x11/libX11/buildlink3.mk"
+.endif
+
+# For "xcursor" option
+.if ${PKG_BUILD_OPTIONS.fltk:Mxcursor}
+.  if ${PKG_BUILD_OPTIONS.fltk:Mx11}
+.    include "../../x11/libXcursor/buildlink3.mk"
+.  endif
+.endif
+
+# For "xfixes" option
+.if ${PKG_BUILD_OPTIONS.fltk:Mxfixes}
+.  if ${PKG_BUILD_OPTIONS.fltk:Mx11}
+.    include "../../x11/libXfixes/buildlink3.mk"
+.  endif
+.endif
+
+# For "xft2" option
+.if ${PKG_BUILD_OPTIONS.fltk:Mxft2}
+.  if ${PKG_BUILD_OPTIONS.fltk:Mx11}
+.    include "../../x11/libXft/buildlink3.mk"
+.  endif
+.endif
+
+# For "xinerama" option
+.if ${PKG_BUILD_OPTIONS.fltk:Mxinerama}
+.  if ${PKG_BUILD_OPTIONS.fltk:Mx11}
+.    include "../../x11/libXinerama/buildlink3.mk"
+.  endif
+.endif
+
+# For "xrender" option
+.if ${PKG_BUILD_OPTIONS.fltk:Mxrender}
+.  if ${PKG_BUILD_OPTIONS.fltk:Mx11}
+.    include "../../x11/libXrender/buildlink3.mk"
+.  endif
+.endif
+
+BUILDLINK_API_DEPENDS.zlib+=   zlib>=1.2.3
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
+
 .endif # FLTK_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -fltk

Index: pkgsrc/x11/fltk/distinfo
diff -u pkgsrc/x11/fltk/distinfo:1.29 pkgsrc/x11/fltk/distinfo:1.30
--- pkgsrc/x11/fltk/distinfo:1.29       Wed Jul 27 18:42:42 2022
+++ pkgsrc/x11/fltk/distinfo    Fri Jan 31 12:22:44 2025
@@ -1,15 +1,14 @@
-$NetBSD: distinfo,v 1.29 2022/07/27 18:42:42 wiz Exp $
+$NetBSD: distinfo,v 1.30 2025/01/31 12:22:44 micha Exp $
 
-BLAKE2s (fltk-1.1.10-source.tar.bz2) = 64883d2b8ad915a4922bbc3d3c799f5efbd751c77ff9ac3b8fd49d235578f301
-SHA512 (fltk-1.1.10-source.tar.bz2) = 5bdece6855f190e56ea57a54ebe38172f177e9a4ac40d834f7a646a1d419bf92cfda46a30a1434a952c81a2ad14a22a7a02961c8a24d0cfc352f4d80dc3319a6
-Size (fltk-1.1.10-source.tar.bz2) = 2214382 bytes
-SHA1 (patch-aa) = 661dcac75cf50c791c2edcc14ec93e9ee83b062a
-SHA1 (patch-ab) = 6c7b22664d0cc474ec3c26a1afa9150e535061a4
-SHA1 (patch-ac) = 6aa8efbb4bf9d9e49662d30ec02f02725220dfd8
-SHA1 (patch-ad) = b04051b14eb0bc74e8ccfe762e367ab8ccb11b80
-SHA1 (patch-ae) = de29d1be1219c3b17707216a7c54c25a9adb746c
-SHA1 (patch-af) = 791ba33cfc85e41e0f2b75ce0d1b0d6a378d9d0b
-SHA1 (patch-ag) = aaeb376acf79b695e8376e7610534d125dff6a86
-SHA1 (patch-ah) = 876f79b4d0523035307ecc7d76460cad44b40704
-SHA1 (patch-fluid_Fl__Type.h) = b2ea0bebf152ab0755135fbe8cc6179d2f6d79e1
-SHA1 (patch-src_fl__draw.cxx) = 824ee95fe997ed553b88801569b35f3698d11898
+BLAKE2s (fltk-1.4.1-source.tar.bz2) = a6bd639364903fa157331cc00b1d8d1b91e64e3c64b2ddb64a5a27747cb104e8
+SHA512 (fltk-1.4.1-source.tar.bz2) = 90b223f66e3a8eb23225a259cddfeb90f1f8744ff6a366f274923c1c34d251e028835755d1738efb53398ac7e45e362a71542978faef04fc3d84a87f7b722037
+Size (fltk-1.4.1-source.tar.bz2) = 8456879 bytes
+SHA1 (patch-FL_Fl__Cairo.H) = 8d6b8779040c466881502d82245789f69b6a019d
+SHA1 (patch-cairo_Makefile) = 578c24fac83e61f68c934159f28f5abd05896d27
+SHA1 (patch-configure) = 1beca8af8341f344623f04b9d89cac53119cf1ef
+SHA1 (patch-documentation_Makefile) = a7edaea63d7c4ef8b740281eaf65e6cb491487f9
+SHA1 (patch-fltk-options_Makefile) = ebfc6c34bb58304dd5ef8e35dbfb48c9e2d1b958
+SHA1 (patch-fluid_Makefile) = 7f12a68012ad77330af914aa6fbb8de61131c5cd
+SHA1 (patch-makeinclude.in) = 5a7213151af33b6f14c735aeebf416064e2c8dc6
+SHA1 (patch-src_Makefile) = b3ba47afcb87d31fc765ffa219bec75f1717f8cf
+SHA1 (patch-test_Makefile) = 18be155add5a8d50e9a64477c0088c190326f0cd

Added files:

Index: pkgsrc/x11/fltk/options.mk
diff -u /dev/null pkgsrc/x11/fltk/options.mk:1.1
--- /dev/null   Fri Jan 31 12:22:45 2025
+++ pkgsrc/x11/fltk/options.mk  Fri Jan 31 12:22:44 2025
@@ -0,0 +1,134 @@
+# $NetBSD: options.mk,v 1.1 2025/01/31 12:22:44 micha Exp $
+
+.include "../../mk/bsd.prefs.mk"
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.fltk
+PKG_SUPPORTED_OPTIONS= cairo opengl pango x11 xcursor xfixes xft2 xinerama xrender
+PKG_SUPPORTED_OPTIONS+=        wayland  # untested
+# FLTK has native backends for macOS and Windows (Cygwin)
+# Enabling the "x11" option forces X11 backend on such systems.
+# Most users want the native backends.
+.if ${OPSYS} == "Darwin" || ${OPSYS} == "Cygwin"
+PKG_SUGGESTED_OPTIONS= opengl
+.else
+PKG_SUGGESTED_OPTIONS= cairo opengl pango x11 xcursor xfixes xft2 xinerama xrender
+.endif
+PLIST_VARS+=           cairo opengl
+
+.include "../../mk/bsd.options.mk"
+
+# "cairo" option: Use cairo 2D graphics library
+# Required for Fl_Cairo_Window.
+.if !empty(PKG_OPTIONS:Mcairo)
+.  include "../../graphics/cairo/buildlink3.mk"
+CONFIGURE_ARGS+=       --enable-cairo
+PLIST.cairo=           yes
+.else
+CONFIGURE_ARGS+=       --disable-cairo
+.endif
+
+# "opengl" option: Enable support for OpenGL based rendering
+# Disabling this option removes expensive dependencies for X11 backend.
+# Attention: Some packages that use FLTK need this option (disable with care)
+.if !empty(PKG_OPTIONS:Mopengl)
+.  if !empty(PKG_OPTIONS:Mx11)
+.    include "../../graphics/MesaLib/buildlink3.mk"
+.    include "../../graphics/glu/buildlink3.mk"
+.  endif
+CONFIGURE_ARGS+=       --enable-gl
+PLIST.opengl=          yes
+.else
+CONFIGURE_ARGS+=       --disable-gl
+.endif
+
+# "pango" option [X11 backend]: Use Pango for client side font rendering
+# This option enables glyph substitution (mixing of multiple fonts).
+# Most users want that, but it adds additional dependencies compared to
+# FLTK 1.3 (disable this option to get the former behaviour).
+# Attention: This option requires the "xft2" option to be enabled too.
+.if !empty(PKG_OPTIONS:Mpango)
+.  if empty(PKG_OPTIONS:Mxft2)
+PKG_FAIL_REASON+=      "pango option requires xft2 option."
+.  endif
+.  if !empty(PKG_OPTIONS:Mx11)
+.    include "../../devel/pango/buildlink3.mk"
+.  endif
+CONFIGURE_ARGS+=       --enable-pango
+.else
+CONFIGURE_ARGS+=       --disable-pango
+.endif
+
+# "wayland" option: Use wayland backend
+.if !empty(PKG_OPTIONS:Mwayland)
+.  include "../../devel/wayland/buildlink3.mk"
+CONFIGURE_ARGS+=       --enable-wayland
+.else
+CONFIGURE_ARGS+=       --disable-wayland
+.endif
+
+# "x11" option [X11 backend]: Use X11 backend
+# For some systems there are native backends available, do not use them.
+# Attention: Forcing X11 backend requires X Window system to be installed.
+.if !empty(PKG_OPTIONS:Mx11)
+.  include "../../x11/libX11/buildlink3.mk"
+CONFIGURE_ARGS+=       --enable-x11
+.else
+CONFIGURE_ARGS+=       --disable-x11
+.endif
+
+# "xcursor" option [X11 backend]: Use X cursor management library
+.if !empty(PKG_OPTIONS:Mxcursor)
+.  if !empty(PKG_OPTIONS:Mx11)
+.    include "../../x11/libXcursor/buildlink3.mk"
+.  endif
+CONFIGURE_ARGS+=       --enable-xcursor
+.else
+CONFIGURE_ARGS+=       --disable-xcursor
+.endif
+
+# "xfixes" option [X11 backend]: Use X11 XFIXES extension
+.if !empty(PKG_OPTIONS:Mxfixes)
+.  if !empty(PKG_OPTIONS:Mx11)
+.    include "../../x11/libXfixes/buildlink3.mk"
+.  endif
+CONFIGURE_ARGS+=       --enable-xfixes
+.else
+CONFIGURE_ARGS+=       --disable-xfixes
+.endif
+
+# "xft2" option [X11 backend]: Use X FreeType interface library
+# Enables client side font rendering. Most users want that, because it works
+# better with Unicode.
+# Disabling this option uses the original core X11 font system and removes all
+# font related dependencies (the X server is used for font rendering and client
+# programs become extremely lightweight).
+# Attention: X servers may be misconfigured for core fonts (disable with care).
+.if !empty(PKG_OPTIONS:Mxft2)
+.  if !empty(PKG_OPTIONS:Mx11)
+.    include "../../x11/libXft/buildlink3.mk"
+.  endif
+CONFIGURE_ARGS+=       --enable-xft
+.else
+CONFIGURE_ARGS+=       --disable-xft
+.endif
+
+# "xinerama" option [X11 backend]: Use X11 XINERAMA extension
+# Enables support for two or more physical displays.
+.if !empty(PKG_OPTIONS:Mxinerama)
+.  if !empty(PKG_OPTIONS:Mx11)
+.    include "../../x11/libXinerama/buildlink3.mk"
+.  endif
+CONFIGURE_ARGS+=       --enable-xinerama
+.else
+CONFIGURE_ARGS+=       --disable-xinerama
+.endif
+
+# "xrender" option [X11 backend]: Use X11 RENDER extension
+.if !empty(PKG_OPTIONS:Mxrender)
+.  if !empty(PKG_OPTIONS:Mx11)
+.    include "../../x11/libXrender/buildlink3.mk"
+.  endif
+CONFIGURE_ARGS+=       --enable-xrender
+.else
+CONFIGURE_ARGS+=       --disable-xrender
+.endif

Index: pkgsrc/x11/fltk/patches/patch-FL_Fl__Cairo.H
diff -u /dev/null pkgsrc/x11/fltk/patches/patch-FL_Fl__Cairo.H:1.1
--- /dev/null   Fri Jan 31 12:22:45 2025
+++ pkgsrc/x11/fltk/patches/patch-FL_Fl__Cairo.H        Fri Jan 31 12:22:44 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-FL_Fl__Cairo.H,v 1.1 2025/01/31 12:22:44 micha Exp $
+
+Include header "cairo.h" from subdirectory "cairo".
+The rest of the sourcecode already do this.
+
+--- FL/Fl_Cairo.H.orig 2024-12-12 17:45:50.000000000 +0000
++++ FL/Fl_Cairo.H
+@@ -37,7 +37,7 @@
+ 
+ # ifdef FLTK_HAVE_CAIRO
+ 
+-# include <cairo.h>
++# include <cairo/cairo.h>
+ 
+ /**
+   \addtogroup group_cairo
Index: pkgsrc/x11/fltk/patches/patch-cairo_Makefile
diff -u /dev/null pkgsrc/x11/fltk/patches/patch-cairo_Makefile:1.1
--- /dev/null   Fri Jan 31 12:22:45 2025
+++ pkgsrc/x11/fltk/patches/patch-cairo_Makefile        Fri Jan 31 12:22:44 2025
@@ -0,0 +1,28 @@
+$NetBSD: patch-cairo_Makefile,v 1.1 2025/01/31 12:22:44 micha Exp $
+
+Use libtool.
+Upstream will not merge this (libtool is listed as not acceptable).
+
+--- cairo/Makefile.orig        2024-12-12 17:45:50.000000000 +0000
++++ cairo/Makefile
+@@ -48,6 +48,10 @@ $(CAIROLIBNAME): $(CAIROOBJECTS)
+       $(LIBCOMMAND) $@ $(CAIROOBJECTS)
+       $(RANLIB) $@
+ 
++libfltk_cairo.la: $(CAIROOBJECTS) ../src/libfltk.la
++      echo $(DSOCOMMAND) $@ ...
++      ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(CAIROOBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 2:0:0 -L../src -lfltk $(CAIROLIBS) $(LDLIBS)
++
+ libfltk_cairo.so.$(FL_DSO_VERSION): $(CAIROOBJECTS) ../src/libfltk.so.$(FL_DSO_VERSION)
+       echo $(DSOCOMMAND) $@ ...
+       $(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk $(CAIROLIBS)
+@@ -109,6 +113,9 @@ install: $(CAIROLIBNAME) $(CAIRODSONAME)
+       -$(INSTALL_DIR) $(DESTDIR)$(libdir)
+       $(INSTALL_LIB) $(CAIROLIBNAME) $(DESTDIR)$(libdir)
+ 
++      if test x$(CAIRODSONAME) = xlibfltk_cairo.la; then\
++              ${LIBTOOL} --mode=install $(INSTALL_LIB) libfltk_cairo.la $(DESTDIR)$(libdir); \
++      fi
+       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); \
Index: pkgsrc/x11/fltk/patches/patch-configure
diff -u /dev/null pkgsrc/x11/fltk/patches/patch-configure:1.1
--- /dev/null   Fri Jan 31 12:22:45 2025
+++ pkgsrc/x11/fltk/patches/patch-configure     Fri Jan 31 12:22:44 2025
@@ -0,0 +1,61 @@
+$NetBSD: patch-configure,v 1.1 2025/01/31 12:22:44 micha Exp $
+
+Add libtool support.
+Upstream will not merge this (libtool is listed as not acceptable).
+
+--- configure.orig     2024-12-12 22:49:01.000000000 +0000
++++ configure
+@@ -1489,6 +1489,7 @@ Optional Features:
+   --enable-use_std        allow FLTK to use std::string etc.
+   --disable-print         turn off print support (X11)
+   --enable-shared         turn on shared libraries
++  --enable-libtool        pkgsrc: Use libtool
+   --disable-svg           disable SVG support
+   --disable-threads       turn off multi-threading support
+   --enable-x11            use X11 with Cygwin or macOS (default=no)
+@@ -5174,6 +5175,18 @@ fi
+ 
+ 
+ 
++# pkgsrc: Check whether --enable-libtool or --disable-libtool was given.
++if test "${enable_libtool+set}" = set; then
++  enableval="$enable_libtool"
++
++if test x$enable_libtool != xno; then
++    LIBTOOL="$enable_libtool"
++    enable_shared=no
++else
++    LIBTOOL=""
++fi
++fi
++
+ if test "x$enable_shared" = xyes
+ then :
+ 
+@@ -5484,7 +5497,25 @@ fi
+ 
+ 
+ 
+-
++# pkgsrc: libtool support
++if test "x$LIBTOOL" != "x"; then
++    LINKFLTK="../src/libfltk.la"
++    if test "x$LINKFLTKGL" != "x"; then
++        LINKFLTKGL="../src/libfltk_gl.la"
++    fi
++    if test "x$LINKFLTKIMG" != "x"; then
++        LINKFLTKIMG="../src/libfltk_images.la"
++    fi
++    if test "x$LINKFLTKCAIRO" != "x"; then
++        LINKFLTKCAIRO="../src/libfltk_cairo.la"
++    fi
++    LINKSHARED="-lfltk_images -lfltk_forms -lfltk"
++    DSONAME="libfltk.la"
++    FLDSONAME="libfltk_forms.la"
++    GLDSONAME="libfltk_gl.la"
++    IMGDSONAME="libfltk_images.la"
++    CAIRODSONAME="libfltk_cairo.la"
++fi
+ 
+ 
+ 
Index: pkgsrc/x11/fltk/patches/patch-documentation_Makefile
diff -u /dev/null pkgsrc/x11/fltk/patches/patch-documentation_Makefile:1.1
--- /dev/null   Fri Jan 31 12:22:45 2025
+++ pkgsrc/x11/fltk/patches/patch-documentation_Makefile        Fri Jan 31 12:22:44 2025
@@ -0,0 +1,30 @@
+$NetBSD: patch-documentation_Makefile,v 1.1 2025/01/31 12:22:44 micha Exp $
+
+Do not install manpages to cat1/cat3/cat6 directories.
+
+--- documentation/Makefile.orig        2024-10-20 20:28:34.000000000 +0000
++++ documentation/Makefile
+@@ -106,12 +106,6 @@ install: $(MANPAGES)
+         $(INSTALL_DATA) fltk.pdf "$(DESTDIR)$(docdir)"; \
+       fi
+       echo "Installing man pages in $(DESTDIR)$(mandir) ..."
+-      -$(INSTALL_DIR) "$(DESTDIR)$(mandir)/cat1"
+-      $(INSTALL_MAN) $(SRC_DOCDIR)/fluid.$(CAT1EXT) "$(DESTDIR)$(mandir)/cat1"
+-      $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.$(CAT1EXT) "$(DESTDIR)$(mandir)/cat1"
+-      $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-options.$(CAT1EXT) "$(DESTDIR)$(mandir)/cat1"
+-      -$(INSTALL_DIR) "$(DESTDIR)$(mandir)/cat3"
+-      $(INSTALL_MAN) $(SRC_DOCDIR)/fltk.$(CAT3EXT) "$(DESTDIR)$(mandir)/cat3"
+       -$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1"
+       $(INSTALL_MAN) $(SRC_DOCDIR)/fluid.man "$(DESTDIR)$(mandir)/man1/fluid.1"
+       $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.man "$(DESTDIR)$(mandir)/man1/fltk-config.1"
+@@ -120,10 +114,6 @@ install: $(MANPAGES)
+       $(INSTALL_MAN) $(SRC_DOCDIR)/fltk.man "$(DESTDIR)$(mandir)/man3/fltk.3"
+ 
+ install-linux install-osx:
+-      -$(INSTALL_DIR) "$(DESTDIR)$(mandir)/cat6"
+-      $(INSTALL_MAN) $(SRC_DOCDIR)/blocks.$(CAT6EXT) "$(DESTDIR)$(mandir)/cat6"
+-      $(INSTALL_MAN) $(SRC_DOCDIR)/checkers.$(CAT6EXT) "$(DESTDIR)$(mandir)/cat6"
+-      $(INSTALL_MAN) $(SRC_DOCDIR)/sudoku.$(CAT6EXT) "$(DESTDIR)$(mandir)/cat6"
+       -$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man6"
+       $(INSTALL_MAN) $(SRC_DOCDIR)/blocks.man "$(DESTDIR)$(mandir)/man6/blocks.6"
+       $(INSTALL_MAN) $(SRC_DOCDIR)/checkers.man "$(DESTDIR)$(mandir)/man6/checkers.6"
Index: pkgsrc/x11/fltk/patches/patch-fltk-options_Makefile
diff -u /dev/null pkgsrc/x11/fltk/patches/patch-fltk-options_Makefile:1.1
--- /dev/null   Fri Jan 31 12:22:45 2025
+++ pkgsrc/x11/fltk/patches/patch-fltk-options_Makefile Fri Jan 31 12:22:44 2025
@@ -0,0 +1,25 @@
+$NetBSD: patch-fltk-options_Makefile,v 1.1 2025/01/31 12:22:44 micha Exp $
+
+Use libtool.
+Upstream will not merge this (libtool is listed as not acceptable).
+
+--- fltk-options/Makefile.orig 2024-12-12 17:45:50.000000000 +0000
++++ fltk-options/Makefile
+@@ -27,7 +27,7 @@ all: $(FLTK_OPTIONS) fltk-options$(EXEEX
+ 
+ fltk-options$(EXEEXT):        $(OBJECTS) $(LIBNAME)
+       echo Linking $@...
+-      $(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKFLTKIMG) $(LDFLAGS) $(LDLIBS)
++      ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKFLTKIMG) $(LDFLAGS) $(LDLIBS)
+       $(OSX_ONLY) $(RM) -r -f fltk-options.app
+       $(OSX_ONLY) mkdir -p fltk-options.app/Contents/MacOS fltk-options.app/Contents/Resources
+       $(OSX_ONLY) $(INSTALL_BIN) fltk-options fltk-options.app/Contents/MacOS
+@@ -56,7 +56,7 @@ include makedepend
+ install: all
+       echo "Installing fltk-options in $(DESTDIR)$(bindir)..."
+       -$(INSTALL_DIR) "$(DESTDIR)$(bindir)"
+-      $(INSTALL_BIN) $(FLTK_OPTIONS) "$(DESTDIR)$(bindir)/fltk-options$(EXEEXT)"
++      ${LIBTOOL} --mode=install $(INSTALL_BIN) $(FLTK_OPTIONS) "$(DESTDIR)$(bindir)/fltk-options$(EXEEXT)"
+ 
+ install-linux:
+       -$(INSTALL_DIR) "$(DESTDIR)/usr/share/applications"
Index: pkgsrc/x11/fltk/patches/patch-fluid_Makefile
diff -u /dev/null pkgsrc/x11/fltk/patches/patch-fluid_Makefile:1.1
--- /dev/null   Fri Jan 31 12:22:45 2025
+++ pkgsrc/x11/fltk/patches/patch-fluid_Makefile        Fri Jan 31 12:22:45 2025
@@ -0,0 +1,25 @@
+$NetBSD: patch-fluid_Makefile,v 1.1 2025/01/31 12:22:45 micha Exp $
+
+Use libtool.
+Upstream will not merge this (libtool is listed as not acceptable).
+
+--- fluid/Makefile.orig        2024-12-12 17:45:50.000000000 +0000
++++ fluid/Makefile
+@@ -69,7 +69,7 @@ all: $(FLUID) fluid$(EXEEXT)
+ 
+ fluid$(EXEEXT):               $(OBJECTS) $(LIBNAME) $(IMGLIBNAME)
+       echo Linking $@...
+-      $(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKFLTKIMG) $(LDFLAGS) $(LDLIBS)
++      ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKFLTKIMG) $(LDFLAGS) $(LDLIBS)
+       $(OSX_ONLY) $(RM) -r -f fluid.app
+       $(OSX_ONLY) mkdir -p fluid.app/Contents/MacOS fluid.app/Contents/Resources
+       $(OSX_ONLY) $(INSTALL_BIN) fluid fluid.app/Contents/MacOS
+@@ -98,7 +98,7 @@ include makedepend
+ install: all
+       echo "Installing FLUID in $(DESTDIR)$(bindir)..."
+       -$(INSTALL_DIR) "$(DESTDIR)$(bindir)"
+-      $(INSTALL_BIN) $(FLUID) "$(DESTDIR)$(bindir)/fluid$(EXEEXT)"
++      ${LIBTOOL} --mode=install $(INSTALL_BIN) $(FLUID) "$(DESTDIR)$(bindir)/fluid$(EXEEXT)"
+ 
+ install-linux:
+       -$(INSTALL_DIR) "$(DESTDIR)$(datadir)/applications"
Index: pkgsrc/x11/fltk/patches/patch-makeinclude.in
diff -u /dev/null pkgsrc/x11/fltk/patches/patch-makeinclude.in:1.1
--- /dev/null   Fri Jan 31 12:22:45 2025
+++ pkgsrc/x11/fltk/patches/patch-makeinclude.in        Fri Jan 31 12:22:45 2025
@@ -0,0 +1,43 @@
+$NetBSD: patch-makeinclude.in,v 1.1 2025/01/31 12:22:45 micha Exp $
+
+Do not use the static libraries created in "../lib".
+Use libtool.
+Upstream will not merge this (libtool is listed as not acceptable).
+
+--- makeinclude.in.orig        2024-12-12 17:45:50.000000000 +0000
++++ makeinclude.in
+@@ -107,7 +107,7 @@ LINKFLTKIMG        = @LINKFLTKIMG@ @LINKFLTK@ $
+ LINKFLTKCAIRO = @LINKFLTKCAIRO@ $(CAIROLIBS)
+ FLTKCAIROOPTION = @FLTKCAIROOPTION@
+ LINKSHARED    = @DSOLINK@ @LINKSHARED@ $(IMAGELIBS) $(CAIROLIBS)
+-IMAGELIBS     = -L../lib @IMAGELIBS@
++IMAGELIBS     = @IMAGELIBS@
+ 
+ # optional extra build step for fluid:
+ FLUIDDIR  = @FLUIDDIR@
+@@ -169,20 +169,21 @@ UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@
+ 
+ .o$(EXEEXT):
+       echo Linking $@...
+-      $(CXX) $(ARCHFLAGS) $(LDFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@
++      $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@
+       $(OSX_ONLY) ../fltk-config --post $@
+ 
+ .c.o:
+       echo Compiling $<...
+-      $(CC) -I.. $(ARCHFLAGS) @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CFLAGS) -c $< -o $@
++      $(LIBTOOL) --mode=compile $(CC) -I.. $(ARCHFLAGS) @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CFLAGS) -c $< -o $@
++
+ 
+ .cxx.o:
+       echo Compiling $<...
+-      $(CXX) -I.. $(ARCHFLAGS) @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CXXFLAGS) -c $< -o $@
++      $(LIBTOOL) --mode=compile $(CXX) -I.. $(ARCHFLAGS) @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CXXFLAGS) -c $< -o $@
+ 
+ .mm.o:
+       echo Compiling $<...
+-      $(CXX) -I.. $(ARCHFLAGS) $(CXXFLAGS) -x objective-c++ -c $< -o $@
++      $(LIBTOOL) --mode=compile $(CXX) -I.. $(ARCHFLAGS) $(CXXFLAGS) -x objective-c++ -c $< -o $@
+ 
+ 
+ .man.0 .man.1 .man.3 .man.6:
Index: pkgsrc/x11/fltk/patches/patch-src_Makefile
diff -u /dev/null pkgsrc/x11/fltk/patches/patch-src_Makefile:1.1
--- /dev/null   Fri Jan 31 12:22:45 2025
+++ pkgsrc/x11/fltk/patches/patch-src_Makefile  Fri Jan 31 12:22:45 2025
@@ -0,0 +1,91 @@
+$NetBSD: patch-src_Makefile,v 1.1 2025/01/31 12:22:45 micha Exp $
+
+Use libtool.
+Upstream will not merge this (libtool is listed as not acceptable).
+
+--- src/Makefile.orig  2024-12-12 17:45:50.000000000 +0000
++++ src/Makefile
+@@ -456,6 +456,10 @@ $(LIBNAME): $(OBJECTS)
+       $(LIBCOMMAND) $@ $(OBJECTS)
+       $(RANLIB) $@
+ 
++libfltk.la: $(OBJECTS)
++      echo $(DSOCOMMAND) $@ ...
++      ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(OBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 2:0:0 $(LDLIBS) $(CAIROLIBS)
++
+ libfltk.so.$(FL_DSO_VERSION): $(OBJECTS)
+       echo $(DSOCOMMAND) $@ ...
+       $(DSOCOMMAND) $@ $(OBJECTS) $(LDFLAGS) $(LDLIBS) $(CAIROLIBS)
+@@ -492,6 +496,10 @@ $(FLLIBNAME): $(FLOBJECTS)
+       $(LIBCOMMAND) $@ $(FLOBJECTS)
+       $(RANLIB) $@
+ 
++libfltk_forms.la: $(FLOBJECTS) libfltk.la
++      echo $(DSOCOMMAND) $@ ...
++      ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(FLOBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 2:0:0 -L. -lfltk $(LDLIBS)
++
+ libfltk_forms.so.$(FL_DSO_VERSION): $(FLOBJECTS) libfltk.so.$(FL_DSO_VERSION)
+       echo $(DSOCOMMAND) $@ ...
+       $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk $(LDFLAGS) $(LDLIBS)
+@@ -528,6 +536,10 @@ $(GLLIBNAME): $(GLOBJECTS)
+       $(LIBCOMMAND) $@ $(GLOBJECTS)
+       $(RANLIB) $@
+ 
++libfltk_gl.la: $(GLOBJECTS) libfltk.la
++      echo $(DSOCOMMAND) $@ ...
++      ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(GLOBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 2:0:0 -L. -lfltk $(LDLIBS) $(GLDLIBS)
++
+ libfltk_gl.so.$(FL_DSO_VERSION): $(GLOBJECTS) libfltk.so.$(FL_DSO_VERSION)
+       echo $(DSOCOMMAND) $@ ...
+       $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk $(LDFLAGS) $(LDLIBS) $(GLDLIBS)
+@@ -564,6 +576,10 @@ $(IMGLIBNAME): $(IMGOBJECTS)
+       $(LIBCOMMAND) $@ $(IMGOBJECTS)
+       $(RANLIB) $@
+ 
++libfltk_images.la: $(IMGOBJECTS) libfltk.la
++      echo $(DSOCOMMAND) $@ ...
++      ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(IMGOBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 2:0:0 -L. $(IMAGELIBS) -lfltk $(LDLIBS)
++
+ libfltk_images.so.$(FL_DSO_VERSION): $(IMGOBJECTS) libfltk.so.$(FL_DSO_VERSION)
+       echo $(DSOCOMMAND) $@ ...
+       $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk $(LDFLAGS) $(LDLIBS)
+@@ -866,6 +882,9 @@ install: $(LIBNAME) $(DSONAME) \
+               $(RANLIB) "$(DESTDIR)$(libdir)/$(GLLIBBASENAME)"; \
+       fi
+       $(RANLIB) "$(DESTDIR)$(libdir)/$(IMGLIBBASENAME)"
++      if test x$(DSONAME) = xlibfltk.la; then\
++              ${LIBTOOL} --mode=install $(INSTALL_LIB) libfltk.la $(DESTDIR)$(libdir); \
++      fi
+       if test x$(DSONAME) = xlibfltk.so.$(FL_DSO_VERSION); then\
+               $(RM) "$(DESTDIR)$(libdir)"/libfltk.so*;\
+               $(INSTALL_LIB) libfltk.so.$(FL_DSO_VERSION) "$(DESTDIR)$(libdir)"; \
+@@ -897,6 +916,9 @@ install: $(LIBNAME) $(DSONAME) \
+               $(RM) "$(DESTDIR)$(libdir)/libfltk.dll.a";\
+               $(INSTALL_LIB) libfltk.dll.a "$(DESTDIR)$(libdir)"; \
+       fi
++      if test x$(FLDSONAME) = xlibfltk_forms.la; then\
++              ${LIBTOOL} --mode=install $(INSTALL_LIB) libfltk_forms.la $(DESTDIR)$(libdir); \
++      fi
+       if test x$(FLDSONAME) = xlibfltk_forms.so.$(FL_DSO_VERSION); then\
+               $(RM) "$(DESTDIR)$(libdir)"/libfltk_forms.so*;\
+               $(INSTALL_LIB) libfltk_forms.so.$(FL_DSO_VERSION) "$(DESTDIR)$(libdir)"; \
+@@ -928,6 +950,9 @@ install: $(LIBNAME) $(DSONAME) \
+               $(RM) "$(DESTDIR)$(libdir)/libfltk_forms.dll.a";\
+               $(INSTALL_LIB) libfltk_forms.dll.a "$(DESTDIR)$(libdir)"; \
+       fi
++      if test x$(GLDSONAME) = xlibfltk_gl.la; then\
++              ${LIBTOOL} --mode=install $(INSTALL_LIB) libfltk_gl.la $(DESTDIR)$(libdir); \
++      fi
+       if test x$(GLDSONAME) = xlibfltk_gl.so.$(FL_DSO_VERSION); then\
+               $(RM) "$(DESTDIR)$(libdir)"/libfltk_gl.so*;\
+               $(INSTALL_LIB) libfltk_gl.so.$(FL_DSO_VERSION) "$(DESTDIR)$(libdir)"; \
+@@ -959,6 +984,9 @@ install: $(LIBNAME) $(DSONAME) \
+               $(RM) "$(DESTDIR)$(libdir)/libfltk_gl.dll.a";\
+               $(INSTALL_LIB) libfltk_gl.dll.a "$(DESTDIR)$(libdir)"; \
+       fi
++      if test x$(IMGDSONAME) = xlibfltk_images.la; then\
++              ${LIBTOOL} --mode=install $(INSTALL_LIB) libfltk_images.la $(DESTDIR)$(libdir); \
++      fi
+       if test x$(IMGDSONAME) = xlibfltk_images.so.$(FL_DSO_VERSION); then\
+               $(RM) "$(DESTDIR)$(libdir)"/libfltk_images.so*;\
+               $(INSTALL_LIB) libfltk_images.so.$(FL_DSO_VERSION) "$(DESTDIR)$(libdir)"; \
Index: pkgsrc/x11/fltk/patches/patch-test_Makefile
diff -u /dev/null pkgsrc/x11/fltk/patches/patch-test_Makefile:1.1
--- /dev/null   Fri Jan 31 12:22:45 2025
+++ pkgsrc/x11/fltk/patches/patch-test_Makefile Fri Jan 31 12:22:45 2025
@@ -0,0 +1,298 @@
+$NetBSD: patch-test_Makefile,v 1.1 2025/01/31 12:22:45 micha Exp $
+
+Use libtool.
+Upstream will not merge this (libtool is listed as not acceptable).
+
+--- test/Makefile.orig 2024-12-12 17:45:50.000000000 +0000
++++ test/Makefile
+@@ -368,7 +368,7 @@ buttons$(EXEEXT): buttons.o
+ 
+ blocks$(EXEEXT): blocks.o
+       echo Linking $@...
+-      $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) blocks.o -o $@ $(AUDIOLIBS) $(LINKFLTK) $(LDLIBS)
++      $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) blocks.o -o $@ $(AUDIOLIBS) $(LINKFLTK) $(LDLIBS)
+       $(OSX_ONLY) $(RM) -f -r blocks.app
+       $(OSX_ONLY) mkdir -p blocks.app/Contents/MacOS blocks.app/Contents/Resources
+       $(OSX_ONLY) $(INSTALL_BIN) blocks$(EXEEXT) blocks.app/Contents/MacOS
+@@ -377,7 +377,7 @@ blocks$(EXEEXT): blocks.o
+ 
+ checkers$(EXEEXT): checkers.o checkers_pieces.o
+       echo Linking $@...
+-      $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) checkers.o checkers_pieces.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
++      $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) checkers.o checkers_pieces.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
+       $(OSX_ONLY) $(RM) -f -r checkers.app
+       $(OSX_ONLY) mkdir -p checkers.app/Contents/MacOS checkers.app/Contents/Resources
+       $(OSX_ONLY) $(INSTALL_BIN) checkers$(EXEEXT) checkers.app/Contents/MacOS
+@@ -391,14 +391,14 @@ checkers_pieces.cxx:     checkers_pieces.fl 
+ 
+ clipboard$(EXEEXT): clipboard.o $(IMGLIBNAME)
+       echo Linking $@...
+-      $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) clipboard.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
++      $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) clipboard.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
+       $(OSX_ONLY) ../fltk-config --post $@
+ 
+ clock$(EXEEXT): clock.o
+ 
+ colbrowser$(EXEEXT): colbrowser.o
+       echo Linking $@...
+-      $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ colbrowser.o $(LINKFLTK) $(LDLIBS)
++      $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ colbrowser.o $(LINKFLTK) $(LDLIBS)
+       $(OSX_ONLY) ../fltk-config --post $@
+       $(OSX_ONLY) mkdir -p colbrowser.app/Contents/Resources
+       $(OSX_ONLY) cp -f rgb.txt colbrowser.app/Contents/Resources/
+@@ -413,21 +413,21 @@ curve$(EXEEXT): curve.o
+ 
+ demo$(EXEEXT): demo.o
+       echo Linking $@...
+-      $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ demo.o $(LINKFLTK) $(LDLIBS)
++      $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ demo.o $(LINKFLTK) $(LDLIBS)
+       $(OSX_ONLY) ../fltk-config --post $@
+       $(OSX_ONLY) mkdir -p demo.app/Contents/Resources
+       $(OSX_ONLY) cp -f demo.menu demo.app/Contents/Resources/
+ 
+ device$(EXEEXT): device.o $(IMGLIBNAME)
+       echo Linking $@...
+-      $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) device.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
++      $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) device.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
+       $(OSX_ONLY) ../fltk-config --post $@
+ 
+ doublebuffer$(EXEEXT): doublebuffer.o
+ 
+ editor$(EXEEXT): editor.o
+       echo Linking $@...
+-      $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) editor.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
++      $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) editor.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
+       $(OSX_ONLY) ../fltk-config --post $@
+       $(OSX_ONLY) cp -f mac-resources/editor.plist editor.app/Contents/Info.plist
+ 
+@@ -436,7 +436,7 @@ fast_slow.cxx:     fast_slow.fl ../fluid/flu
+ 
+ file_chooser$(EXEEXT): file_chooser.o $(IMGLIBNAME)
+       echo Linking $@...
+-      $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) file_chooser.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
++      $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) file_chooser.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
+       $(OSX_ONLY) ../fltk-config --post $@
+ 
+ flex_demo$(EXEEXT): flex_demo.o
+@@ -449,7 +449,7 @@ fonts$(EXEEXT): fonts.o
+ 
+ forms$(EXEEXT): forms.o
+       echo Linking $@...
+-      $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ forms.o $(LINKFLTKFORMS) $(LDLIBS)
++      $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ forms.o $(LINKFLTKFORMS) $(LDLIBS)
+       $(OSX_ONLY) ../fltk-config --post $@
+ 
+ grid_alignment$(EXEEXT): grid_alignment.o
+@@ -464,7 +464,7 @@ hello$(EXEEXT): hello.o
+ 
+ help_dialog$(EXEEXT): help_dialog.o $(IMGLIBNAME)
+       echo Linking $@...
+-      $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) help_dialog.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
++      $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) help_dialog.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
+       $(OSX_ONLY) ../fltk-config --post $@
+       $(OSX_ONLY) mkdir -p help_dialog.app/Contents/Resources
+       $(OSX_ONLY) cp -f help_dialog.html help_dialog.app/Contents/Resources/
+@@ -484,14 +484,14 @@ input_choice$(EXEEXT): input_choice.o
+ 
+ keyboard$(EXEEXT): keyboard_ui.o keyboard.o
+       echo Linking $@...
+-      $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ keyboard.o keyboard_ui.o $(LINKFLTK) $(LDLIBS)
++      $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ keyboard.o keyboard_ui.o $(LINKFLTK) $(LDLIBS)
+       $(OSX_ONLY) ../fltk-config --post $@
+ keyboard_ui.o:        keyboard_ui.h
+ keyboard_ui.cxx:      keyboard_ui.fl ../fluid/fluid$(EXEEXT)
+ 
+ label$(EXEEXT): label.o
+       echo Linking $@...
+-      $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ label.o $(LINKFLTK) $(LDLIBS)
++      $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ label.o $(LINKFLTK) $(LDLIBS)
+       $(OSX_ONLY) ../fltk-config --post $@
+ 
+ line_style$(EXEEXT): line_style.o
+@@ -502,7 +502,7 @@ list_visuals$(EXEEXT): list_visuals.o
+ 
+ mandelbrot$(EXEEXT): mandelbrot_ui.o mandelbrot.o
+       echo Linking $@...
+-      $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ mandelbrot.o mandelbrot_ui.o $(LINKFLTK) $(LDLIBS)
++      $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ mandelbrot.o mandelbrot_ui.o $(LINKFLTK) $(LDLIBS)
+       $(OSX_ONLY) ../fltk-config --post $@
+ mandelbrot_ui.o:      mandelbrot_ui.h
+ mandelbrot_ui.cxx:    mandelbrot_ui.fl ../fluid/fluid$(EXEEXT)
+@@ -515,7 +515,7 @@ minimum$(EXEEXT): minimum.o
+ 
+ native-filechooser$(EXEEXT): native-filechooser.o $(IMGLIBNAME)
+       echo Linking $@...
+-      $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) native-filechooser.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
++      $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) native-filechooser.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
+       $(OSX_ONLY) ../fltk-config --post $@
+ 
+ navigation$(EXEEXT): navigation.o
+@@ -524,7 +524,7 @@ offscreen$(EXEEXT): offscreen.o
+ 
+ output$(EXEEXT): output.o $(FLLIBNAME)
+       echo Linking $@...
+-      $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ output.o $(LINKFLTK) $(LDLIBS)
++      $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ output.o $(LINKFLTK) $(LDLIBS)
+       $(OSX_ONLY) ../fltk-config --post $@
+ 
+ overlay$(EXEEXT): overlay.o
+@@ -533,12 +533,12 @@ pack$(EXEEXT): pack.o
+ 
+ pixmap$(EXEEXT): pixmap.o $(IMGLIBNAME)
+       echo Linking $@...
+-      $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ pixmap.o $(LINKFLTKIMG) $(LDLIBS)
++      $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ pixmap.o $(LINKFLTKIMG) $(LDLIBS)
+       $(OSX_ONLY) ../fltk-config --post $@
+ 
+ pixmap_browser$(EXEEXT): pixmap_browser.o $(IMGLIBNAME)
+       echo Linking $@...
+-      $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) pixmap_browser.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
++      $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) pixmap_browser.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
+       $(OSX_ONLY) ../fltk-config --post $@
+ 
+ preferences$(EXEEXT): preferences.o
+@@ -556,52 +556,52 @@ resizebox$(EXEEXT): resizebox.o
+ 
+ resize-example1$(EXEEXT): resize-example1.o resize-arrows.o
+       echo Linking $@...
+-      $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) resize-example1.o resize-arrows.o -o $@ $(LINKFLTK) $(LDLIBS)
++      $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) resize-example1.o resize-arrows.o -o $@ $(LINKFLTK) $(LDLIBS)
+       $(OSX_ONLY) ../fltk-config --post $@
+ 
+ resize-example2$(EXEEXT): resize-example2.o resize-arrows.o
+       echo Linking $@...
+-      $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) resize-example2.o resize-arrows.o -o $@ $(LINKFLTK) $(LDLIBS)
++      $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) resize-example2.o resize-arrows.o -o $@ $(LINKFLTK) $(LDLIBS)
+       $(OSX_ONLY) ../fltk-config --post $@
+ 
+ resize-example3a$(EXEEXT): resize-example3a.o resize-arrows.o
+       echo Linking $@...
+-      $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) resize-example3a.o resize-arrows.o -o $@ $(LINKFLTK) $(LDLIBS)
++      $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) resize-example3a.o resize-arrows.o -o $@ $(LINKFLTK) $(LDLIBS)
+       $(OSX_ONLY) ../fltk-config --post $@
+ 
+ resize-example3b$(EXEEXT): resize-example3b.o resize-arrows.o
+       echo Linking $@...
+-      $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) resize-example3b.o resize-arrows.o -o $@ $(LINKFLTK) $(LDLIBS)
++      $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) resize-example3b.o resize-arrows.o -o $@ $(LINKFLTK) $(LDLIBS)
+       $(OSX_ONLY) ../fltk-config --post $@
+ 
+ resize-example3c$(EXEEXT): resize-example3c.o resize-arrows.o
+       echo Linking $@...
+-      $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) resize-example3c.o resize-arrows.o -o $@ $(LINKFLTK) $(LDLIBS)
++      $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) resize-example3c.o resize-arrows.o -o $@ $(LINKFLTK) $(LDLIBS)
+       $(OSX_ONLY) ../fltk-config --post $@
+ 
+ resize-example4a$(EXEEXT): resize-example4a.o resize-arrows.o
+       echo Linking $@...
+-      $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) resize-example4a.o resize-arrows.o -o $@ $(LINKFLTK) $(LDLIBS)
++      $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) resize-example4a.o resize-arrows.o -o $@ $(LINKFLTK) $(LDLIBS)
+       $(OSX_ONLY) ../fltk-config --post $@
+ 
+ resize-example4b$(EXEEXT): resize-example4b.o resize-arrows.o
+       echo Linking $@...
+-      $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) resize-example4b.o resize-arrows.o -o $@ $(LINKFLTK) $(LDLIBS)
++      $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) resize-example4b.o resize-arrows.o -o $@ $(LINKFLTK) $(LDLIBS)
+       $(OSX_ONLY) ../fltk-config --post $@
+ 
+ resize-example5a$(EXEEXT): resize-example5a.o resize-arrows.o
+       echo Linking $@...
+-      $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) resize-example5a.o resize-arrows.o -o $@ $(LINKFLTK) $(LDLIBS)
++      $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) resize-example5a.o resize-arrows.o -o $@ $(LINKFLTK) $(LDLIBS)
+       $(OSX_ONLY) ../fltk-config --post $@
+ 
+ resize-example5b$(EXEEXT): resize-example5b.o resize-arrows.o
+       echo Linking $@...
+-      $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) resize-example5b.o resize-arrows.o -o $@ $(LINKFLTK) $(LDLIBS)
++      $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) resize-example5b.o resize-arrows.o -o $@ $(LINKFLTK) $(LDLIBS)
+       $(OSX_ONLY) ../fltk-config --post $@
+ 
+ resize-example5c$(EXEEXT): resize-example5c.o resize-arrows.o
+       echo Linking $@...
+-      $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) resize-example5c.o resize-arrows.o -o $@ $(LINKFLTK) $(LDLIBS)
++      $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) resize-example5c.o resize-arrows.o -o $@ $(LINKFLTK) $(LDLIBS)
+       $(OSX_ONLY) ../fltk-config --post $@
+ 
+ rotated_text$(EXEEXT): rotated_text.o
+@@ -612,7 +612,7 @@ subwindow$(EXEEXT): subwindow.o
+ 
+ sudoku: sudoku.o
+       echo Linking $@...
+-      $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) sudoku.o -o $@ $(AUDIOLIBS) $(LINKFLTKIMG) $(LDLIBS)
++      $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) sudoku.o -o $@ $(AUDIOLIBS) $(LINKFLTKIMG) $(LDLIBS)
+       $(OSX_ONLY) $(RM) -f -r sudoku.app
+       $(OSX_ONLY) mkdir -p sudoku.app/Contents/MacOS sudoku.app/Contents/Resources
+       $(OSX_ONLY) $(INSTALL_BIN) sudoku$(EXEEXT) sudoku.app/Contents/MacOS
+@@ -621,7 +621,7 @@ sudoku: sudoku.o
+ 
+ sudoku.exe: sudoku.o sudoku.rc
+       echo Linking $@...
+-      $(RC) sudoku.rc sudokures.o
++      $(LIBTOOL) --mode=link $(RC) sudoku.rc sudokures.o
+       $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) sudoku.o sudokures.o -o $@ $(AUDIOLIBS) $(LINKFLTKIMG) $(LDLIBS)
+ 
+ symbols$(EXEEXT): symbols.o
+@@ -657,7 +657,7 @@ $(GLALL): $(LIBNAME) $(GLLIBNAME)
+ # OpenGL demos...
+ CubeView$(EXEEXT): CubeMain.o CubeView.o CubeViewUI.o
+       echo Linking $@...
+-      $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ \
++      $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ \
+               CubeMain.o CubeView.o CubeViewUI.o \
+               $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
+       $(OSX_ONLY) ../fltk-config --post $@
+@@ -668,45 +668,45 @@ CubeViewUI.cxx:  CubeViewUI.fl ../fluid/f
+ 
+ cube$(EXEEXT): cube.o
+       echo Linking $@...
+-      $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ cube.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
++      $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ cube.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
+       $(OSX_ONLY) ../fltk-config --post $@
+ 
+ fractals$(EXEEXT): fractals.o fracviewer.o
+       echo Linking $@...
+-      $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ fractals.o fracviewer.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
++      $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ fractals.o fracviewer.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
+       $(OSX_ONLY) ../fltk-config --post $@
+ 
+ fullscreen$(EXEEXT): fullscreen.o
+       echo Linking $@...
+-      $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ fullscreen.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
++      $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ fullscreen.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
+       $(OSX_ONLY) ../fltk-config --post $@
+ 
+ glpuzzle$(EXEEXT): glpuzzle.o
+       echo Linking $@...
+-      $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ glpuzzle.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
++      $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ glpuzzle.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
+       $(OSX_ONLY) ../fltk-config --post $@
+ 
+ gl_overlay$(EXEEXT): gl_overlay.o
+       echo Linking $@...
+-      $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ gl_overlay.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
++      $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ gl_overlay.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
+       $(OSX_ONLY) ../fltk-config --post $@
+ 
+ glut_test$(EXEEXT): glut_test.o
+       echo Linking $@...
+-      $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ glut_test.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
++      $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ glut_test.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
+       $(OSX_ONLY) ../fltk-config --post $@
+ 
+ unittests$(EXEEXT): $(OBJUNITTEST)
+       echo Linking $@...
+-      $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJUNITTEST) $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
++      $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJUNITTEST) $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
+       $(OSX_ONLY) ../fltk-config --post $@
+ 
+ shape$(EXEEXT): shape.o
+       echo Linking $@...
+-      $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ shape.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
++      $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ shape.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
+       $(OSX_ONLY) ../fltk-config --post $@
+ 
+ cairo_test$(EXEEXT): cairo_test.o
+       echo Linking $@...
+-      $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(CAIROFLAGS) $(LDFLAGS) -o $@ cairo_test.o $(LINKFLTK) $(CAIROLIBS) $(GLDLIBS)
++      $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(CAIROFLAGS) $(LDFLAGS) -o $@ cairo_test.o $(LINKFLTK) $(CAIROLIBS) $(GLDLIBS)
+       $(OSX_ONLY) ../fltk-config --post $@

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index