pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
fltk14-devel: Remove, used to update x11/fltk
Module Name: pkgsrc-wip
Committed By: Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By: micha
Date: Fri Jan 31 13:29:38 2025 +0100
Changeset: 80cf1e97ff6ead8da7b7864199e7f6422e137e82
Modified Files:
Makefile
Removed Files:
fltk14-devel/COMMIT_MSG
fltk14-devel/DESCR
fltk14-devel/Makefile
fltk14-devel/PLIST
fltk14-devel/README
fltk14-devel/TODO
fltk14-devel/buildlink3.mk
fltk14-devel/distinfo
fltk14-devel/options.mk
fltk14-devel/patches/patch-FL_Fl__Cairo.H
fltk14-devel/patches/patch-cairo_Makefile
fltk14-devel/patches/patch-configure
fltk14-devel/patches/patch-documentation_Makefile
fltk14-devel/patches/patch-fltk-options_Makefile
fltk14-devel/patches/patch-fluid_Makefile
fltk14-devel/patches/patch-makeinclude.in
fltk14-devel/patches/patch-src_Makefile
fltk14-devel/patches/patch-test_Makefile
Log Message:
fltk14-devel: Remove, used to update x11/fltk
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=80cf1e97ff6ead8da7b7864199e7f6422e137e82
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 1 -
fltk14-devel/COMMIT_MSG | 507 ----------------------
fltk14-devel/DESCR | 17 -
fltk14-devel/Makefile | 46 --
fltk14-devel/PLIST | 178 --------
fltk14-devel/README | 26 --
fltk14-devel/TODO | 17 -
fltk14-devel/buildlink3.mk | 91 ----
fltk14-devel/distinfo | 14 -
fltk14-devel/options.mk | 134 ------
fltk14-devel/patches/patch-FL_Fl__Cairo.H | 16 -
fltk14-devel/patches/patch-cairo_Makefile | 28 --
fltk14-devel/patches/patch-configure | 61 ---
fltk14-devel/patches/patch-documentation_Makefile | 30 --
fltk14-devel/patches/patch-fltk-options_Makefile | 25 --
fltk14-devel/patches/patch-fluid_Makefile | 25 --
fltk14-devel/patches/patch-makeinclude.in | 43 --
fltk14-devel/patches/patch-src_Makefile | 91 ----
fltk14-devel/patches/patch-test_Makefile | 298 -------------
19 files changed, 1648 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index 98a2200da2..fa662fc4f2 100644
--- a/Makefile
+++ b/Makefile
@@ -989,7 +989,6 @@ SUBDIR+= flnews-devel
SUBDIR+= flowblade
SUBDIR+= flpsed
SUBDIR+= fltk11
-SUBDIR+= fltk14-devel
SUBDIR+= fltk2
SUBDIR+= flux2
SUBDIR+= fluxspace
diff --git a/fltk14-devel/COMMIT_MSG b/fltk14-devel/COMMIT_MSG
deleted file mode 100644
index 118a9dcea1..0000000000
--- a/fltk14-devel/COMMIT_MSG
+++ /dev/null
@@ -1,507 +0,0 @@
-x11/fltk: Update to 1.4.1
-
-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
-
-
-Changes in FLTK 1.4.0 RC3 Released: Nov 08 2024
-
- Bug Fixes:
-
- - Windows: "Fullscreen doesn't always pick the correct display" (#1097)
- - macOS: "Mixing native fullscreen button with Fl_Window::fullscreen()" (#1098)
- - Wayland: Issue in maximization of a borderless window (#1099)
- - macOS: "Merge All Windows" fails if focused window is borderless (#1100)
- - macOS: Fl_Window::fullscreen() doesn't work for unfocused tabbed window (#1101)
- - Fl_Tile resizing for "sudden" size changes (#1102)
- - macOS: Weak linking error with latest SDK 15 (#1103, #1105)
- - X11: test/checkers drawing artifacts when window is scaled (#1109)
- - X11: test/curve "points" mode not drawn correctly (#1110)
- - X11: test/gl_overlay stale overlay rendering (#1111)
- - fl_draw_image() with horizontal flip reads out of bounds (#1112)
- - macOS: Very minor high DPI rounding issue with fl_rect (#1113)
- - macOS: Prevent changing window border if window is fullscreen or maximized
- - Mac/XQuartz: Restore Fl_Widget_Surface::draw_decorated_window()
-
- Other Improvements:
-
- - Improve member function Fl_Wayland_Graphics_Driver::copy_offscreen()
- - Make Fl_Window::flush() public for consistency with subclasses
- - Improve UI layout of 'fltk-options'
- - Fix compiler warnings
- - Improve and clarify documentation, including README.CMake.txt
-
-
-Changes in FLTK 1.4.0 RC2 Released: Oct 27 2024
-
- - Add range check to Fl_Group::child(int)
- - Fix Windows Ctrl character handling for scaling shortcuts
- - Fluid: Add missing code for Fl_Grid and Fl_Flex live preview (#1092)
- - Enhance documentation
- - Mention HighDPI support in 'ANNOUNCEMENT'
- - Update CHANGES.txt
-
-
-Changes in FLTK 1.4.0 RC1 Released: Oct 20 2024
-
- General Information about this Release
-
- - FLTK 1.4.0 is based on FLTK 1.3.4 (released Nov 15 2016).
- Later updates have partially been backported to 1.3.x releases, see
- CHANGES_1.3.txt for more information.
-
- - CMake is the primary supported build system in FLTK 1.4.0 and later.
- CMake can be used to generate Makefiles, IDE project files, and files
- for several other build systems by using different "generators" provided
- by CMake (for instance Ninja, CodeBlocks, Eclipse, KDevelop3, Xcode, etc.).
- FLTK uses "Modern CMake" since release 1.4.0 which simplifies user
- project build systems significantly.
- See README.CMake.txt and documentation chapter "Migrating Code from
- FLTK 1.3 to 1.4" for more information.
-
- - autoconf/configure is still supported by the FLTK Team for backwards
- compatibility with older systems that lack CMake support. Support of
- autoconf/configure will be dropped in FLTK 1.5.0.
-
- - FLTK 1.4 introduces a new platform, Wayland, available for recent Linux
- distributions and FreeBSD. For details see README.Wayland.txt.
-
- New Features and Extensions
-
- - fltk-config allows to compile multiple files with more compiler and linker
- options given on the commandline.
- - fl_contrast() functionality has been improved, adding a new contrast
- calculation method based on human contrast perception. This new function
- is now the default but the old, less accurate, contrast function can be
- chosen as an option.
- - Timeout handling has been unified across platforms (#379), see documentation
- in chapter "Migrating Code from FLTK 1.3 to 1.4".
- - New Fl::remove_next_timeout(...) to remove only one timeout (#992).
- - New fltk-options executable, improved Fl::option documentation.
- - New function `Fl_Window::get_size_range()` (#981).
- - New FL_DEPRECATED macro to flag deprecated functions and methods.
- - Enable suppression of "deprecated" warnings by macro FL_NO_DEPRECATE.
- - New animated GIF images support (Fl_Anim_GIF_Image class) (#375).
- - GIF and BMP files can now be "read" from memory, i.e. they can be included
- in source code (use their new constructors).
- - New Fl_Scheme_Choice widget can be used to easily switch schemes in apps.
- - A new scheme named "oxy" has been added (STR 2675, STR 3477).
- - Drawing "Arrows" has been unified in all core widgets.
- - Drawing "Radio Buttons" has been unified in all core widgets.
- - Drawing "Check Marks" has been unified in all core widgets.
- - New methods Fl_Group::on_insert/on_remove/on_move (#527) can be used in
- derived classes to detect addition or removal of children.
- - FLTK widgets can now be used in OpenGL 3 windows.
- - The new convenience function Fl::hide_all_windows() can be used to close
- all open windows, for instance to exit the running program.
- - Windows platform: optionally use GDI+ to antialias oblique lines and curves.
- - Windows: The new function Fl::args_to_utf8() can be used to convert
- "wide character" commandline arguments to UTF-8.
- - X11 and Wayland platforms: Added support of HiDPI displays. FLTK apps
- detect the current display scaling factor and use it to scale all windows.
- - MSWindows platform: FLTK applications detect the display scaling factor and
- automatically scale their GUI accordingly. This effectively renders WIN32
- FLTK apps "per-monitor DPI-aware" whereas they were "DPI-unaware" before.
- - Dynamical GUI rescaling: it is possible on all platforms to rescale all
- FLTK windows mapped to a screen by typing ctrl-'+' (enlarge), ctrl-'-'
- (shrink) or ctrl-'0' (back to starting scaling factor value). Under macOS,
- the corresponding keystrokes are cmd-'+', cmd-'-', cmd-'0'. The resulting
- GUI scaling factor (e.g., 170 %) transiently appears in a yellow popup window.
- Use new Fl::option() item OPTION_SHOW_SCALING to turn on/off these popups.
- Windows moved between screens adjust to the scaling factor of their screen.
- This supports desktops mixing screens with distinct resolutions.
- In addition, use environment variable FLTK_SCALING_FACTOR to further adjust
- the starting scaling factor of all FLTK apps.
- - Note: On some platforms and with some international keyboard layouts you may
- need to set Fl::option(OPTION_SIMPLE_ZOOM_SHORTCUT) to be able to use one or
- more of the scaling shortcuts above with or without pressing the Shift key.
- The new executable `fltk-options` can be used to set this option either
- system wide or for a single user.
- - New horizontal and vertical label margins.
- - Fluid got a lot of UI and functional improvements and the Fluid docs have
- been reworked and put in an own "Fluid User Manual" (HTML and PDF).
- Fluid supports the new Fl_Flex and Fl_Grid widgets.
- For more details please see the manual.
- - New Fl_Grid class to layout multiple columns and rows of widgets.
- - New Fl_Flex class to layout one row or one column of widgets.
- - New Fl_Terminal widget supporting Unicode/UTF-8, ANSI/xterm escape codes
- with full RGB color control.
- - New Fl_Copy_Surface to copy drawings to the clipboard.
- - New Fl::keyboard_screen_scaling(0) call stops recognition of ctrl/+/-/0/
- keystrokes as scaling all windows of a screen.
- - New member function Fl_Image::scale(int width, int height) to set
- the drawing size of an image independently from its data size. The
- same function was previously available only for class Fl_Shared_Image
- and with FL_ABI_VERSION >= 10304. New member functions Fl_Image::data_w()
- and Fl_Image::data_h() give the width and height of the image data.
- - New member functions Fl_Widget::bind_image(Fl_Image *img) and
- Fl_Widget::bind_deimage(Fl_Image *img) to bind an image to a widget, that is,
- to set an image to be used as part of the widget label and also
- to be deleted when the widget is deleted.
- - New member function Fl_Menu_::menu_end() to ensure that the menu is fully
- constructed in its final location after dynamic modifications. This is
- called automatically before the menu is shown.
- - New Fl_SVG_Image class: gives support of scalable vector graphics images
- to FLTK using the nanosvg software.
- - New Fl_ICO_Image class to read Windows .ico icon files.
- - New classes Fl_PDF_File_Surface, Fl_SVG_File_Surface and Fl_EPS_File_Surface
- to save any FLTK graphics to PDF, SVG or EPS files, respectively.
- - New member functions Fl_Window::maximize(), Fl_Window::un_maximize() and
- Fl_Window::maximize_active() to programmatically manage window maximization.
- - Fl_Button now supports a compact flag that visually groups closely set
- buttons into keypads.
- - Fl_Tabs widget now supports close buttons for individual tabs.
- - Fl_Tabs widget now supports four different modes for handling an
- overflowing number of tabs.
- - Mouse buttons 4 + 5 (aka "side buttons") are now supported (#1076, #1068).
- These are typically used as "back" and "forward" functions, e.g. in browsers.
- - Windows platform: added support for using a manifest to set the
- application's level of DPI awareness (issue #309).
- - class Fl_Native_File_Chooser on the X11/Wayland platform relies on external
- commands zenity (PR #599), or kdialog (issue #278), or on the GTK library
- to construct file dialogs. New "Preview" switch added to the GTK dialog.
- The libgtk-based dialog uses in priority the file chooser dialog
- of GTK version 3 when available on the running platform, and falls back
- to version 2 when V3 is not available. In contrast, GTK version 2 was used
- in priority by FLTK 1.3.x. New FL::option() item OPTION_FNFC_USES_ZENITY
- to turn on/off use of zenity-based file dialogs.
- - The undocumented feature FLTK_CONSOLIDATE_MOTION is now OFF on X11 and
- removed on macOS. In FLTK 1.3 this feature has been ON on X11. The macro can now
- be set on the compiler commandline and can be used to reduce the number
- of mouse move events sent to the application but it may be unreliable.
- Recommendation: let it switched OFF unless you really need it.
- - New function fl_capture_window() to capture the content of a rectangular
- zone of a mapped window and return it as an Fl_RGB_Image. It improves
- with HighDPI displays what can be done with fl_read_image().
- - The Windows platform now draws oblique and curved lines in antialiased
- form. The new function void fl_antialias(int state); allows to turn off
- or on such antialiased drawing. The new function int fl_antialias(); returns
- whether line and curve drawing is currently antialiased.
- - The border radius of "rounded" box types can be limited and
- the shadow width of "shadow" box types can be configured (issue #130).
- See Fl::box_border_radius_max() and Fl::box_shadow_width().
- - New fl_putenv() is a cross-platform putenv() wrapper (see docs).
- - New public variable Fl_Image::register_images_done allows an app. to detect
- whether function fl_register_images() has been called.
- - Fix Fl::add_timeout() under Linux (STR 3516).
- - Fix early timeouts in Fl_Clock seen in some environments (STR 3516).
- - Fl_Printer::begin_job() uses by default the Gnome print dialog on the X11
- platform when the GTK library is available at run-time. That can be turned off
- with Fl::option(OPTION_PRINTER_USES_GTK, false).
- - New member functions Fl_Paged_Device::begin_job() and begin_page()
- replace start_job() and start_page(). The start_... names are maintained
- for API compatibility.
- - Fl_Gl_Window can now contain FLTK widgets that are drawn on top of the
- OpenGL scene.
- - OpenGL draws text using textures on all platforms, when the necessary
- hardware support is present (a backup mechanism is available in absence
- of this support). Thus, all text drawable in Fl_Window's can be drawn
- in Fl_Gl_Window's (STR#3450).
- - New member function Fl_Menu_Bar::play_menu(const char *title) to
- programmatically open a menu of a menubar.
- - New member functions Fl::program_should_quit(void),
- and Fl::program_should_quit(int) to support detection by the library
- of a request to terminate cleanly the program.
- - MacOS platform: the processing of the application menu's "Quit" item
- has been changed. With FLTK 1.3.x, the application terminated when all
- windows were closed even before Fl::run() or Fl::wait() could return.
- With FLTK 1.4, Fl::run() returns so the app follows its normal termination path.
- - FLTK apps on the MacOS platform contain automatically a Window menu, which,
- under MacOS # 10.12, allows to group/ungroup windows in tabbed form. The new
- Fl_Sys_Menu_Bar::window_menu_style() function allows to specify various
- styles for the Window menu, even not to create it.
- - New function: int fl_open_ext(const char* fname, int binary, int oflags, ...)
- to control the opening of files in binary/text mode in a cross-platform way.
- - Fix for issue #247 : loading SVG image with BOM.
- - Fl_Text_Selection got a new method length() and returns 0 in length()
- and in all offsets (start(), end(), position()) if no text is selected
- (selected() == false). The behavior in FLTK 1.3 and earlier versions
- (returning undefined values if !selected()) was confusing.
- - New method Fl_Group::bounds() replaces Fl_Group::sizes() which is now
- deprecated. Fl_Group::bounds() uses the new class Fl_Rect that contains
- widget coordinates and sizes x(), y(), w(), and h() (STR #3385).
- Documentation for bounds() and its internal structure was added.
- - New method shadow(int) allows to disable the shadows of the hands
- of Fl_Clock, Fl_Clock_Output, and derived widgets.
- - New method Fl_Tabs::tab_align() allows to set alignment of tab labels,
- particularly to support icons on tab labels (STR #3076).
- - Added Fl_Surface_Device::push_current(new_surface) and
- Fl_Surface_Device::pop_current() to set/unset the current surface
- receiving graphics commands.
- - New macros for easy function and method callbacks with multiple
- type safe arguments (see FL_METHOD_CALLBACK_1 etc.) .
- - The value box size of Fl_Value_Slider is now user settable (STR 3222).
- - The new header file FL/fl_config.h replaces FL/abi-version.h and
- includes some more build configuration settings. This file is always
- included automatically.
- - Nested (aka recursive) common dialogs are now possible (STR 3242, #282).
-
- Removed Features
-
- - X11 platform: Support of XDBE, the configure option '--enable-xdbe'
- and the CMake option 'OPTION_USE_XDBE' have been removed because XDBE
- was unreliable and rarely supported by X servers. Double buffering
- support in Fl_Double_Window is not affected.
- - Hardware "overlay" support has been removed. This was rarely implemented
- and should not affect user code because overlay support is simulated.
-
- New Configuration Options (ABI Version)
-
- - Add --without-fluid configure option (#725) if Fluid is not needed.
- - X11 platform: Added support for drawing text with the pango library
- which allows to draw most scripts supported by Unicode, including CJK
- and right-to-left scripts. FLTK now outputs PostScript that draws
- those scripts in vectorial form. The corresponding CMake option is
- FLTK_USE_PANGO. The corresponding configure option is --enable-pango.
- This option is OFF by default when the build is only for X11 and ON
- when Wayland support is built as well.
- - Configure option --enable-wayland allows to build the FLTK library for
- the new Wayland platform while remaining compatible with X11. The
- corresponding CMake option is FLTK_BACKEND_WAYLAND. This option is ON by default.
- - Configure options --enable-wayland --disable-x11 used together allow to
- build FLTK for the Wayland backend only (no x11 backend). Under CMake, the
- equivalent option is to set FLTK_BACKEND_WAYLAND=ON and FLTK_BACKEND_X11=OFF.
- - The new configure option --disable-gdiplus removes the possibility to draw
- antialiased lines and curves on the Windows platform. The corresponding CMake
- option is FLTK_GRAPHICS_GDIPLUS.
- - The library can be built without support for reading SVG images or writing
- graphics in SVG format using the --disable-svg configure option
- or turning off FLTK_OPTION_SVG in CMake.
- - The library can be built without support for PostScript, thus reducing
- its size, using the --disable-print configure option or turning off
- FLTK_OPTION_PRINT_SUPPORT in CMake. That makes classes Fl_PostScript_File_Device,
- Fl_EPS_File_Surface and Fl_Printer (under X11 platform only) ineffective.
- - FLTK's ABI version can be configured with 'configure' and CMake.
- See documentation in README.abi-version.txt.
- - Building the 'Forms' compatibility library 'fltk_forms' is now optional,
- default is ON. This may be turned to OFF in a later FLTK release.
- - CMake/Windows/MSVC: New option to select MSVC Runtime when linking apps.
-
- Bundled libraries
-
- - Bundled image libraries have been upgraded to newer versions.
- For details see documentation/src/bundled-libs.dox or online docs.
-
- 1.4.0 ABI FEATURES
-
- - None. FLTK 1.4.0 has a new ABI, breaking 1.3.x ABI.
-
-
- Other Improvements
-
- - Fl_Image::copy() is now 'const', including all derived classes.
- Note: This may require code changes in classes derived from Fl_Image,
- see documentation in chapter "Migrating Code from FLTK 1.3 to 1.4".
- - Fl_Native_File_Chooser can now use kdialog, zenity, and/or GTK3 native
- file choosers on Linux.
- - Contrast of check marks and radio buttons has been improved (#443).
- - Improve X11 (16-bit) clipping of lines and rectangles.
- - Added support of macOS 15.0 "Sequoia", 14.0 "Sonoma",
- 13.0 "Ventura", 12.0 "Monterey", and 11.0 "Big Sur".
- - Added macOS support for the arm64 architecture since 11.0 (Big Sur).
- - Added support for macOS 10.15 "Catalina"
- - Added support for macOS 10.14 "Mojave": all drawing to windows is done
- through "layer-backed views" when the app is linked to SDK 10.14.
- - Added support for macOS 10.13 "High Sierra".
- - Fixed X11 Input Method window badly positioned with Fl_Text_Editor
- widget (issue #270).
- - Fixed X11 copy-paste and drag-and-drop target selection (issue #182).
- This fix has been backported to 1.3.6 as well.
- - The user can now copy standard dialog text to the clipboard by
- hitting Ctrl/C (#388).
- - The selected color in Fl_Color_Chooser can now be copied to the
- clipboard by hitting Ctrl/C.
- - Add optional argument to Fl_Printer::begin_job() to receive
- a string describing the error when an error occurs.
- - Fix Windows-specific bug when the program tries to enlarge a
- maximized window, that would freeze the window (git issue #65).
- - Improve X11 16-bit coordinate clipping for text (STR 2798). This
- assumes that text is "small" WRT 16-bit coordinate space and clips
- text if at least one of the x/y coordinates is out of bounds.
- - Fix Fl::add_timeout() in draw() under Linux (STR 3188)
- - Improved documentation for '@' symbols in labels (STR #2940).
- - Fl_Roller can now be controlled via the mouse wheel (STR #3120).
- - Handle Shift + mousewheel event as horizontal scrolling (STR 3521).
- - Tooltips hide by themselves after 12 seconds (STR #2584).
- - Improved constructor for creating Fl_Preferences files with flags for the
- correct locale and for overwriting existing files.
- - Added Fl_Input_::append() method (STR #2953).
- - Fix for STR#3473 (and its duplicate STR#3507) to restore configure-based
- builds on recent Linux/Unix distributions where the freetype-config
- command has been replaced by pkg-config.
- - MacOS # 10.10: Fl_Window::fullscreen() and fullscreen_off() no longer
- proceed by Fl_Window::hide() + Fl_Window::show() but essentially
- resize the window, as done on the X11+EWMH and Windows platforms.
- - Fl_Cairo_Window constructors are now compatible with Fl_Double_Window
- constructors - fixed missing constructors (STR #3160).
- - The include file for platform specific functions and definitions
- (FL/x.H) has been replaced with FL/platform.H. FL/x.H is deprecated
- but still available for backwards compatibility (STR #3435).
- FL/x.H will be removed in a (not yet specified) future FLTK release.
- We recommend to change your #include statements accordingly.
- - The Fl_Boxtype and Fl_Labeltype definitions contained enum values
- (names) with a leading underscore (e.g. _FL_MULTI_LABEL) that had to
- be used in this form. Now all boxtypes and labeltypes can and should
- be used without the leading underscore. A note was added to the enum
- documentations to make clear that the leading underscore must not be
- used in user code, although the enum documentation still contains
- leading underscores for technical reasons (internal use).
- - Boxtypes can now be configured to draw their own custom focus box.
- - The blocks demo program got a new keyboard shortcut (ALT+SHIFT+H) to
- reset the user's high score. It is now slower than before in higher
- levels, hence you can expect higher scores (due to a bug fix in the
- timer code). You can use the '+' key to increase the level at all times.
- - Some methods of Fl_Tabs are now virtual and/or protected for easier
- subclassing without code duplication (STR #3211 and others).
- - Fl_Tabs now has an option to delete tabs by the user (UI), and tab
- overflow has been largely improved with several options.
- - glutAddMenuEntry() now has a *const* label argument (STR #3323)
- - Separated Fl_Input_Choice.H and Fl_Input_Choice.cxx (STR #2750, #2752).
- - Separated Fl_Spinner.H and Fl_Spinner.cxx (STR #2776).
- - New method Fl_Spinner::wrap(int) allows to set wrap mode at bounds if
- value is changed by pressing or holding one of the buttons (STR #3365).
- - Fl_Spinner now handles Up and Down keys when the input field has
- keyboard focus (STR #2989).
- - Renamed test/help.cxx demo program to test/help_dialog.cxx to avoid
- name conflict with CMake's auto-generated target 'help'.
- - Fl_Menu_Bar: left and right arrow keys now wrap to the menu at the
- other end of the menubar when pressed in the first (resp. last) menu.
- - Previously "public" members Fl::awake_ring_*_ are now "private" (#559).
- - The test/clipboard demo program can now save PNG images.
- - New virtual int Fl_Group::delete_child(int n) (STR 3218).
- - Many documentation fixes, clarifications, and enhancements.
-
-
- Bug Fixes
-
- - Fixed all Pixmaps to be '*const' (STR #3108).
- - Fixed Fl_Text_Editor selection range after paste (STR #3248).
- - Fixed crash for very small Fl_Color_Chooser (STR #3490).
- - Removed all shadow lint in header files (STR #2714).
- - Fixed pulldown menu position when at the bottom of the screen (STR #2880).
- - Fixed missing item handling in Fl_Check_Browser (STR #3480).
- - Fixed Delete key in Fl_Input deleting entire widgets in Fluid (STR #2841).
- - Duplicating Widget Class in Fluid no longer crashes (STR #3445).
- - Fixed 'fluid.app' on case sensitive macOS (was: 'Fluid.app').
- - Fl_Check_Browser::add(item) now accepts NULL (STR #3498).
- - Interface to set maximum width of spinner text field (STR #3386).
- - Fl_Text_Display no longer wiggles (STR #2531).
- - Fixed Help_View return value (STR #3430).
- - Fix FL_PUSH event handling of Fl_Check_Browser (STR #3004).
- - Fix a potential crash when a program exits before it opens a window
- (Windows only, STR #3484).
- - Fix Fl_PNG_Image error handling. An error was potentially caused
- by error handling of the image library with setjmp/longjmp.
- - Fix Fl_Browser background and text color parsing (STR #3376).
- - Fix Windows CreateDC/DeleteDC mismatch (STR #3373).
- - Fix Fl_Tabs label drawing for Fl_Window children (STR #3075).
- - Fix line number alignment in Fl_Text_Display/Editor (STR #3363).
- - Fix ignored buffer pre-allocation (requestedSize) in Fl_Text_Buffer.
- See fltk.general "Fl_Text_Buffer constructor bug" on Dec 5, 2016.
- - Fix build with configure --enable-cairo --enable-cairoext,
- see this report in fltk.general:
- https://groups.google.com/forum/#!topic/fltkgeneral/x80qQ6wt0s4
-
-
- Removed Features
-
- - Bundled IDE project files (Xcode and Visual Studio) have been
- removed. Please use CMake to generate your IDE project files.
- See README.CMake.txt for more information.
- - Dropped FLTK 1.0 compatibility (macro FLTK_1_0_COMPAT). This "feature"
- was no longer usable since FLTK 1.3, hence it can be dropped safely.
diff --git a/fltk14-devel/DESCR b/fltk14-devel/DESCR
deleted file mode 100644
index e024bbcd82..0000000000
--- a/fltk14-devel/DESCR
+++ /dev/null
@@ -1,17 +0,0 @@
-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.
-
-This is a version 1.4 development snapshot. From the FLTK website:
-
- FLTK-1.4.x [under active development]
- Work on FLTK-1.4.x began at the start of 2016 because it was necessary to
- break the FLTK-1.3.x 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.x already 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.
diff --git a/fltk14-devel/Makefile b/fltk14-devel/Makefile
deleted file mode 100644
index 9877fdbca0..0000000000
--- a/fltk14-devel/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-# $NetBSD$
-
-DISTNAME= fltk-1.4.1-source
-PKGNAME= ${DISTNAME:S/-source//}
-CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_GITHUB:=fltk/}
-GITHUB_PROJECT= fltk
-GITHUB_RELEASE= release-${PKGVERSION_NOREV}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= micha%NetBSD.org@localhost
-HOMEPAGE= https://www.fltk.org/
-COMMENT= Fast Light Tool Kit for graphical user interfaces
-LICENSE= gnu-lgpl-v2
-
-USE_LANGUAGES= c c++
-USE_CC_FEATURES+= c99
-
-USE_TOOLS+= autoconf gmake nroff pkg-config
-USE_LIBTOOL= yes
-
-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
-# 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//}
-
-.include "options.mk"
-
-BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.3
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/fltk14-devel/PLIST b/fltk14-devel/PLIST
deleted file mode 100644
index 7411c4bcb5..0000000000
--- a/fltk14-devel/PLIST
+++ /dev/null
@@ -1,178 +0,0 @@
-@comment $NetBSD$
-bin/fltk-config
-bin/fltk-options
-bin/fluid
-include/FL/Enumerations.H
-include/FL/Fl.H
-include/FL/Fl_Adjuster.H
-include/FL/Fl_Anim_GIF_Image.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_Flex.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_Graphics_Driver.H
-include/FL/Fl_Grid.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_ICO_Image.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_PDF_File_Surface.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_Rect.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_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
-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_Shortcut_Button.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_Terminal.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_Widget_Surface.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/filename.H
-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
-include/FL/fl_message.H
-include/FL/fl_show_colormap.H
-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
-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/platform_types.h
-include/FL/wayland.H
-include/FL/win32.H
-include/FL/x.H
-include/FL/x11.H
-lib/libfltk.la
-${PLIST.cairo}lib/libfltk_cairo.la
-lib/libfltk_forms.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
diff --git a/fltk14-devel/README b/fltk14-devel/README
deleted file mode 100644
index 0c298e087d..0000000000
--- a/fltk14-devel/README
+++ /dev/null
@@ -1,26 +0,0 @@
-FLTK 1.4.x release candidate
-
-Enabling the untested "wayland" option should (in theory) allow to use
-the new Wayland backend.
-
-The option "cairo" enables support for the widget Fl_Cairo_Window.
-
-Glyph substitution via Pango with X11 backend is now supported.
-The "pango" option allows applications to render text using multiple fonts.
-
-Disabling the "pango" and "xft2" options allows to use X11 Core Fonts
-(rendered by the X server). Works well with network redirection of DISPLAY.
-This is for users who want the "F" in FLTK.
-
-Disabling the "xcursor", "xfixes", "xinerama" and "xrender" options allows
-to further reduce dependencies for the X11 backend.
-This is for users who want the "L" in FLTK.
-
-In general applications using the FLTK 1.3 API should work out-of-the-box
-with FLTK 1.4 too. Note: The ABI of the shared library is not compatible!
-
-
-Note:
-FLTK 1.4 will be the last release that supports old systems (C99 / C++98).
-The next release of FLTK will require at least C++11 and CMake. This will
-drop more than a decade of formerly supported systems.
diff --git a/fltk14-devel/TODO b/fltk14-devel/TODO
deleted file mode 100644
index 1a5587607e..0000000000
--- a/fltk14-devel/TODO
+++ /dev/null
@@ -1,17 +0,0 @@
-[X] Add zlib dependency
-[X] Support for HP-UX
- Fixed upstream (Issue #937).
-[X] Support for AIX
- Fixed upstream (Issue #942).
-[X] Support for NetBSD
- Fixed upstream (Issue #944).
-[X] Static libraries should not be installed with execute permissions
- "fltk.list" has entires with 444 permissions, looks like a bug.
-[X] Check for library suffixes on AIX, HP-UX and macOS
- Should use libtool like FLTK 1.3
-[X] Build test programs only on request (make test)
- This was rejected upstream (Issue #940).
- Disable build of test programs with new option "--disable-test".
-[X] Fix X11 options
-[X] Add cairo and wayland options
-[X] Add patch for fatal error: cairo.h: No such file or directory
diff --git a/fltk14-devel/buildlink3.mk b/fltk14-devel/buildlink3.mk
deleted file mode 100644
index 23106680ce..0000000000
--- a/fltk14-devel/buildlink3.mk
+++ /dev/null
@@ -1,91 +0,0 @@
-# $NetBSD$
-
-BUILDLINK_TREE+= fltk
-
-.if !defined(FLTK_BUILDLINK3_MK)
-FLTK_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.fltk+= fltk>=1.4.1
-BUILDLINK_ABI_DEPENDS.fltk?= fltk>=1.4.1
-BUILDLINK_PKGSRCDIR.fltk?= ../../wip/fltk14-devel
-BUILDLINK_FILES.fltk+= include/Fl/*
-
-.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"
-
-.endif # FLTK_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -fltk
diff --git a/fltk14-devel/distinfo b/fltk14-devel/distinfo
deleted file mode 100644
index ae6d0cd7b6..0000000000
--- a/fltk14-devel/distinfo
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-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
diff --git a/fltk14-devel/options.mk b/fltk14-devel/options.mk
deleted file mode 100644
index 539be9b103..0000000000
--- a/fltk14-devel/options.mk
+++ /dev/null
@@ -1,134 +0,0 @@
-# $NetBSD$
-
-.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
diff --git a/fltk14-devel/patches/patch-FL_Fl__Cairo.H b/fltk14-devel/patches/patch-FL_Fl__Cairo.H
deleted file mode 100644
index 0b7c53aab1..0000000000
--- a/fltk14-devel/patches/patch-FL_Fl__Cairo.H
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-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
diff --git a/fltk14-devel/patches/patch-cairo_Makefile b/fltk14-devel/patches/patch-cairo_Makefile
deleted file mode 100644
index 43a6798696..0000000000
--- a/fltk14-devel/patches/patch-cairo_Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD$
-
-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); \
diff --git a/fltk14-devel/patches/patch-configure b/fltk14-devel/patches/patch-configure
deleted file mode 100644
index 103cd521f3..0000000000
--- a/fltk14-devel/patches/patch-configure
+++ /dev/null
@@ -1,61 +0,0 @@
-$NetBSD$
-
-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
-
-
-
diff --git a/fltk14-devel/patches/patch-documentation_Makefile b/fltk14-devel/patches/patch-documentation_Makefile
deleted file mode 100644
index 8d76153e6b..0000000000
--- a/fltk14-devel/patches/patch-documentation_Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD$
-
-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"
diff --git a/fltk14-devel/patches/patch-fltk-options_Makefile b/fltk14-devel/patches/patch-fltk-options_Makefile
deleted file mode 100644
index 341b2db5ec..0000000000
--- a/fltk14-devel/patches/patch-fltk-options_Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD$
-
-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"
diff --git a/fltk14-devel/patches/patch-fluid_Makefile b/fltk14-devel/patches/patch-fluid_Makefile
deleted file mode 100644
index d85e90031d..0000000000
--- a/fltk14-devel/patches/patch-fluid_Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD$
-
-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"
diff --git a/fltk14-devel/patches/patch-makeinclude.in b/fltk14-devel/patches/patch-makeinclude.in
deleted file mode 100644
index 74c9e499d1..0000000000
--- a/fltk14-devel/patches/patch-makeinclude.in
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD$
-
-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:
diff --git a/fltk14-devel/patches/patch-src_Makefile b/fltk14-devel/patches/patch-src_Makefile
deleted file mode 100644
index 68e8d15f64..0000000000
--- a/fltk14-devel/patches/patch-src_Makefile
+++ /dev/null
@@ -1,91 +0,0 @@
-$NetBSD$
-
-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)"; \
diff --git a/fltk14-devel/patches/patch-test_Makefile b/fltk14-devel/patches/patch-test_Makefile
deleted file mode 100644
index b1f29cf889..0000000000
--- a/fltk14-devel/patches/patch-test_Makefile
+++ /dev/null
@@ -1,298 +0,0 @@
-$NetBSD$
-
-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 $@
Home |
Main Index |
Thread Index |
Old Index