x11/fltk13: Update to 1.3.6

This release does not contain new "ABI features". The ABI (Application
Binary Interface) is 100% compatible with release 1.3.5.


CHANGES IN FLTK 1.3.6                              RELEASED: May 15 2021

There have been no changes since FLTK 1.3.6rc2.


CHANGES IN FLTK 1.3.6rc2                           RELEASED: May 04 2021

FLTK 1.3.6rc2 fixes some minor issues of 1.3.6rc1, particularly macOS
bundle generation. It addresses an issue that bundles can't be executed
on macOS 11.3 Big Sur if built with configure/make after downloading
the release tarball because of the macOS "quarantine" feature.

Details:

  Albrecht Schlosser:
    Rename file 'VERSION' to 'fltk_version.dat' (#191)
    Fix version number in doxygen docs
    Fix build with Cairo for CMake < 3.13
    CMake: fix old (pre 3.13) link_directories() usage
    Enhance CMake build configuration summary
    Refactor macOS bundle generation to avoid "quarantine"
    Fix a new compiler warning


CHANGES IN FLTK 1.3.6rc1                           RELEASED: Apr 26 2021

FLTK 1.3.6 is a maintenance release with new macOS Big Sur support
and some bug fixes. macOS Big Sur is supported on both Intel and the
new Apple Silicon (M1) chips.

CMake support has been improved but is not yet "perfect". Documentation
has been enhanced, bundled image libraries have been updated to current
versions.

The following lists are subsets of all commits. References in '(...)'
are either STR numbers (STR xxxx) or GitHub Issues or Pull Requests
(#nnn).


Bug fixes and other improvements

  Albrecht Schlosser:
    Fix Fl::add_timeout() in draw() under Linux (STR 3188)
    X11: Fix X Input Methods (XIM) (STR 3502, 3192)
    Fix overly restrictive JPEG filter (#81)
    Fix DND in read-only Fl_Input (Fl_Output) (#113)
    Fix offscreen drawing under X11 (STR 3384)
    Fix potential fluid crashes (STR 3420) + memory leak
    Fix X11 copy-paste and drag-and-drop target selection (#182)
    Fix CMake install procedure (#212)
    Avoid "Bogus FL_MOVE/FL_DRAG events" (#76)
    CMake: Document FLTKConfig.cmake and set FLTK_INCLUDE_DIR

  Greg Ercolano:
    Fix issue92, added -d debug flag to fluid (#92)
    Merge pull request #176 from ComputerNerd/errmsg-fix-13

  ManoloFLTK:
    X11: add support for copy+paste of image within one app
    Windows: add bitmap version of graphics when copying to clipboard
    Fix use of Xrender extension with old, 16-bit framebuffers.
    Fix for Fl_Native_File_Chooser under macOS 10.15 Catalina and ...
    Restore macOS capacity to turn window fullscreen encompassing several
      screens.
    Improve Fl_Copy_Surface under macOS
    Set OPTION_USE_SYSTEM_LIBPNG/JPEG off under macOS by default
    Have Fl_Pack::draw() call Fl_Group::init_sizes() on its parent group.
    CMake support of the Darwin+XQuartz test platform
    Add support of macOS "Big Sur" 11.0
    Fix when building with SDK 10.15 and running with 11.0 Big Sur
    Backport fix for issue #185 "Shared Image reload() loses initial
      dimensions" from branch 1.4
    Fix fl_endpoints() for macOS platform that was not effective.
    Fix stack corruption when loading GIF (pull request #200)
    Restore ./configure --enable-x11 on macOS
    Fix crash when terminating any macOS app by cmd-Q

  OKAMURA, Yasunobu:
    Fix JIS Keyboard dead keys

x11/fltk13/Makefile

@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2020/08/17 20:17:49 leot Exp $
+# $NetBSD: Makefile,v 1.37 2021/05/17 10:38:48 micha Exp $
 
-DISTNAME=	fltk-1.3.5-source
+DISTNAME=	fltk-1.3.6-source
 PKGNAME=	${DISTNAME:S/-source//}
-PKGREVISION=	1
 VERS=		${DISTNAME:S/fltk-//:S/-source//}
 CATEGORIES=	x11
 MASTER_SITES=	https://fltk.org/pub/fltk/${VERS}/

x11/fltk13/distinfo

@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.11 2019/07/16 11:21:25 micha Exp $
+$NetBSD: distinfo,v 1.12 2021/05/17 10:38:48 micha Exp $
 
-SHA1 (fltk-1.3.5-source.tar.bz2) = 30ee0a45d0f7f8dfc3139bb237440d3d2784b8a8
-RMD160 (fltk-1.3.5-source.tar.bz2) = 09713fde1b1056633750a5b4964460a370a6cf2e
-SHA512 (fltk-1.3.5-source.tar.bz2) = dee280990a5bf846c9fa44b2e1997d7829e25e17b32e36ea8cf50457c4f1008c57f1cfcdce0b582f6722b33c9aa7b39d8f23cb289e3dff9d588f1a66d7179164
-Size (fltk-1.3.5-source.tar.bz2) = 4497531 bytes
-SHA1 (patch-aa) = 335993d2e6b232b0539e583fb2463bafdffbb9b3
-SHA1 (patch-ac) = 4ee251d11b3840f525f473fe6c320e4d16ac95e1
-SHA1 (patch-ad) = 5a17f8fb46ce65b4795618d6aa22f445b55f6aa8
-SHA1 (patch-af) = 4c2b772cc8bd6729aeb94ee4e871c2d982356616
-SHA1 (patch-ag) = 2339189b49551d27a8246d9efd9fed4b26732dde
-SHA1 (patch-fluid_Makefile) = 28440f02095116302bf58319c397b1b9b921027d
-SHA1 (patch-test_Makefile) = ff615f828ee5aac0d44023d190f26e260baf66a2
+SHA1 (fltk-1.3.6-source.tar.bz2) = 758bc62ee7ecd9a80c962a8728abef6220462e4b
+RMD160 (fltk-1.3.6-source.tar.bz2) = 15e5219c25b91a8055383ebabfceb0b17eb9ab42
+SHA512 (fltk-1.3.6-source.tar.bz2) = dd1e5f1c322c16391a00728b440a1035def3bc2e6796d22fd8ee65eab842824289cbacf6e9392a482a58410d072d2b8056a21169e482854afbdb332f1b505d2a
+Size (fltk-1.3.6-source.tar.bz2) = 4569961 bytes
+SHA1 (patch-Makefile) = c10e99516649e8fc02b6041be162229baec7a550
+SHA1 (patch-configure) = 4bc9690d9a18c1b3eca9c40dbe01d952cc3194a6
+SHA1 (patch-documentation_Makefile) = 4c0c4243311c170d6c645db41b8bb1821d053712
+SHA1 (patch-fluid_Makefile) = 6033e485a8ea7590fe68d9049645a1035326f8ce
+SHA1 (patch-makeinclude.in) = e353cdc721c856e9c8839eb6334de59981e70d90
+SHA1 (patch-src_Makefile) = 463cc086e74fc00544f67ba8440ea48ae7e7e35a
+SHA1 (patch-test_Makefile) = c41d0184eed167e1ab8261fbee6cba96595c6c16

x11/fltk13/patches/patch-aa → x11/fltk13/patches/patch-Makefile

@@ -1,8 +1,10 @@
-$NetBSD: patch-aa,v 1.2 2018/07/13 04:24:39 dbj Exp $
+$NetBSD: patch-Makefile,v 1.1 2021/05/17 10:38:48 micha Exp $
 
---- Makefile.orig	2016-09-30 11:33:14.000000000 +0000
+Remove "test" from directory list to build.
+
+--- Makefile.orig	2021-05-04 17:36:17.000000000 +0000
 +++ Makefile
-@@ -18,7 +18,7 @@
+@@ -16,7 +16,7 @@
 
  include makeinclude
 
@@ -11,7 +13,7 @@ $NetBSD: patch-aa,v 1.2 2018/07/13 04:24:39 dbj Exp $
 
  all: makeinclude fltk-config
  	for dir in $(DIRS); do\
-@@ -26,6 +26,14 @@ all: makeinclude fltk-config
+@@ -24,6 +24,14 @@ all: makeinclude fltk-config
  		(cd $$dir; $(MAKE) $(MFLAGS)) || exit 1;\
  	done
 

x11/fltk13/patches/patch-ac → x11/fltk13/patches/patch-configure

@@ -1,8 +1,11 @@
-$NetBSD: patch-ac,v 1.2 2018/07/13 04:24:39 dbj Exp $
+$NetBSD: patch-configure,v 1.1 2021/05/17 10:38:48 micha Exp $
 
---- configure.orig	2016-11-11 16:04:30.000000000 +0000
+Add libtool support.
+Upstream will not merge this (libtool is listed as not acceptable).
+
+--- configure.orig	2021-05-04 18:40:48.000000000 +0000
 +++ configure
-@@ -3816,7 +3816,22 @@ if test "${enable_shared+set}" = set; th
+@@ -3830,7 +3830,22 @@ if test "${enable_shared+set}" = set; th
    enableval=$enable_shared;
  fi
 
@@ -26,8 +29,8 @@ $NetBSD: patch-ac,v 1.2 2018/07/13 04:24:39 dbj Exp $
      PICFLAG=1
      SHAREDSUFFIX=""
      FLUID="fluid-shared"
-@@ -4051,6 +4066,20 @@ else
-     LINKSHARED="$LINKFLTKCAIRO ../lib/libfltk_images.a ../lib/libfltk_forms.a ../lib/libfltk.a"
+@@ -4071,6 +4086,20 @@ else
+   FLUID_BUILD="../fluid/fluid$EXEEXT"
  fi
 
 +if test "x$LIBTOOL" != "x"; then

x11/fltk13/patches/patch-ad → x11/fltk13/patches/patch-documentation_Makefile

@@ -1,8 +1,10 @@
-$NetBSD: patch-ad,v 1.2 2018/07/13 04:24:39 dbj Exp $
+$NetBSD: patch-documentation_Makefile,v 1.1 2021/05/17 10:38:48 micha Exp $
 
---- documentation/Makefile.orig	2015-06-16 13:18:28.000000000 +0000
+Do not install formatted man pages.
+
+--- documentation/Makefile.orig	2021-05-04 17:36:17.000000000 +0000
 +++ documentation/Makefile
-@@ -88,11 +88,6 @@ install: $(MANPAGES)
+@@ -86,11 +86,6 @@ install: $(MANPAGES)
  	  $(INSTALL_DATA) fltk.pdf $(DESTDIR)$(docdir); \
  	fi
  	echo "Installing man pages in $(DESTDIR)$(mandir) ..."

x11/fltk13/patches/patch-fluid_Makefile

@@ -1,19 +1,20 @@
-$NetBSD: patch-fluid_Makefile,v 1.1 2019/07/16 11:21:25 micha Exp $
+$NetBSD: patch-fluid_Makefile,v 1.2 2021/05/17 10:38:48 micha Exp $
 
 Use libtool.
+Upstream will not merge this (libtool is listed as not acceptable).
 
---- fluid/Makefile.orig	2019-03-03 08:40:23.000000000 +0000
+--- fluid/Makefile.orig	2021-05-04 17:36:17.000000000 +0000
 +++ fluid/Makefile
-@@ -50,7 +50,7 @@ all:	$(FLUID) fluid$(EXEEXT)
+@@ -48,7 +48,7 @@ all:	$(FLUID) fluid$(EXEEXT)
  fluid$(EXEEXT):		$(OBJECTS) $(LIBNAME) $(FLLIBNAME) \
  			$(IMGLIBNAME)
  	echo Linking $@...
--	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS)
-+	${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS)
- 	$(OSX_ONLY) $(RM) -r -f fluid.app/Contents/MacOS
- 	$(OSX_ONLY) mkdir fluid.app/Contents/MacOS
+-	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDFLAGS) $(LDLIBS)
++	${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(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
-@@ -74,7 +74,7 @@ include makedepend
+@@ -78,7 +78,7 @@ include makedepend
  install: all
  	echo "Installing FLUID in $(DESTDIR)$(bindir)..."
  	-$(INSTALL_DIR) $(DESTDIR)$(bindir)

x11/fltk13/patches/patch-af → x11/fltk13/patches/patch-makeinclude.in

@@ -1,8 +1,11 @@
-$NetBSD: patch-af,v 1.3 2018/07/13 04:24:39 dbj Exp $
+$NetBSD: patch-makeinclude.in,v 1.1 2021/05/17 10:38:48 micha Exp $
 
---- makeinclude.in.orig	2015-03-25 20:06:54.000000000 +0000
+Use libtool.
+Upstream will not merge this (libtool is listed as not acceptable).
+
+--- makeinclude.in.orig	2021-05-04 17:36:17.000000000 +0000
 +++ makeinclude.in
-@@ -150,20 +150,20 @@ UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@
+@@ -152,20 +152,20 @@ UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@
 
  .o$(EXEEXT):
  	echo Linking $@...
@@ -19,7 +22,7 @@ $NetBSD: patch-af,v 1.3 2018/07/13 04:24:39 dbj Exp $
  	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 $@

x11/fltk13/patches/patch-ag → x11/fltk13/patches/patch-src_Makefile

@@ -1,8 +1,11 @@
-$NetBSD: patch-ag,v 1.3 2018/07/13 04:24:39 dbj Exp $
+$NetBSD: patch-src_Makefile,v 1.1 2021/05/17 10:38:48 micha Exp $
 
---- src/Makefile.orig	2015-03-25 20:06:54.000000000 +0000
+Use libtool.
+Upstream will not merge this (libtool is listed as not acceptable).
+
+--- src/Makefile.orig	2021-05-04 17:36:17.000000000 +0000
 +++ src/Makefile
-@@ -237,6 +237,10 @@ $(LIBNAME): $(OBJECTS)
+@@ -235,6 +235,10 @@ $(LIBNAME): $(OBJECTS)
  	$(LIBCOMMAND) $@ $(OBJECTS)
  	$(RANLIB) $@
 
@@ -13,7 +16,7 @@ $NetBSD: patch-ag,v 1.3 2018/07/13 04:24:39 dbj Exp $
  libfltk.so.$(FL_DSO_VERSION): $(OBJECTS)
  	echo $(DSOCOMMAND) $@ ...
  	$(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS)
-@@ -273,6 +277,10 @@ $(FLLIBNAME): $(FLOBJECTS)
+@@ -271,6 +275,10 @@ $(FLLIBNAME): $(FLOBJECTS)
  	$(LIBCOMMAND) $@ $(FLOBJECTS)
  	$(RANLIB) $@
 
@@ -24,7 +27,7 @@ $NetBSD: patch-ag,v 1.3 2018/07/13 04:24:39 dbj Exp $
  libfltk_forms.so.$(FL_DSO_VERSION): $(FLOBJECTS) libfltk.so.$(FL_DSO_VERSION)
  	echo $(DSOCOMMAND) $@ ...
  	$(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk $(LDLIBS)
-@@ -309,6 +317,10 @@ $(GLLIBNAME): $(GLOBJECTS)
+@@ -307,6 +315,10 @@ $(GLLIBNAME): $(GLOBJECTS)
  	$(LIBCOMMAND) $@ $(GLOBJECTS)
  	$(RANLIB) $@
 
@@ -35,7 +38,7 @@ $NetBSD: patch-ag,v 1.3 2018/07/13 04:24:39 dbj Exp $
  libfltk_gl.so.$(FL_DSO_VERSION): $(GLOBJECTS) libfltk.so.$(FL_DSO_VERSION)
  	echo $(DSOCOMMAND) $@ ...
  	$(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk $(LDLIBS) $(GLDLIBS)
-@@ -345,6 +357,10 @@ $(IMGLIBNAME): $(IMGOBJECTS)
+@@ -343,6 +355,10 @@ $(IMGLIBNAME): $(IMGOBJECTS)
  	$(LIBCOMMAND) $@ $(IMGOBJECTS)
  	$(RANLIB) $@
 
@@ -46,7 +49,7 @@ $NetBSD: patch-ag,v 1.3 2018/07/13 04:24:39 dbj Exp $
  libfltk_images.so.$(FL_DSO_VERSION): $(IMGOBJECTS) libfltk.so.$(FL_DSO_VERSION)
  	echo $(DSOCOMMAND) $@ ...
  	$(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk $(LDLIBS)
-@@ -570,6 +586,9 @@ install: $(LIBNAME) $(DSONAME) \
+@@ -582,6 +598,9 @@ install: $(LIBNAME) $(DSONAME) \
  		$(INSTALL_LIB) $(GLLIBNAME) $(DESTDIR)$(libdir); \
  		$(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBBASENAME); \
  	fi
@@ -56,7 +59,7 @@ $NetBSD: patch-ag,v 1.3 2018/07/13 04:24:39 dbj Exp $
  	$(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBBASENAME)
  	if test x$(DSONAME) = xlibfltk.so.$(FL_DSO_VERSION); then\
  		$(RM) $(DESTDIR)$(libdir)/libfltk.so*;\
-@@ -590,6 +609,9 @@ install: $(LIBNAME) $(DSONAME) \
+@@ -602,6 +621,9 @@ install: $(LIBNAME) $(DSONAME) \
  		$(RM) $(DESTDIR)$(libdir)/libfltk_s.a;\
  		$(INSTALL_LIB) libfltk_s.a $(DESTDIR)$(libdir); \
  	fi
@@ -66,7 +69,7 @@ $NetBSD: patch-ag,v 1.3 2018/07/13 04:24:39 dbj Exp $
  	if test x$(DSONAME) = xcygfltknox-$(FL_DSO_VERSION).dll; then\
  		$(RM) $(DESTDIR)$(bindir)/$(DSONAME);\
  		$(INSTALL_LIB) $(DSONAME) $(DESTDIR)$(bindir); \
-@@ -607,6 +629,9 @@ install: $(LIBNAME) $(DSONAME) \
+@@ -619,6 +641,9 @@ install: $(LIBNAME) $(DSONAME) \
  		$(INSTALL_LIB) libfltk_forms.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir); \
  		$(LN) libfltk_forms.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir)/libfltk_forms.so;\
  	fi
@@ -76,7 +79,7 @@ $NetBSD: patch-ag,v 1.3 2018/07/13 04:24:39 dbj Exp $
  	if test x$(FLDSONAME) = xlibfltk_forms.sl.$(FL_DSO_VERSION); then\
  		$(RM) $(DESTDIR)$(libdir)/libfltk_forms.sl*;\
  		$(INSTALL_LIB) libfltk_forms.sl.$(FL_DSO_VERSION) $(DESTDIR)$(libdir); \
-@@ -664,6 +689,9 @@ install: $(LIBNAME) $(DSONAME) \
+@@ -676,6 +701,9 @@ install: $(LIBNAME) $(DSONAME) \
  		$(RM) $(DESTDIR)$(libdir)/libfltk_gl.dll.a;\
  		$(INSTALL_LIB) libfltk_gl.dll.a $(DESTDIR)$(libdir); \
  	fi

x11/fltk13/patches/patch-test_Makefile

@@ -1,41 +1,43 @@
-$NetBSD: patch-test_Makefile,v 1.5 2019/07/16 11:21:25 micha Exp $
+$NetBSD: patch-test_Makefile,v 1.6 2021/05/17 10:38:48 micha Exp $
 
 Use libtool.
+Upstream will not merge this (libtool is listed as not acceptable).
 
---- test/Makefile.orig	2019-03-03 08:40:23.000000000 +0000
+--- test/Makefile.orig	2021-05-04 17:36:17.000000000 +0000
 +++ test/Makefile
-@@ -308,14 +308,14 @@ buttons$(EXEEXT): buttons.o
+@@ -302,7 +302,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) -r -f blocks.app/Contents/MacOS
- 	$(OSX_ONLY) mkdir blocks.app/Contents/MacOS
+ 	$(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
+@@ -311,7 +311,7 @@ blocks$(EXEEXT): blocks.o
 
  checkers$(EXEEXT): checkers.o
  	echo Linking $@...
 -	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) checkers.o -o $@ $(LINKFLTK) $(LDLIBS)
 +	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) checkers.o -o $@ $(LINKFLTK) $(LDLIBS)
- 	$(OSX_ONLY) $(RM) -r -f checkers.app/Contents/MacOS
- 	$(OSX_ONLY) mkdir checkers.app/Contents/MacOS
+ 	$(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
-@@ -324,7 +324,7 @@ clock$(EXEEXT): clock.o
+@@ -322,7 +322,7 @@ clock$(EXEEXT): clock.o
 
  colbrowser$(EXEEXT): colbrowser.o
  	echo Linking $@...
--	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ colbrowser.o $(LINKFLTKFORMS) $(LDLIBS)
-+	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ colbrowser.o $(LINKFLTKFORMS) $(LDLIBS)
+-	$(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/
-@@ -337,21 +337,21 @@ curve$(EXEEXT): curve.o
+@@ -335,21 +335,21 @@ curve$(EXEEXT): curve.o
 
  demo$(EXEEXT): demo.o
  	echo Linking $@...
--	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ demo.o $(LINKFLTKFORMS) $(LDLIBS)
-+	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ demo.o $(LINKFLTKFORMS) $(LDLIBS)
+-	$(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/
@@ -53,17 +55,18 @@ Use libtool.
 -	$(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 ../ide/Xcode4/plists/editor-Info.plist editor.app/Contents/Info.plist
+ 	$(OSX_ONLY) cp -f mac-resources/editor.plist editor.app/Contents/Info.plist
 
-@@ -360,21 +360,21 @@ fast_slow.cxx:	fast_slow.fl ../fluid/flu
+@@ -358,7 +358,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 $@
 
- fonts$(EXEEXT): fonts.o
+ fltk-versions$(EXEEXT): fltk-versions.o
+@@ -367,14 +367,14 @@ fonts$(EXEEXT): fonts.o
 
  forms$(EXEEXT): forms.o
  	echo Linking $@...
@@ -79,7 +82,7 @@ Use libtool.
 +	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) help.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
  	$(OSX_ONLY) ../fltk-config --post $@
  	$(OSX_ONLY) mkdir -p help.app/Contents/Resources
- 	$(OSX_ONLY) cp -f help-test.html help.app/Contents/Resources/
+ 	$(OSX_ONLY) cp -f help_dialog.html help.app/Contents/Resources/
 @@ -394,14 +394,14 @@ input_choice$(EXEEXT): input_choice.o
 
  keyboard$(EXEEXT): keyboard_ui.o keyboard.o
@@ -92,8 +95,8 @@ Use libtool.
 
  label$(EXEEXT): label.o
  	echo Linking $@...
--	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ label.o $(LINKFLTKFORMS) $(LDLIBS)
-+	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ label.o $(LINKFLTKFORMS) $(LDLIBS)
+-	$(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
@@ -119,8 +122,8 @@ Use libtool.
 
  output$(EXEEXT): output.o $(FLLIBNAME)
  	echo Linking $@...
--	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ output.o $(LINKFLTKFORMS) $(LDLIBS)
-+	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ output.o $(LINKFLTKFORMS) $(LDLIBS)
+-	$(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
@@ -139,10 +142,10 @@ Use libtool.
  	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) -r -f sudoku.app/Contents/MacOS
- 	$(OSX_ONLY) mkdir sudoku.app/Contents/MacOS
+ 	$(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
-@@ -475,7 +475,7 @@ sudoku: sudoku.o
+@@ -477,7 +477,7 @@ sudoku: sudoku.o
  sudoku.exe: sudoku.o sudoku.rc
  	echo Linking $@...
  	$(RC) sudoku.rc sudokures.o
@@ -151,7 +154,7 @@ Use libtool.
 
  symbols$(EXEEXT): symbols.o
 
-@@ -507,7 +507,7 @@ $(GLALL): $(LIBNAME) $(GLLIBNAME)
+@@ -509,7 +509,7 @@ $(GLALL): $(LIBNAME) $(GLLIBNAME)
  # OpenGL demos...
  CubeView$(EXEEXT): CubeMain.o CubeView.o CubeViewUI.o
  	echo Linking $@...
@@ -160,7 +163,7 @@ Use libtool.
  		CubeMain.o CubeView.o CubeViewUI.o \
  		$(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
  	$(OSX_ONLY) ../fltk-config --post $@
-@@ -518,37 +518,37 @@ CubeViewUI.cxx:	CubeViewUI.fl ../fluid/f
+@@ -520,35 +520,35 @@ CubeViewUI.cxx:	CubeViewUI.fl ../fluid/f
 
  cube$(EXEEXT): cube.o
  	echo Linking $@...
@@ -203,5 +206,3 @@ Use libtool.
 -	$(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 $@
-
- #