Update fltk13 to 1.3.3

New features and extensions - New class Fl_Copy_Surface allows copying graphical data to the clipboard in a cross-platform way - Support for pasting graphical data from the clipboard to a widget. - New class Fl_Image_Surface allows drawing into an Fl_Image object. - Methods Fl::add_clipboard_notify() and Fl::remove_clipboard_notify() to get notifications whenever the clipboard changes - New method Fl_Window::wait_for_expose() - New bilinear scaling method for RGB images - New method Fl_Widget::top_window() - New method Fl_Widget::top_window_offset() - New Fl_Tree_Item methods label_x(), label_y(), label_w(), label_h(). - New methods Fl::enable_im() and Fl::disable_im() to enable/disable system Input Methods (IM). - New methods Fl::add_system_handler() and Fl::remove_system_handler() to intercept low level system events. - New FLTK scheme "gleam" - New method Fl::is_scheme() to compare the current scheme name. - New method to set custom icons for windows see Fl_Window::icon() for more info. - New method to set any custom cursor, based on a Fl_RGB_Image object. Also changed fallback cursors to use this method, so that fallback cursors are handled in a platform independent manner - New ability to convert Fl_Pixmap to Fl_RGB_Image - Support for full screen windows over multiple monitors. - New optional line numbers in Fl_Text_Display and options to control line numbers and word wrapping (on/off) in example test/editor.cxx. - On Linux/Unix, class Fl_Native_File_Chooser uses file dialogs from the Gnome environment (provided by the libgtk dynamic library) if available, and falls back to Fl_File_Chooser if not Use option Fl::OPTION_FNFC_USES_GTK to enable/disable this feature. - New support for the Mac OS text input system that deals with character composition and input of languages with large character sets (e.g. Chinese and Japanese). This implementation has been reported to work well for Chinese. Superficial testing suggests it's also operational for Japanese. In-depth testing remains needed though. Other improvements - Many CMake improvements - Some autoconf, configure improvements. - Removed 1024 bytes constraint in labels and browser lines - Mac OS version of Fl_Native_File_Chooser: when using filters in a save file dialog, the output file extension gets changed when the user modifies the output file type. - Many Mac OS X improvements related to Fl_Sys_Menu_Bar. - Improved Mac OS X keyboard handling of special keys or combinations. - General Mac OS X improvements, incl. high resolution (Retina) displays, and support up to Mac OS X 10.10. - Documentation improvements and clarifications. - Printing support improvements, including GL windows. - Many improvements related to Fl_Tree (some of them only as ABI breaking features, see below). - Some static data has been made 'const' to improve memory usage with shared libraries. - Don't grab navkeys with modifiers (CTRL, ALT), as the application may want them - Check compiler support of -fvisibility, -fvisibility-inlines-hidden, and use it, if available. Reduces shared library size. - Drag'n'drop behaves better now: if text is dropped in the widget it comes from, then it works like cut and paste. - Other improvements of DND handling when dragging text from other applications, e.g. Firefox and Thunderbird. - Windows message WM_QUIT is processed like SIGTERM, i.e. as a request to terminate the program. - Fluid no longer closes the code window when hitting ESC (STR #2997). - Improved Fl_Widget::when() handling in Fl_Tabs - Improved support for more recent compilers (clang and gcc) that issue more warnings, and fixed some 32-/64-bit compilation issues. - Added method Fl_Window::clear_modal_states() to make it possible to remove the modal or non-modal state from a window Bug fixes - Fixed word selection dragging in text input - Fixed crash if Fl_Window::flush() called while window not shown() - Fixed segfault in fl_set_fonts_xft.cxx when loading fonts not named as expected - Fixed a memory leak in font loading/allocation - Fixed OS X fl_read_image() and Fl_Paged_Device::print_window_part() when using a Retina display. - Fixed MinGW build if configure didn't find strcasecmp() - Fixed access of protected member under Linux/Unix - Fixed various Mac specific OpenGL issues - Fixed PostScript printing with non-english locale - Fixed a regression in Fl_File_Chooser since FLTK 1.1.8: the Enter key now selects the file again. - Fixed a bug in Fl_Native_File_Chooser (Windows) for some file name input filters - Fixed out-of-bounds memory access in Fl_Text_Display
author: markd <markd@pkgsrc.org> 2015-07-21 21:36:41 +0000
committer: markd <markd@pkgsrc.org> 2015-07-21 21:36:41 +0000
commit: 10d23f2aa5b2bcdc66e4e6d9712e8ab1ea670255 (patch)
tree: d424f6ea8ad99e250b55691ff0c016aaa8392cb1 /x11
parent: 35c1ca2cb876eaaed2a10a2f8bd535adfdf122fc (diff)
download: pkgsrc-10d23f2aa5b2bcdc66e4e6d9712e8ab1ea670255.tar.gz
15 files changed, 362 insertions, 217 deletions
diff --git a/x11/fltk13/Makefile b/x11/fltk13/Makefile
index e6733cf8dea..a079575945b 100644
--- a/x11/fltk13/Makefile
+++ b/x11/fltk13/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2015/04/25 14:25:04 tnn Exp $
+# $NetBSD: Makefile,v 1.20 2015/07/21 21:36:41 markd Exp $
 
-DISTNAME=	fltk-1.3.2-source
+DISTNAME=	fltk-1.3.3-source
 PKGNAME=	${DISTNAME:S/-source//}
 VERS=		${DISTNAME:S/fltk-//:S/-source//}
-PKGREVISION=	5
 CATEGORIES=	x11
 MASTER_SITES=	http://fltk.org/pub/fltk/${VERS}/
 
@@ -12,58 +11,6 @@ HOMEPAGE=	http://www.fltk.org/
 COMMENT=	Fast Light Tool Kit for graphical user interfaces
 LICENSE=	gnu-lgpl-v2
 
-CONFLICTS=		fltk-1.[012].*
-
-DIST_SUBDIR=	fltk13
-
-#TigerVNC requires FLTK 1.3.0 (or later). Although it will build and work
-#with plain 1.3.0, to get full functionality and the best behaviour the
-#following patches are needed
-
-# Export dead key information from FLTK to the apps
-# http://www.fltk.org/str.php?L2599
-PATCHFILES=		fltk-1_v4.3.x-keyboard-x11.patch	\
-				fltk-1_v4.3.x-keyboard-win32.patch	\
-				fltk-1_v6.3.x-keyboard-osx.patch
-PATCH_SITES=	http://www.fltk.org/strfiles/2599/
-
-# Notify applications of changes to the clipboard
-# http://www.fltk.org/str.php?L2636
-PATCHFILES+=	fltk-1.3.x-clipboard.patch	\
-				fltk-1_v5.3.x-clipboard-x11.patch	\
-				fltk-1_v3.3.x-clipboard-win32-fix.patch	\
-				fltk-1_v2.3.x-clipboard-win32.patch	\
-				fltk-1_v2.3.x-clipboard-osx.patch
-PATCH_SITES+=	http://www.fltk.org/strfiles/2636/
-
-# Ability to convert a Fl_Pixmap to a Fl_RGB_Image
-# http://www.fltk.org/str.php?L2659
-PATCHFILES+=	pixmap_v2.patch
-PATCH_SITES+=	http://www.fltk.org/strfiles/2659/
-
-# Support for custom cursors
-# http://www.fltk.org/str.php?L2660
-PATCHFILES+=	fltk-1_v5.3.x-cursor.patch
-PATCH_SITES+=	http://www.fltk.org/strfiles/2660/
-
-# Improve modality interaction with WM
-# http://www.fltk.org/str.php?L2802
-PATCHFILES+=	fltk-1_v2.3.0-modal.patch
-PATCH_SITES+=	http://www.fltk.org/strfiles/2802/
-
-# Window icons
-# http://www.fltk.org/str.php?L2816
-PATCHFILES+=	fltk-1_v3.3.0-icons.patch
-PATCH_SITES+=	http://www.fltk.org/strfiles/2816/
-
-# Multihead
-# http://fltk.org/str.php?L2860
-PATCHFILES+=	fltk-1.3.x-screen_num.patch	\
-				fltk-1_v3.3.x-multihead.patch
-PATCH_SITES+=	http://www.fltk.org/strfiles/2860/
-
-PATCH_DIST_STRIP= -p1
-
 WRKSRC=			${WRKDIR}/${DISTNAME:S/-source//}
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
@@ -91,8 +38,6 @@ CONFIGURE_ARGS+=	--with-links
 PLIST.cs=		yes
 .endif
 
-BUILDLINK_DEPMETHOD.libXt?=	build
-
 #.if !empty(PKG_OPTIONS:Mcairo)
 #.  include "../../graphics/cairo/buildlink3.mk"
 #CONFIGURE_ARGS+=	--enable-cairo
@@ -120,6 +65,7 @@ CONFIGURE_ARGS+=	--disable-localjpeg --disable-localzlib --disable-localpng
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/libXinerama/buildlink3.mk"
+BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/fltk13/PLIST b/x11/fltk13/PLIST
index 3cae253875b..2266e816298 100644
--- a/x11/fltk13/PLIST
+++ b/x11/fltk13/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2012/06/16 03:15:30 dholland Exp $
+@comment $NetBSD: PLIST,v 1.3 2015/07/21 21:36:41 markd Exp $
 bin/fltk-config
 bin/fluid
 include/FL/Enumerations.H
@@ -36,6 +36,8 @@ ${PLIST.cs}include/FL/Fl_Clock.h
 include/FL/Fl_Color_Chooser.H
 ${PLIST.cs}include/FL/Fl_Color_Chooser.h
 include/FL/Fl_Counter.H
+include/FL/Fl_Copy_Surface.H
+${PLIST.cs}include/FL/Fl_Copy_Surface.h
 ${PLIST.cs}include/FL/Fl_Counter.h
 include/FL/Fl_Device.H
 ${PLIST.cs}include/FL/Fl_Device.h
@@ -87,6 +89,8 @@ include/FL/Fl_Hor_Value_Slider.H
 ${PLIST.cs}include/FL/Fl_Hor_Value_Slider.h
 include/FL/Fl_Image.H
 ${PLIST.cs}include/FL/Fl_Image.h
+include/FL/Fl_Image_Surface.H
+${PLIST.cs}include/FL/Fl_Image_Surface.h
 include/FL/Fl_Input.H
 ${PLIST.cs}include/FL/Fl_Input.h
 include/FL/Fl_Input_.H
@@ -243,7 +247,6 @@ 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/Xutf8.h
 include/FL/dirent.h
 include/FL/filename.H
 ${PLIST.cs}include/FL/filename.h
diff --git a/x11/fltk13/distinfo b/x11/fltk13/distinfo
index 0f9ae49cf71..9503ba3db92 100644
--- a/x11/fltk13/distinfo
+++ b/x11/fltk13/distinfo
@@ -1,57 +1,20 @@
-$NetBSD: distinfo,v 1.5 2014/01/05 09:15:06 richard Exp $
+$NetBSD: distinfo,v 1.6 2015/07/21 21:36:41 markd Exp $
 
-SHA1 (fltk13/fltk-1.3.2-source.tar.gz) = 25071d6bb81cc136a449825bfd574094b48f07fb
-RMD160 (fltk13/fltk-1.3.2-source.tar.gz) = 5d697cb582cb80a1eca50c35696731eea5591768
-Size (fltk13/fltk-1.3.2-source.tar.gz) = 4260874 bytes
-SHA1 (fltk13/fltk-1.3.x-clipboard.patch) = 4b28b804b2001c622d4fc316767e27511fa69bc3
-RMD160 (fltk13/fltk-1.3.x-clipboard.patch) = 5bff97cb8b6503d92cf1bf95880198749890979a
-Size (fltk13/fltk-1.3.x-clipboard.patch) = 3329 bytes
-SHA1 (fltk13/fltk-1.3.x-screen_num.patch) = 182ed66a5c969049351f198de381f464e7476cac
-RMD160 (fltk13/fltk-1.3.x-screen_num.patch) = ba710c0cb7a88027e0f54f0f58e4ecb8a377f093
-Size (fltk13/fltk-1.3.x-screen_num.patch) = 4830 bytes
-SHA1 (fltk13/fltk-1_v2.3.0-modal.patch) = 8b4640ade4bf7ef985648408073f7d7a22c82a72
-RMD160 (fltk13/fltk-1_v2.3.0-modal.patch) = c5998624c0727a4ec429b1aa459a9ed4268c019b
-Size (fltk13/fltk-1_v2.3.0-modal.patch) = 2553 bytes
-SHA1 (fltk13/fltk-1_v2.3.x-clipboard-osx.patch) = fbfc652e640ea9aaa12dded00c91ffe73a695848
-RMD160 (fltk13/fltk-1_v2.3.x-clipboard-osx.patch) = 7094f170b29a2a50ac8cdcd41f000982e6767d80
-Size (fltk13/fltk-1_v2.3.x-clipboard-osx.patch) = 1066 bytes
-SHA1 (fltk13/fltk-1_v2.3.x-clipboard-win32.patch) = 84d94737085e951a163cc6bfe26729d4a540f2c7
-RMD160 (fltk13/fltk-1_v2.3.x-clipboard-win32.patch) = 15fff80cb09acd47afe38881a90d3917b6c4cd72
-Size (fltk13/fltk-1_v2.3.x-clipboard-win32.patch) = 3030 bytes
-SHA1 (fltk13/fltk-1_v3.3.0-icons.patch) = 78b53c7b952ca699a253717c04dfc68d77c66990
-RMD160 (fltk13/fltk-1_v3.3.0-icons.patch) = e38b0b6fe382fe1799f5d18b4eb15c131c921da2
-Size (fltk13/fltk-1_v3.3.0-icons.patch) = 17612 bytes
-SHA1 (fltk13/fltk-1_v3.3.x-clipboard-win32-fix.patch) = dc19608d7ba073eb5293188422570c8103198ad8
-RMD160 (fltk13/fltk-1_v3.3.x-clipboard-win32-fix.patch) = 5ec128881743247799434b55b4d6c5e25927cb17
-Size (fltk13/fltk-1_v3.3.x-clipboard-win32-fix.patch) = 4979 bytes
-SHA1 (fltk13/fltk-1_v3.3.x-multihead.patch) = 60ef2505beac83db5fde3188818839b17aa603d0
-RMD160 (fltk13/fltk-1_v3.3.x-multihead.patch) = d114faabfcfd624c20a03539ae500ac9cc0471d6
-Size (fltk13/fltk-1_v3.3.x-multihead.patch) = 16587 bytes
-SHA1 (fltk13/fltk-1_v4.3.x-keyboard-win32.patch) = 0b56f2244ff8bf049d131c43366a26ad0aada8a3
-RMD160 (fltk13/fltk-1_v4.3.x-keyboard-win32.patch) = 5ea75891e8fce7c0b46dd0bd3ded32dbb2953edb
-Size (fltk13/fltk-1_v4.3.x-keyboard-win32.patch) = 8617 bytes
-SHA1 (fltk13/fltk-1_v4.3.x-keyboard-x11.patch) = 163246d93e4ea6551d84dd81efc6c9bc61017b46
-RMD160 (fltk13/fltk-1_v4.3.x-keyboard-x11.patch) = 34b6b96eb38fd2f231289ddce77b3ba8b2f7a5dc
-Size (fltk13/fltk-1_v4.3.x-keyboard-x11.patch) = 9680 bytes
-SHA1 (fltk13/fltk-1_v5.3.x-clipboard-x11.patch) = 1b1a1ca2d17b302520ff5e88562c67724103c21e
-RMD160 (fltk13/fltk-1_v5.3.x-clipboard-x11.patch) = 796a7b8deb31cd8fca585d6ef6892d4578ed1662
-Size (fltk13/fltk-1_v5.3.x-clipboard-x11.patch) = 11299 bytes
-SHA1 (fltk13/fltk-1_v5.3.x-cursor.patch) = 299a86738988132c16ac2aa6260853712d20e234
-RMD160 (fltk13/fltk-1_v5.3.x-cursor.patch) = f5e3077799df9705b4e293631f5b8be3eb91447c
-Size (fltk13/fltk-1_v5.3.x-cursor.patch) = 50427 bytes
-SHA1 (fltk13/fltk-1_v6.3.x-keyboard-osx.patch) = cb5e1eeb66710e7d38a9639516762efe5d9583d8
-RMD160 (fltk13/fltk-1_v6.3.x-keyboard-osx.patch) = 4f0e2baa4f6db212d80f9d773840ed8c50cf110a
-Size (fltk13/fltk-1_v6.3.x-keyboard-osx.patch) = 12256 bytes
-SHA1 (fltk13/pixmap_v2.patch) = 334b6d570f95cd6759ac13a59fa20d63b05fbbd9
-RMD160 (fltk13/pixmap_v2.patch) = d91fb98e3175a68e96095a7a7c5aa0fb53001086
-Size (fltk13/pixmap_v2.patch) = 15506 bytes
-SHA1 (patch-FL_Fl_Widget.H) = 718b1f0a5e61e728c093ef4b52c2be3675a7c0d1
+SHA1 (fltk-1.3.3-source.tar.gz) = 873aac49b277149e054b9740378e2ca87b0bd435
+RMD160 (fltk-1.3.3-source.tar.gz) = a1736ec7da1ff751153e09bc5b5136d2fa95c18b
+Size (fltk-1.3.3-source.tar.gz) = 4986376 bytes
+SHA1 (patch-FL_Enumerations.H) = 88fd3fc95e361604b3ec735fcf23865db02152e2
+SHA1 (patch-FL_Fl_Widget.H) = c2a80956ba2245a9addb53ca974d658020c5525d
 SHA1 (patch-aa) = 777b293800af60ac508968946bcb9bc448c1ea00
-SHA1 (patch-ab) = 2c50743af303ac4a153f14061271d99d589f6e86
+SHA1 (patch-ab) = fa941f28b2c17577a8473313f4906e8724183906
 SHA1 (patch-ac) = 9ab9a8ab5d2fd54ff0fcdeb7e2486aa3b83be5de
 SHA1 (patch-ad) = 01a25d7265784572fbd0c7d2c6f029d45333ad21
-SHA1 (patch-ae) = e043676f7e111e343bccd6e49f83d11a018fa431
+SHA1 (patch-ae) = 88da94679399b3a8710c23b7f41a7debc8bc92b8
 SHA1 (patch-af) = a4154e31fca9ecf125922a84ac39771bc71dcb0f
-SHA1 (patch-ag) = 87e890ac44b864c224855611942d58dd0ba4b2c9
-SHA1 (patch-fluid_Fl__Type.h) = b404853054a148781af8e8b92cba081154c09686
-SHA1 (patch-test_Makefile) = 708decc3be69a9a4db82ab6fe473cf3417c969f2
+SHA1 (patch-ag) = 61e6d166d0910e02558bacea629f7fb736f7304c
+SHA1 (patch-src_Fl.cxx) = cbd014ab18b1ebcb32a7d249d5dd09caf3547e05
+SHA1 (patch-src_Fl_cocoa.mm) = 878038c611623b5337634e43d756bfb291872b18
+SHA1 (patch-src_Fl_grab.cxx) = 21666c5b577c9f346b506a1c79c9a56ff30f886a
+SHA1 (patch-src_Fl_x.cxx) = ca7e4b98c52a84d0bc23ecf33fc30f94c0d16d35
+SHA1 (patch-src_xutf8_imKStoUCS.c) = 55ba2343b6f021bba03f67410078ae419b3354be
+SHA1 (patch-test_Makefile) = 5c3ad88366f45af1580690af938d54cd81b6beb7
diff --git a/x11/fltk13/patches/patch-FL_Enumerations.H b/x11/fltk13/patches/patch-FL_Enumerations.H
new file mode 100644
index 00000000000..05773b44001
--- /dev/null
+++ b/x11/fltk13/patches/patch-FL_Enumerations.H
@@ -0,0 +1,53 @@
+$NetBSD: patch-FL_Enumerations.H,v 1.1 2015/07/21 21:36:41 markd Exp $
+
+part of tigervnc.patch from archlinux package.
+
+--- FL/Enumerations.H.orig	2014-10-15 21:00:20.000000000 +0000
++++ FL/Enumerations.H
+@@ -909,27 +909,27 @@ inline Fl_Color fl_color_cube(int r, int
+ /* FIXME: We should renumber these, but that will break the ABI */
+ enum Fl_Cursor {
+   FL_CURSOR_DEFAULT    =  0, /**< the default cursor, usually an arrow. */
+-  FL_CURSOR_ARROW      = 35, /**< an arrow pointer. */
+-  FL_CURSOR_CROSS      = 66, /**< crosshair. */
+-  FL_CURSOR_WAIT       = 76, /**< busy indicator (e.g. hourglass). */
+-  FL_CURSOR_INSERT     = 77, /**< I-beam. */
+-  FL_CURSOR_HAND       = 31, /**< pointing hand. */
+-  FL_CURSOR_HELP       = 47, /**< question mark pointer. */
+-  FL_CURSOR_MOVE       = 27, /**< 4-pointed arrow or hand. */
++  FL_CURSOR_ARROW      = 1, /**< an arrow pointer. */
++  FL_CURSOR_CROSS      = 2, /**< crosshair. */
++  FL_CURSOR_WAIT       = 3, /**< busy indicator (e.g. hourglass). */
++  FL_CURSOR_INSERT     = 4, /**< I-beam. */
++  FL_CURSOR_HAND       = 5, /**< pointing hand. */
++  FL_CURSOR_HELP       = 6, /**< question mark pointer. */
++  FL_CURSOR_MOVE       = 7, /**< 4-pointed arrow or hand. */
+ 
+   /* Resize indicators */
+-  FL_CURSOR_NS         = 78, /**< up/down resize. */
+-  FL_CURSOR_WE         = 79, /**< left/right resize. */
+-  FL_CURSOR_NWSE       = 80, /**< diagonal resize. */
+-  FL_CURSOR_NESW       = 81, /**< diagonal resize. */
+-  FL_CURSOR_N          = 70, /**< upwards resize. */
+-  FL_CURSOR_NE         = 69, /**< upwards, right resize. */
+-  FL_CURSOR_E          = 49, /**< rightwards resize. */
+-  FL_CURSOR_SE         =  8, /**< downwards, right resize. */
+-  FL_CURSOR_S          =  9, /**< downwards resize. */
+-  FL_CURSOR_SW         =  7, /**< downwards, left resize. */
+-  FL_CURSOR_W          = 36, /**< leftwards resize. */
+-  FL_CURSOR_NW         = 68, /**< upwards, left resize. */
++  FL_CURSOR_NS         = 101, /**< up/down resize. */
++  FL_CURSOR_WE         = 102, /**< left/right resize. */
++  FL_CURSOR_NWSE       = 103, /**< diagonal resize. */
++  FL_CURSOR_NESW       = 104, /**< diagonal resize. */
++  FL_CURSOR_NE         = 110, /**< upwards, right resize. */
++  FL_CURSOR_N          = 111, /**< upwards resize. */
++  FL_CURSOR_NW         = 112, /**< upwards, left resize. */
++  FL_CURSOR_E          = 113, /**< rightwards resize. */
++  FL_CURSOR_W          = 114, /**< leftwards resize. */
++  FL_CURSOR_SE         = 115, /**< downwards, right resize. */
++  FL_CURSOR_S          = 116, /**< downwards resize. */
++  FL_CURSOR_SW         = 117, /**< downwards, left resize. */
+ 
+   FL_CURSOR_NONE       =255  /**< invisible. */
+ };
diff --git a/x11/fltk13/patches/patch-FL_Fl_Widget.H b/x11/fltk13/patches/patch-FL_Fl_Widget.H
index 391232f4e25..beb55a95785 100644
--- a/x11/fltk13/patches/patch-FL_Fl_Widget.H
+++ b/x11/fltk13/patches/patch-FL_Fl_Widget.H
@@ -1,10 +1,12 @@
-$NetBSD: patch-FL_Fl_Widget.H,v 1.1 2012/04/19 21:09:29 joerg Exp $
+$NetBSD: patch-FL_Fl_Widget.H,v 1.2 2015/07/21 21:36:41 markd Exp $
 
 Fl_X tries to access protected members of Fl_Widget.
 
---- FL/Fl_Widget.H.orig	2012-04-19 16:12:57.000000000 +0000
+and part of tigervnc.patch from archlinux package. 
+
+--- FL/Fl_Widget.H.orig	2014-09-08 08:55:49.000000000 +0000
 +++ FL/Fl_Widget.H
-@@ -108,6 +108,7 @@ struct FL_EXPORT Fl_Label {
+@@ -99,6 +99,7 @@ struct FL_EXPORT Fl_Label {
   */
  class FL_EXPORT Fl_Widget {
    friend class Fl_Group;
@@ -12,3 +14,47 @@ Fl_X tries to access protected members of Fl_Widget.
  
    Fl_Group* parent_;
    Fl_Callback* callback_;
+@@ -172,6 +173,7 @@ protected:
+         COPIED_TOOLTIP  = 1<<17,  ///< the widget tooltip is internally copied, its destruction is handled by the widget
+         FULLSCREEN      = 1<<18,  ///< a fullscreen window (Fl_Window)
+         MAC_USE_ACCENTS_MENU = 1<<19, ///< On the Mac OS platform, pressing and holding a key on the keyboard opens an accented-character menu window (Fl_Input_, Fl_Text_Editor)
++       SIMPLE_KEYBOARD = 1<<20,  ///< the widget wants simple, consistent keypresses and not advanced input (like character composition and CJK input)
+         // (space for more flags)
+         USERFLAG3       = 1<<29,  ///< reserved for 3rd party extensions
+         USERFLAG2       = 1<<30,  ///< reserved for 3rd party extensions
+@@ -789,6 +791,35 @@ public:
+    */
+   void set_active() {flags_ &= ~INACTIVE;}
+ 
++  /** 
++      Returns if the widget sees a simplified keyboard model or not.
++
++      Normally widgets get a full-featured keyboard model that is geared
++      towards text input. This includes support for compose sequences and
++      advanced input methods, commonly used for asian writing system. This
++      system however has downsides in that extra graphic can be presented
++      to the user and that a physical key press doesn't correspond directly
++      to a FLTK event.
++
++      Widgets that need a direct correspondence between actual key events
++      and those seen by the widget can swith to the simplified keyboard
++      model.
++
++     \retval 0 if the widget uses the normal keyboard model
++     \see set_changed(), clear_changed()
++   */
++  unsigned int simple_keyboard() const {return flags_&SIMPLE_KEYBOARD;}
++
++  /** Marks a widget to use the simple keyboard model.
++      \see changed(), clear_changed()
++   */
++  void set_simple_keyboard() {flags_ |= SIMPLE_KEYBOARD;}
++
++  /** Marks a widget to use the normal keyboard model.
++      \see changed(), set_changed()
++   */
++  void set_normal_keyboard() {flags_ &= ~SIMPLE_KEYBOARD;}
++
+   /** Gives the widget the keyboard focus.
+       Tries to make this widget be the Fl::focus() widget, by first sending 
+       it an FL_FOCUS event, and if it returns non-zero, setting 
diff --git a/x11/fltk13/patches/patch-ab b/x11/fltk13/patches/patch-ab
index 2ffe7a5e0f3..0fee29e8b7a 100644
--- a/x11/fltk13/patches/patch-ab
+++ b/x11/fltk13/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2011/12/01 16:35:12 is Exp $
+$NetBSD: patch-ab,v 1.2 2015/07/21 21:36:41 markd Exp $
 
---- configure.in.orig	2011-03-06 16:54:58.000000000 +0000
+--- configure.in.orig	2014-10-30 14:07:58.000000000 +0000
 +++ configure.in
-@@ -187,6 +187,7 @@ AC_SUBST(IMGLIBNAME)
+@@ -157,6 +157,7 @@ AC_SUBST(IMGLIBNAME)
  AC_SUBST(CAIROLIBNAME)
  AC_SUBST(LIBEXT)
  AC_SUBST(LIBNAME)
@@ -10,10 +10,10 @@ $NetBSD: patch-ab,v 1.1.1.1 2011/12/01 16:35:12 is Exp $
  AC_SUBST(LINKFLTK)
  AC_SUBST(LINKFLTKFORMS)
  AC_SUBST(LINKFLTKGL)
-@@ -215,6 +216,15 @@ fi
- AC_ARG_ENABLE(gl, [  --enable-gl             turn on OpenGL support [default=yes]])
+@@ -185,6 +186,15 @@ fi
+ AC_ARG_ENABLE(gl, [  --enable-gl             turn on OpenGL support [[default=yes]]])
  
- AC_ARG_ENABLE(shared, [  --enable-shared         turn on shared libraries [default=no]])
+ AC_ARG_ENABLE(shared, [  --enable-shared         turn on shared libraries [[default=no]]])
 +AC_ARG_ENABLE(libtool, [  --enable-libtool=LIBTOOL_PATH
 +                          turn on building with libtool [default=no]],[
 +if eval "test x$enable_libtool != xno"; then
@@ -26,7 +26,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2011/12/01 16:35:12 is Exp $
  if test x$enable_shared = xyes; then
      PICFLAG=1
      SHAREDSUFFIX=""
-@@ -353,6 +363,21 @@ else
+@@ -358,6 +368,21 @@ else
      LINKSHARED="$LINKFLTKCAIRO ../lib/libfltk_images.a ../lib/libfltk_forms.a ../lib/libfltk.a"
  fi
  
diff --git a/x11/fltk13/patches/patch-ae b/x11/fltk13/patches/patch-ae
index ee4f792edbb..af8c504f002 100644
--- a/x11/fltk13/patches/patch-ae
+++ b/x11/fltk13/patches/patch-ae
@@ -1,17 +1,17 @@
-$NetBSD: patch-ae,v 1.1.1.1 2011/12/01 16:35:13 is Exp $
+$NetBSD: patch-ae,v 1.2 2015/07/21 21:36:41 markd Exp $
 
---- fluid/Makefile.orig	2010-12-20 20:33:24.000000000 +0000
+--- fluid/Makefile.orig	2013-09-21 17:23:09.000000000 +0000
 +++ fluid/Makefile
-@@ -57,7 +57,7 @@ all:	$(FLUID) fluid$(EXEEXT)
+@@ -48,7 +48,7 @@ all:	$(FLUID) fluid$(EXEEXT)
  fluid$(EXEEXT):		$(OBJECTS) $(LIBNAME) $(FLLIBNAME) \
  			$(IMGLIBNAME)
  	echo Linking $@...
--	$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS)
-+	${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(OBJECTS:.o=.lo) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS)
+-	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS)
++	${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS)
  	$(OSX_ONLY) $(INSTALL_BIN) fluid fluid.app/Contents/MacOS
  
  fluid-shared$(EXEEXT):	$(OBJECTS) ../src/$(DSONAME) ../src/$(FLDSONAME) \
-@@ -79,7 +79,7 @@ include makedepend
+@@ -70,7 +70,7 @@ include makedepend
  install: all
  	echo "Installing FLUID in $(DESTDIR)$(bindir)..."
  	-$(INSTALL_DIR) $(DESTDIR)$(bindir)
diff --git a/x11/fltk13/patches/patch-ag b/x11/fltk13/patches/patch-ag
index 6a7f903ad97..c5f556a61ae 100644
--- a/x11/fltk13/patches/patch-ag
+++ b/x11/fltk13/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.1.1.1 2011/12/01 16:35:13 is Exp $
+$NetBSD: patch-ag,v 1.2 2015/07/21 21:36:41 markd Exp $
 
---- src/Makefile.orig	2009-07-02 09:42:17.000000000 +0000
+--- src/Makefile.orig	2014-10-30 16:05:22.000000000 +0000
 +++ src/Makefile
-@@ -208,6 +208,10 @@ $(LIBNAME): $(OBJECTS)
+@@ -234,6 +234,10 @@ $(LIBNAME): $(OBJECTS)
  	$(LIBCOMMAND) $@ $(OBJECTS)
  	$(RANLIB) $@
  
@@ -12,8 +12,8 @@ $NetBSD: patch-ag,v 1.1.1.1 2011/12/01 16:35:13 is Exp $
 +
  libfltk.so.1.3: $(OBJECTS)
  	echo $(DSOCOMMAND) $@ ...
- 	$(DSOCOMMAND) $@ $(OBJECTS)
-@@ -244,6 +248,10 @@ $(FLLIBNAME): $(FLOBJECTS)
+ 	$(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS)
+@@ -270,6 +274,10 @@ $(FLLIBNAME): $(FLOBJECTS)
  	$(LIBCOMMAND) $@ $(FLOBJECTS)
  	$(RANLIB) $@
  
@@ -23,8 +23,8 @@ $NetBSD: patch-ag,v 1.1.1.1 2011/12/01 16:35:13 is Exp $
 +
  libfltk_forms.so.1.3: $(FLOBJECTS) libfltk.so.1.3
  	echo $(DSOCOMMAND) $@ ...
- 	$(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk
-@@ -280,6 +288,10 @@ $(GLLIBNAME): $(GLOBJECTS)
+ 	$(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk $(LDLIBS)
+@@ -306,6 +314,10 @@ $(GLLIBNAME): $(GLOBJECTS)
  	$(LIBCOMMAND) $@ $(GLOBJECTS)
  	$(RANLIB) $@
  
@@ -34,8 +34,8 @@ $NetBSD: patch-ag,v 1.1.1.1 2011/12/01 16:35:13 is Exp $
 +
  libfltk_gl.so.1.3: $(GLOBJECTS) libfltk.so.1.3
  	echo $(DSOCOMMAND) $@ ...
- 	$(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk
-@@ -316,6 +328,10 @@ $(IMGLIBNAME): $(IMGOBJECTS)
+ 	$(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk $(LDLIBS) $(GLDLIBS)
+@@ -342,6 +354,10 @@ $(IMGLIBNAME): $(IMGOBJECTS)
  	$(LIBCOMMAND) $@ $(IMGOBJECTS)
  	$(RANLIB) $@
  
@@ -45,8 +45,8 @@ $NetBSD: patch-ag,v 1.1.1.1 2011/12/01 16:35:13 is Exp $
 +
  libfltk_images.so.1.3: $(IMGOBJECTS) libfltk.so.1.3
  	echo $(DSOCOMMAND) $@ ...
- 	$(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk
-@@ -504,6 +520,9 @@ install: $(LIBNAME) $(DSONAME) \
+ 	$(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk $(LDLIBS)
+@@ -568,6 +584,9 @@ install: $(LIBNAME) $(DSONAME) \
  		$(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBBASENAME); \
  	fi
  	$(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBBASENAME)
@@ -56,7 +56,7 @@ $NetBSD: patch-ag,v 1.1.1.1 2011/12/01 16:35:13 is Exp $
  	if test x$(DSONAME) = xlibfltk.so.1.3; then\
  		$(RM) $(DESTDIR)$(libdir)/libfltk.so*;\
  		$(INSTALL_LIB) libfltk.so.1.3 $(DESTDIR)$(libdir); \
-@@ -523,6 +542,9 @@ install: $(LIBNAME) $(DSONAME) \
+@@ -587,6 +606,9 @@ install: $(LIBNAME) $(DSONAME) \
  		$(RM) $(DESTDIR)$(libdir)/libfltk_s.a;\
  		$(INSTALL_LIB) libfltk_s.a $(DESTDIR)$(libdir); \
  	fi
@@ -66,7 +66,7 @@ $NetBSD: patch-ag,v 1.1.1.1 2011/12/01 16:35:13 is Exp $
  	if test x$(DSONAME) = xcygfltknox-1.3.dll; then\
  		$(RM) $(DESTDIR)$(bindir)/$(DSONAME);\
  		$(INSTALL_LIB) $(DSONAME) $(DESTDIR)$(bindir); \
-@@ -540,6 +562,9 @@ install: $(LIBNAME) $(DSONAME) \
+@@ -604,6 +626,9 @@ install: $(LIBNAME) $(DSONAME) \
  		$(INSTALL_LIB) libfltk_forms.so.1.3 $(DESTDIR)$(libdir); \
  		$(LN) libfltk_forms.so.1.3 $(DESTDIR)$(libdir)/libfltk_forms.so;\
  	fi
@@ -76,7 +76,7 @@ $NetBSD: patch-ag,v 1.1.1.1 2011/12/01 16:35:13 is Exp $
  	if test x$(FLDSONAME) = xlibfltk_forms.sl.1.3; then\
  		$(RM) $(DESTDIR)$(libdir)/libfltk_forms.sl*;\
  		$(INSTALL_LIB) libfltk_forms.sl.1.3 $(DESTDIR)$(libdir); \
-@@ -597,6 +622,9 @@ install: $(LIBNAME) $(DSONAME) \
+@@ -661,6 +686,9 @@ install: $(LIBNAME) $(DSONAME) \
  		$(RM) $(DESTDIR)$(libdir)/libfltk_gl.dll.a;\
  		$(INSTALL_LIB) libfltk_gl.dll.a $(DESTDIR)$(libdir); \
  	fi
diff --git a/x11/fltk13/patches/patch-fluid_Fl__Type.h b/x11/fltk13/patches/patch-fluid_Fl__Type.h
deleted file mode 100644
index 35ae26e0e23..00000000000
--- a/x11/fltk13/patches/patch-fluid_Fl__Type.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-fluid_Fl__Type.h,v 1.1 2013/07/13 19:44:54 joerg Exp $
-
-Friends may not declare default arguments with being a definition.
-
---- fluid/Fl_Type.h.orig	2013-07-12 17:49:55.000000000 +0000
-+++ fluid/Fl_Type.h
-@@ -36,7 +36,7 @@ void set_modflag(int mf);
- class Fl_Type {
- 
-   friend class Widget_Browser;
--  friend Fl_Widget *make_type_browser(int,int,int,int,const char *l=0);
-+  friend Fl_Widget *make_type_browser(int,int,int,int,const char *l);
-   friend class Fl_Window_Type;
-   virtual void setlabel(const char *); // virtual part of label(char*)
- 
diff --git a/x11/fltk13/patches/patch-src_Fl.cxx b/x11/fltk13/patches/patch-src_Fl.cxx
new file mode 100644
index 00000000000..e425a4bbd4f
--- /dev/null
+++ b/x11/fltk13/patches/patch-src_Fl.cxx
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_Fl.cxx,v 1.1 2015/07/21 21:36:41 markd Exp $
+
+part of tigervnc.patch from archlinux package. 
+
+--- src/Fl.cxx.orig	2014-10-08 12:47:20.000000000 +0000
++++ src/Fl.cxx
+@@ -70,6 +70,8 @@ void fl_cleanup_dc_list(void);
+ extern double fl_mac_flush_and_wait(double time_to_wait);
+ #endif // WIN32
+ 
++extern void fl_update_focus(void);
++
+ //
+ // Globals...
+ //
+@@ -982,6 +984,8 @@ void Fl::focus(Fl_Widget *o) {
+       fl_oldfocus = p;
+     }
+     e_number = old_event;
++    // let the platform code do what it needs
++    fl_update_focus();
+   }
+ }
+ 
diff --git a/x11/fltk13/patches/patch-src_Fl_cocoa.mm b/x11/fltk13/patches/patch-src_Fl_cocoa.mm
new file mode 100644
index 00000000000..4242ea9b7cd
--- /dev/null
+++ b/x11/fltk13/patches/patch-src_Fl_cocoa.mm
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_Fl_cocoa.mm,v 1.1 2015/07/21 21:36:41 markd Exp $
+
+part of tigervnc.patch from archlinux package. 
+
+--- src/Fl_cocoa.mm.orig	2014-11-02 21:06:07.000000000 +0000
++++ src/Fl_cocoa.mm
+@@ -724,7 +724,7 @@ void Fl::remove_timeout(Fl_Timeout_Handl
+     return NO;	// prevent the caption to be redrawn as active on click
+ 		//  when another modal window is currently the key win
+ 
+-  return !(w->tooltip_window() || w->menu_window());
++  return !w->tooltip_window();
+ }
+ 
+ - (BOOL)canBecomeMainWindow
diff --git a/x11/fltk13/patches/patch-src_Fl_grab.cxx b/x11/fltk13/patches/patch-src_Fl_grab.cxx
new file mode 100644
index 00000000000..90bb6e63468
--- /dev/null
+++ b/x11/fltk13/patches/patch-src_Fl_grab.cxx
@@ -0,0 +1,30 @@
+$NetBSD: patch-src_Fl_grab.cxx,v 1.1 2015/07/21 21:36:41 markd Exp $
+
+part of tigervnc.patch from archlinux package. 
+
+--- src/Fl_grab.cxx.orig	2012-03-23 16:47:53.000000000 +0000
++++ src/Fl_grab.cxx
+@@ -29,6 +29,7 @@
+ // override_redirect, it does similar things on WIN32.
+ 
+ extern void fl_fix_focus(); // in Fl.cxx
++extern void fl_update_focus(void);
+ 
+ #ifdef WIN32
+ // We have to keep track of whether we have captured the mouse, since
+@@ -80,6 +81,7 @@ void Fl::grab(Fl_Window* win) {
+ #endif
+     }
+     grab_ = win;
++    fl_update_focus();
+   } else {
+     if (grab_) {
+ #ifdef WIN32
+@@ -98,6 +100,7 @@ void Fl::grab(Fl_Window* win) {
+       XFlush(fl_display);
+ #endif
+       grab_ = 0;
++      fl_update_focus();
+       fl_fix_focus();
+     }
+   }
diff --git a/x11/fltk13/patches/patch-src_Fl_x.cxx b/x11/fltk13/patches/patch-src_Fl_x.cxx
new file mode 100644
index 00000000000..b08a3acb55a
--- /dev/null
+++ b/x11/fltk13/patches/patch-src_Fl_x.cxx
@@ -0,0 +1,45 @@
+$NetBSD: patch-src_Fl_x.cxx,v 1.1 2015/07/21 21:36:41 markd Exp $
+
+part of tigervnc.patch from archlinux package. 
+
+--- src/Fl_x.cxx.orig	2014-10-29 20:25:46.000000000 +0000
++++ src/Fl_x.cxx
+@@ -666,6 +666,30 @@ void Fl::disable_im() {
+   fl_xim_deactivate();
+ }
+ 
++extern Fl_Window *fl_xfocus;
++
++void fl_update_focus(void)
++{
++  Fl_Widget *focus;
++
++  focus = Fl::grab();
++  if (!focus)
++    focus = Fl::focus();
++  if (!focus)
++    return;
++
++  if (focus->simple_keyboard()) {
++    fl_xim_deactivate();
++  } else {
++    // fl_xfocus should always be set if something has focus, but let's
++    // play it safe
++    if (!fl_xfocus || !fl_xid(fl_xfocus))
++      return;
++
++    fl_xim_activate(fl_xid(fl_xfocus));
++  }
++}
++
+ void fl_open_display() {
+   if (fl_display) return;
+ 
+@@ -2211,6 +2235,7 @@ int Fl_X::ewmh_supported() {
+   static int result = -1;
+ 
+   if (result == -1) {
++    fl_open_display();
+     result = 0;
+     unsigned long nitems;
+     unsigned long *words = 0;
diff --git a/x11/fltk13/patches/patch-src_xutf8_imKStoUCS.c b/x11/fltk13/patches/patch-src_xutf8_imKStoUCS.c
new file mode 100644
index 00000000000..f13cecee514
--- /dev/null
+++ b/x11/fltk13/patches/patch-src_xutf8_imKStoUCS.c
@@ -0,0 +1,28 @@
+$NetBSD: patch-src_xutf8_imKStoUCS.c,v 1.1 2015/07/21 21:36:41 markd Exp $
+
+part of tigervnc.patch from archlinux package. 
+
+--- src/xutf8/imKStoUCS.c.orig	2014-08-21 14:03:52.000000000 +0000
++++ src/xutf8/imKStoUCS.c
+@@ -266,6 +266,12 @@ static unsigned short const keysym_to_un
+     0x20a8, 0x20a9, 0x20aa, 0x20ab, 0x20ac                          /* 0x20a8-0x20af */
+ };
+ 
++static unsigned short const keysym_to_unicode_fe50_fe60[] = {
++    0x0300, 0x0301, 0x0302, 0x0303, 0x0304, 0x0306, 0x0307, 0x0308, /* 0xfe50-0xfe57 */
++    0x030a, 0x030b, 0x030c, 0x0327, 0x0328, 0x1da5, 0x3099, 0x309a, /* 0xfe58-0xfe5f */
++    0x0323                                                          /* 0xfe60-0xfe67 */
++};
++
+ static unsigned int
+ KeySymToUcs4(KeySym keysym)
+ {
+@@ -315,6 +321,8 @@ KeySymToUcs4(KeySym keysym)
+ 	return keysym_to_unicode_1e9f_1eff[keysym - 0x1e9f];
+     else if (keysym > 0x209f && keysym < 0x20ad)
+ 	return keysym_to_unicode_20a0_20ac[keysym - 0x20a0];
++    else if (keysym > 0xfe4f && keysym < 0xfe61)
++	return keysym_to_unicode_fe50_fe60[keysym - 0xfe50];
+     else 
+ 	return 0;
+ }
diff --git a/x11/fltk13/patches/patch-test_Makefile b/x11/fltk13/patches/patch-test_Makefile
index a9b0c54b539..04e1caf75da 100644
--- a/x11/fltk13/patches/patch-test_Makefile
+++ b/x11/fltk13/patches/patch-test_Makefile
@@ -1,189 +1,196 @@
-$NetBSD: patch-test_Makefile,v 1.2 2013/06/09 16:09:35 ryoon Exp $
+$NetBSD: patch-test_Makefile,v 1.3 2015/07/21 21:36:41 markd Exp $
 
---- test/Makefile.orig	2012-12-05 14:53:03.000000000 +0000
+--- test/Makefile.orig	2014-09-26 23:58:05.000000000 +0000
 +++ test/Makefile
-@@ -295,19 +295,19 @@ buttons$(EXEEXT): buttons.o
+@@ -302,19 +302,19 @@ buttons$(EXEEXT): buttons.o
  
  blocks$(EXEEXT): blocks.o
  	echo Linking $@...
--	$(CXX) $(ARCHFLAGS) $(LDFLAGS) blocks.o -o $@ $(AUDIOLIBS) $(LINKFLTK) $(LDLIBS)
-+	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) blocks.o -o $@ $(AUDIOLIBS) $(LINKFLTK) $(LDLIBS)
+-	$(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) $(INSTALL_BIN) blocks$(EXEEXT) blocks.app/Contents/MacOS
  
  checkers$(EXEEXT): checkers.o
  	echo Linking $@...
--	$(CXX) $(ARCHFLAGS) $(LDFLAGS) checkers.o -o $@ $(LINKFLTK) $(LDLIBS)
-+	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) checkers.o -o $@ $(LINKFLTK) $(LDLIBS)
+-	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) checkers.o -o $@ $(LINKFLTK) $(LDLIBS)
++	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) checkers.o -o $@ $(LINKFLTK) $(LDLIBS)
  	$(OSX_ONLY) $(INSTALL_BIN) checkers$(EXEEXT) checkers.app/Contents/MacOS
  
  clock$(EXEEXT): clock.o
  
  colbrowser$(EXEEXT): colbrowser.o
  	echo Linking $@...
--	$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ colbrowser.o $(LINKFLTKFORMS) $(LDLIBS)
-+	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ colbrowser.o $(LINKFLTKFORMS) $(LDLIBS)
+-	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ colbrowser.o $(LINKFLTKFORMS) $(LDLIBS)
++	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ colbrowser.o $(LINKFLTKFORMS) $(LDLIBS)
  	$(OSX_ONLY) ../fltk-config --post $@
  
  color_chooser$(EXEEXT): color_chooser.o
-@@ -318,18 +318,18 @@ curve$(EXEEXT): curve.o
+@@ -325,18 +325,18 @@ curve$(EXEEXT): curve.o
  
  demo$(EXEEXT): demo.o
  	echo Linking $@...
--	$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ demo.o $(LINKFLTKFORMS) $(LDLIBS)
-+	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ demo.o $(LINKFLTKFORMS) $(LDLIBS)
+-	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ demo.o $(LINKFLTKFORMS) $(LDLIBS)
++	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ demo.o $(LINKFLTKFORMS) $(LDLIBS)
  
  device$(EXEEXT): device.o $(IMGLIBNAME)
  	echo Linking $@...
--	$(CXX) $(ARCHFLAGS) $(LDFLAGS) device.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
-+	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) device.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
+-	$(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) $(LDFLAGS) editor.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
-+	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) editor.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
+-	$(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 $@
  
  fast_slow$(EXEEXT): fast_slow.o
-@@ -337,21 +337,21 @@ fast_slow.cxx:	fast_slow.fl ../fluid/flu
+@@ -344,21 +344,21 @@ fast_slow.cxx:	fast_slow.fl ../fluid/flu
  
  file_chooser$(EXEEXT): file_chooser.o $(IMGLIBNAME)
  	echo Linking $@...
--	$(CXX) $(ARCHFLAGS) $(LDFLAGS) file_chooser.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
-+	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) file_chooser.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
+-	$(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 $@
  
  fonts$(EXEEXT): fonts.o
  
  forms$(EXEEXT): forms.o
  	echo Linking $@...
--	$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ forms.o $(LINKFLTKFORMS) $(LDLIBS)
-+	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ forms.o $(LINKFLTKFORMS) $(LDLIBS)
+-	$(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 $@
  
  hello$(EXEEXT): hello.o
  
  help$(EXEEXT): help.o $(IMGLIBNAME)
  	echo Linking $@...
--	$(CXX) $(ARCHFLAGS) $(LDFLAGS) help.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
-+	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) help.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
+-	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) help.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
++	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) help.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
  	$(OSX_ONLY) ../fltk-config --post $@
  
- iconize$(EXEEXT): iconize.o
-@@ -367,14 +367,14 @@ input_choice$(EXEEXT): input_choice.o
+ icon$(EXEEXT): icon.o
+@@ -376,14 +376,14 @@ input_choice$(EXEEXT): input_choice.o
  
  keyboard$(EXEEXT): keyboard_ui.o keyboard.o
  	echo Linking $@...
--	$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ keyboard.o keyboard_ui.o $(LINKFLTK) $(LDLIBS)
-+	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ keyboard.o keyboard_ui.o $(LINKFLTK) $(LDLIBS)
+-	$(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) $(LDFLAGS) -o $@ label.o $(LINKFLTKFORMS) $(LDLIBS)
-+	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ label.o $(LINKFLTKFORMS) $(LDLIBS)
+-	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ label.o $(LINKFLTKFORMS) $(LDLIBS)
++	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ label.o $(LINKFLTKFORMS) $(LDLIBS)
  	$(OSX_ONLY) ../fltk-config --post $@
  
  line_style$(EXEEXT): line_style.o
-@@ -383,7 +383,7 @@ list_visuals$(EXEEXT): list_visuals.o
+@@ -392,7 +392,7 @@ list_visuals$(EXEEXT): list_visuals.o
  
  mandelbrot$(EXEEXT): mandelbrot_ui.o mandelbrot.o
  	echo Linking $@...
--	$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ mandelbrot.o mandelbrot_ui.o $(LINKFLTK) $(LDLIBS)
-+	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ mandelbrot.o mandelbrot_ui.o $(LINKFLTK) $(LDLIBS)
+-	$(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)
-@@ -396,14 +396,14 @@ minimum$(EXEEXT): minimum.o
+@@ -405,14 +405,14 @@ minimum$(EXEEXT): minimum.o
  
  native-filechooser$(EXEEXT): native-filechooser.o $(IMGLIBNAME)
  	echo Linking $@...
--	$(CXX) $(ARCHFLAGS) $(LDFLAGS) native-filechooser.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
-+	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) native-filechooser.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
+-	$(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
  
  output$(EXEEXT): output.o $(FLLIBNAME)
  	echo Linking $@...
--	$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ output.o $(LINKFLTKFORMS) $(LDLIBS)
-+	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ output.o $(LINKFLTKFORMS) $(LDLIBS)
+-	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ output.o $(LINKFLTKFORMS) $(LDLIBS)
++	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ output.o $(LINKFLTKFORMS) $(LDLIBS)
  	$(OSX_ONLY) ../fltk-config --post $@
  
  overlay$(EXEEXT): overlay.o
-@@ -414,7 +414,7 @@ pixmap$(EXEEXT): pixmap.o
+@@ -423,7 +423,7 @@ pixmap$(EXEEXT): pixmap.o
  
  pixmap_browser$(EXEEXT): pixmap_browser.o $(IMGLIBNAME)
  	echo Linking $@...
--	$(CXX) $(ARCHFLAGS) $(LDFLAGS) pixmap_browser.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
-+	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) pixmap_browser.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
+-	$(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
-@@ -438,7 +438,7 @@ subwindow$(EXEEXT): subwindow.o
+@@ -447,13 +447,13 @@ subwindow$(EXEEXT): subwindow.o
  
  sudoku: sudoku.o
  	echo Linking $@...
--	$(CXX) $(ARCHFLAGS) $(LDFLAGS) sudoku.o -o $@ $(AUDIOLIBS) $(LINKFLTKIMG) $(LDLIBS)
-+	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) sudoku.o -o $@ $(AUDIOLIBS) $(LINKFLTKIMG) $(LDLIBS)
+-	$(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) $(INSTALL_BIN) sudoku$(EXEEXT) sudoku.app/Contents/MacOS
  
  sudoku.exe: sudoku.o sudoku.rc
-@@ -474,7 +474,7 @@ $(GLALL): $(LIBNAME) $(GLLIBNAME)
+ 	echo Linking $@...
+ 	$(RC) sudoku.rc sudokures.o
+-	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) sudoku.o sudokures.o -o $@ $(AUDIOLIBS) $(LINKFLTKIMG) $(LDLIBS)
++	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) sudoku.o sudokures.o -o $@ $(AUDIOLIBS) $(LINKFLTKIMG) $(LDLIBS)
+ 
+ symbols$(EXEEXT): symbols.o
+ 
+@@ -485,7 +485,7 @@ $(GLALL): $(LIBNAME) $(GLLIBNAME)
  # OpenGL demos...
  CubeView$(EXEEXT): CubeMain.o CubeView.o CubeViewUI.o
  	echo Linking $@...
--	$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ \
-+	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ \
+-	$(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 $@
-@@ -485,37 +485,37 @@ CubeViewUI.cxx:	CubeViewUI.fl ../fluid/f
+@@ -496,37 +496,37 @@ CubeViewUI.cxx:	CubeViewUI.fl ../fluid/f
  
  cube$(EXEEXT): cube.o
  	echo Linking $@...
--	$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ cube.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
-+	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ cube.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
+-	$(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) $(LDFLAGS) -o $@ fractals.o fracviewer.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
-+	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ fractals.o fracviewer.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
+-	$(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) $(LDFLAGS) -o $@ fullscreen.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
-+	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ fullscreen.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
+-	$(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) $(LDFLAGS) -o $@ glpuzzle.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
-+	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ glpuzzle.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
+-	$(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) $(LDFLAGS) -o $@ gl_overlay.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
-+	 $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ gl_overlay.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
+-	$(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 $@
  
  shape$(EXEEXT): shape.o
  	echo Linking $@...
--	$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ shape.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
-+	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ shape.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
+-	$(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) $(CAIROFLAGS) $(LDFLAGS) -o $@ cairo_test.o $(LINKFLTK) $(LINKFLTKCAIRO) $(GLDLIBS)
-+	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CAIROFLAGS) $(LDFLAGS) -o $@ cairo_test.o $(LINKFLTK) $(LINKFLTKCAIRO) $(GLDLIBS)
+-	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(CAIROFLAGS) $(LDFLAGS) -o $@ cairo_test.o $(LINKFLTK) $(LINKFLTKCAIRO) $(GLDLIBS)
++	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(CAIROFLAGS) $(LDFLAGS) -o $@ cairo_test.o $(LINKFLTK) $(LINKFLTKCAIRO) $(GLDLIBS)
  	$(OSX_ONLY) ../fltk-config --post $@
  
  #
author	markd <markd@pkgsrc.org>	2015-07-21 21:36:41 +0000
committer	markd <markd@pkgsrc.org>	2015-07-21 21:36:41 +0000
commit	10d23f2aa5b2bcdc66e4e6d9712e8ab1ea670255 (patch)
tree	d424f6ea8ad99e250b55691ff0c016aaa8392cb1 /x11
parent	35c1ca2cb876eaaed2a10a2f8bd535adfdf122fc (diff)
download	pkgsrc-10d23f2aa5b2bcdc66e4e6d9712e8ab1ea670255.tar.gz