pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

fltk13: Remove, used to update x11/fltk13



Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>
Pushed By:	micha
Date:		Tue Jul 16 13:30:57 2019 +0200
Changeset:	2e01880c2678e1c6fc42178a6ff98bd97d79236f

Modified Files:
	Makefile
Removed Files:
	fltk13/COMMIT_MSG
	fltk13/DESCR
	fltk13/Makefile
	fltk13/PLIST
	fltk13/buildlink3.mk
	fltk13/distinfo
	fltk13/patches/patch-aa
	fltk13/patches/patch-ac
	fltk13/patches/patch-ad
	fltk13/patches/patch-af
	fltk13/patches/patch-ag
	fltk13/patches/patch-fluid_Makefile
	fltk13/patches/patch-test_Makefile

Log Message:
fltk13: Remove, used to update x11/fltk13

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2e01880c2678e1c6fc42178a6ff98bd97d79236f

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

diffstat:
 Makefile                            |   1 -
 fltk13/COMMIT_MSG                   |  65 --------
 fltk13/DESCR                        |  12 --
 fltk13/Makefile                     |  76 ----------
 fltk13/PLIST                        | 294 ------------------------------------
 fltk13/buildlink3.mk                |  26 ----
 fltk13/distinfo                     |  13 --
 fltk13/patches/patch-aa             |  28 ----
 fltk13/patches/patch-ac             |  49 ------
 fltk13/patches/patch-ad             |  16 --
 fltk13/patches/patch-af             |  29 ----
 fltk13/patches/patch-ag             |  88 -----------
 fltk13/patches/patch-fluid_Makefile |  24 ---
 fltk13/patches/patch-test_Makefile  | 207 -------------------------
 14 files changed, 928 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index 3d0bdf5c5d..265569534b 100644
--- a/Makefile
+++ b/Makefile
@@ -844,7 +844,6 @@ SUBDIR+=	flimsel
 SUBDIR+=	flite2
 SUBDIR+=	flnews-devel
 SUBDIR+=	flpsed
-SUBDIR+=	fltk13
 SUBDIR+=	fltk14-devel
 SUBDIR+=	fluxbox
 SUBDIR+=	fluxspace
diff --git a/fltk13/COMMIT_MSG b/fltk13/COMMIT_MSG
deleted file mode 100644
index b86a1ed027..0000000000
--- a/fltk13/COMMIT_MSG
+++ /dev/null
@@ -1,65 +0,0 @@
-This release does not contain new "ABI features".
-The ABI (Application Binary Interface) is 100% compatible
-with releases 1.3.4, 1.3.4-1, and 1.3.4-2.
-
-
-Changes in FLTK 1.3.5
-=====================
-
-New features and enhancements (highlights):
-
-� - Add support for macOS 10.13 "High Sierra" and 10.14 "Mojave".
-� - Add FL/platform.H for compatibility with FLTK 1.4 and higher.
-� - Improve OpenGL(3+) support.
-� - Improve Cairo support and (CMake) Cairo detection.
-� - Improve desktop scaling support for HiDPI screens.
-��� Note: FLTK application scaling is available in FLTK 1.4.0.
-
-
-Bug fixes and other improvements:
-
-� - Update CHANGES for release, remove one wrong entry
-� - Fix Xcode FLTK project for use under macOS 10.14
-� - 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.
-� - Fix Fl_Tree::insert() with pos out ouf range (issue #18).
-� - Fix Fl_GIF_Image Color Table handling (STR 3491).
-� - Make sure not to access Fl_Menu_ widgets if the widget gets
-��� deleted while the menu (pulldown) is open (STR 3503).
-� - Fix CMake build (fluid) on case sensitive macOS file systems.
-� - Windows/OpenGL: improve pixel format detection (STR 3119).
-� - Add 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.
-� - MacOS platform: fix regression in macOS 10.13 where an unbundled app
-��� had its system menu bar unresponsive.
-� - MacOS 10.10 platform: Fl_Window::fullscreen() and fullscreen_off()
-��� no longer call Fl_Window::hide() + Fl_Window::show().
-��� The new procedure essentially resizes the window, as done on
-��� the X11+EWMH and Windows platforms. This improves in particular
-��� the possibility to turn an Fl_Gl_Window fullscreen on and off.
-� - MacOS platform: Support \r\n as end of line used by recent
-��� MS Office apps in clipboard.
-� - Fix Fl_Text_Editor overstrike mode (STR 3463).
-� - More consistent and optimized "gleam" scheme box drawing.
-� - Fix a MinGW build error with new MinGW versions as of Feb 2018
-��� (undefined S_OK and __FD_ISSET), see STR 3454.
-� - Windows/CMake: Add missing definition of WIN32 for Windows builds.
-��� This seems to be necessary for VS2017 and other compilers that
-��� don't #define WIN32, but FLTK relies on this preprocessor macro.
-��� Autoconf/configure and bundled IDE files #define WIN32 as well.
-� - Fix illegal memory access after free when closing fluid (valgrind
-��� reports "Invalid read of size 4"), see also STR 3427.
-� - Fix crash when closing fluid with Fl_Table (STR 3427).
-� - Fix ignored buffer pre-allocation (requestedSize) in Fl_Text_Buffer.
-��� See fltk.general "Fl_Text_Buffer constructor bug" on Dec 5, 2016.
-� - Fix Fl_Browser background and text color parsing (STR 3376).
-� - Fix Windows CreateDC/DeleteDC mismatch (STR 3373).
-� - Update bundled configure scripts config.guess and config.sub.
-� - Fix configure --enable-cairo --enable-cairoext,
-��� see this report in fltk.general
-� - Fix macOS timer implementation (STR 3387).
-� - Fix drop-to-FLTK-widget under MSWindows when the desktop is
-��� rescaled (STR 3390).
-� - Add support for macOS 10.13 "High Sierra". Subwindows don't
-��� move correctly under 10.13 without this fix.
diff --git a/fltk13/DESCR b/fltk13/DESCR
deleted file mode 100644
index c575d968e7..0000000000
--- a/fltk13/DESCR
+++ /dev/null
@@ -1,12 +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 version 1.3.  From the FLTK website:
-
-  FLTK 1.3 is the current stable development branch based on FLTK
-  1.1.10. It adds internationalization, UTF-8 (Unicode), and printing
-  support, Doxygen based documentation, and several new widgets
-  including Fl_Native_File_Chooser, Fl_Table, and Fl_Tree_View.
diff --git a/fltk13/Makefile b/fltk13/Makefile
deleted file mode 100644
index 1cbf897718..0000000000
--- a/fltk13/Makefile
+++ /dev/null
@@ -1,76 +0,0 @@
-# $NetBSD$
-
-DISTNAME=	fltk-1.3.5-source
-PKGNAME=	${DISTNAME:S/-source//}
-VERS=		${DISTNAME:S/fltk-//:S/-source//}
-CATEGORIES=	x11
-MASTER_SITES=	http://fltk.org/pub/fltk/${VERS}/
-EXTRACT_SUFX=	.tar.bz2
-
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	http://www.fltk.org/
-COMMENT=	Fast Light Tool Kit for graphical user interfaces
-LICENSE=	gnu-lgpl-v2
-
-WRKSRC=			${WRKDIR}/${DISTNAME:S/-source//}
-USE_LANGUAGES=		c c++
-USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake nroff
-TEST_TARGET=		test
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.fltk13
-PKG_SUPPORTED_OPTIONS=	opengl # cairo
-PKG_SUGGESTED_OPTIONS=	opengl # cairo
-#PLIST_VARS+=	cairo
-PLIST_VARS+=	opengl
-
-.include "../../mk/bsd.prefs.mk"
-.include "../../mk/bsd.options.mk"
-
-PTHREAD_OPTS+=		require
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--enable-libtool=${LIBTOOL:Q}
-CONFIGURE_ARGS+=	--enable-threads
-CONFIGURE_ARGS+=	ac_cv_have_overlay=yes
-
-PLIST_VARS+=		cs	# case-sensitive
-.if !exists(./descr) && ${OPSYS} != "Darwin"
-CONFIGURE_ARGS+=	--with-links
-PLIST.cs=		yes
-.endif
-
-#.if !empty(PKG_OPTIONS:Mcairo)
-#.  include "../../graphics/cairo/buildlink3.mk"
-#CONFIGURE_ARGS+=	--enable-cairo
-#PLIST.cairo=	yes
-#.else
-#CONFIGURE_ARGS+=	--disable-cairo
-#.endif
-
-.if !empty(PKG_OPTIONS:Mopengl)
-.if ${OPSYS} != "Darwin"
-.  include "../../graphics/Mesa/buildlink3.mk"
-.endif
-CONFIGURE_ARGS+=	--enable-gl
-PLIST.opengl=	yes
-.else
-CONFIGURE_ARGS+=	--disable-gl
-.endif
-
-CONFIGURE_ARGS+=	--enable-shared
-# Use pkgsrc versions, not package's bundled versions.
-CONFIGURE_ARGS+=	--disable-localjpeg --disable-localzlib --disable-localpng
-
-.if ${OPSYS} != "Darwin"
-.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXft/buildlink3.mk"
-.include "../../x11/libXinerama/buildlink3.mk"
-BUILDLINK_DEPMETHOD.libXt?=	build
-.include "../../x11/libXt/buildlink3.mk"
-.endif
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/fltk13/PLIST b/fltk13/PLIST
deleted file mode 100644
index 10b1332b48..0000000000
--- a/fltk13/PLIST
+++ /dev/null
@@ -1,294 +0,0 @@
-@comment $NetBSD$
-bin/fltk-config
-bin/fluid
-include/FL/Enumerations.H
-${PLIST.cs}include/FL/Enumerations.h
-include/FL/Fl.H
-${PLIST.cs}include/FL/Fl.h
-include/FL/Fl_Adjuster.H
-${PLIST.cs}include/FL/Fl_Adjuster.h
-include/FL/Fl_BMP_Image.H
-${PLIST.cs}include/FL/Fl_BMP_Image.h
-include/FL/Fl_Bitmap.H
-${PLIST.cs}include/FL/Fl_Bitmap.h
-include/FL/Fl_Box.H
-${PLIST.cs}include/FL/Fl_Box.h
-include/FL/Fl_Browser.H
-${PLIST.cs}include/FL/Fl_Browser.h
-include/FL/Fl_Browser_.H
-${PLIST.cs}include/FL/Fl_Browser_.h
-include/FL/Fl_Button.H
-${PLIST.cs}include/FL/Fl_Button.h
-include/FL/Fl_Cairo.H
-${PLIST.cs}include/FL/Fl_Cairo.h
-include/FL/Fl_Cairo_Window.H
-${PLIST.cs}include/FL/Fl_Cairo_Window.h
-include/FL/Fl_Chart.H
-${PLIST.cs}include/FL/Fl_Chart.h
-include/FL/Fl_Check_Browser.H
-${PLIST.cs}include/FL/Fl_Check_Browser.h
-include/FL/Fl_Check_Button.H
-${PLIST.cs}include/FL/Fl_Check_Button.h
-include/FL/Fl_Choice.H
-${PLIST.cs}include/FL/Fl_Choice.h
-include/FL/Fl_Clock.H
-${PLIST.cs}include/FL/Fl_Clock.h
-include/FL/Fl_Color_Chooser.H
-${PLIST.cs}include/FL/Fl_Color_Chooser.h
-include/FL/Fl_Copy_Surface.H
-${PLIST.cs}include/FL/Fl_Copy_Surface.h
-include/FL/Fl_Counter.H
-${PLIST.cs}include/FL/Fl_Counter.h
-include/FL/Fl_Device.H
-${PLIST.cs}include/FL/Fl_Device.h
-include/FL/Fl_Dial.H
-${PLIST.cs}include/FL/Fl_Dial.h
-include/FL/Fl_Double_Window.H
-${PLIST.cs}include/FL/Fl_Double_Window.h
-include/FL/Fl_Export.H
-${PLIST.cs}include/FL/Fl_Export.h
-include/FL/Fl_File_Browser.H
-${PLIST.cs}include/FL/Fl_File_Browser.h
-include/FL/Fl_File_Chooser.H
-${PLIST.cs}include/FL/Fl_File_Chooser.h
-include/FL/Fl_File_Icon.H
-${PLIST.cs}include/FL/Fl_File_Icon.h
-include/FL/Fl_File_Input.H
-${PLIST.cs}include/FL/Fl_File_Input.h
-include/FL/Fl_Fill_Dial.H
-${PLIST.cs}include/FL/Fl_Fill_Dial.h
-include/FL/Fl_Fill_Slider.H
-${PLIST.cs}include/FL/Fl_Fill_Slider.h
-include/FL/Fl_Float_Input.H
-${PLIST.cs}include/FL/Fl_Float_Input.h
-include/FL/Fl_FormsBitmap.H
-${PLIST.cs}include/FL/Fl_FormsBitmap.h
-include/FL/Fl_FormsPixmap.H
-${PLIST.cs}include/FL/Fl_FormsPixmap.h
-include/FL/Fl_Free.H
-${PLIST.cs}include/FL/Fl_Free.h
-include/FL/Fl_GIF_Image.H
-${PLIST.cs}include/FL/Fl_GIF_Image.h
-include/FL/Fl_Gl_Window.H
-${PLIST.cs}include/FL/Fl_Gl_Window.h
-include/FL/Fl_Group.H
-${PLIST.cs}include/FL/Fl_Group.h
-include/FL/Fl_Help_Dialog.H
-${PLIST.cs}include/FL/Fl_Help_Dialog.h
-include/FL/Fl_Help_View.H
-${PLIST.cs}include/FL/Fl_Help_View.h
-include/FL/Fl_Hold_Browser.H
-${PLIST.cs}include/FL/Fl_Hold_Browser.h
-include/FL/Fl_Hor_Fill_Slider.H
-${PLIST.cs}include/FL/Fl_Hor_Fill_Slider.h
-include/FL/Fl_Hor_Nice_Slider.H
-${PLIST.cs}include/FL/Fl_Hor_Nice_Slider.h
-include/FL/Fl_Hor_Slider.H
-${PLIST.cs}include/FL/Fl_Hor_Slider.h
-include/FL/Fl_Hor_Value_Slider.H
-${PLIST.cs}include/FL/Fl_Hor_Value_Slider.h
-include/FL/Fl_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
-${PLIST.cs}include/FL/Fl_Input_.h
-include/FL/Fl_Input_Choice.H
-${PLIST.cs}include/FL/Fl_Input_Choice.h
-include/FL/Fl_Int_Input.H
-${PLIST.cs}include/FL/Fl_Int_Input.h
-include/FL/Fl_JPEG_Image.H
-${PLIST.cs}include/FL/Fl_JPEG_Image.h
-include/FL/Fl_Light_Button.H
-${PLIST.cs}include/FL/Fl_Light_Button.h
-include/FL/Fl_Line_Dial.H
-${PLIST.cs}include/FL/Fl_Line_Dial.h
-include/FL/Fl_Menu.H
-${PLIST.cs}include/FL/Fl_Menu.h
-include/FL/Fl_Menu_.H
-${PLIST.cs}include/FL/Fl_Menu_.h
-include/FL/Fl_Menu_Bar.H
-${PLIST.cs}include/FL/Fl_Menu_Bar.h
-include/FL/Fl_Menu_Button.H
-${PLIST.cs}include/FL/Fl_Menu_Button.h
-include/FL/Fl_Menu_Item.H
-${PLIST.cs}include/FL/Fl_Menu_Item.h
-include/FL/Fl_Menu_Window.H
-${PLIST.cs}include/FL/Fl_Menu_Window.h
-include/FL/Fl_Multi_Browser.H
-${PLIST.cs}include/FL/Fl_Multi_Browser.h
-include/FL/Fl_Multi_Label.H
-${PLIST.cs}include/FL/Fl_Multi_Label.h
-include/FL/Fl_Multiline_Input.H
-${PLIST.cs}include/FL/Fl_Multiline_Input.h
-include/FL/Fl_Multiline_Output.H
-${PLIST.cs}include/FL/Fl_Multiline_Output.h
-include/FL/Fl_Native_File_Chooser.H
-${PLIST.cs}include/FL/Fl_Native_File_Chooser.h
-include/FL/Fl_Nice_Slider.H
-${PLIST.cs}include/FL/Fl_Nice_Slider.h
-include/FL/Fl_Object.H
-${PLIST.cs}include/FL/Fl_Object.h
-include/FL/Fl_Output.H
-${PLIST.cs}include/FL/Fl_Output.h
-include/FL/Fl_Overlay_Window.H
-${PLIST.cs}include/FL/Fl_Overlay_Window.h
-include/FL/Fl_PNG_Image.H
-${PLIST.cs}include/FL/Fl_PNG_Image.h
-include/FL/Fl_PNM_Image.H
-${PLIST.cs}include/FL/Fl_PNM_Image.h
-include/FL/Fl_Pack.H
-${PLIST.cs}include/FL/Fl_Pack.h
-include/FL/Fl_Paged_Device.H
-${PLIST.cs}include/FL/Fl_Paged_Device.h
-include/FL/Fl_Pixmap.H
-${PLIST.cs}include/FL/Fl_Pixmap.h
-include/FL/Fl_Plugin.H
-${PLIST.cs}include/FL/Fl_Plugin.h
-include/FL/Fl_Positioner.H
-${PLIST.cs}include/FL/Fl_Positioner.h
-include/FL/Fl_PostScript.H
-${PLIST.cs}include/FL/Fl_PostScript.h
-include/FL/Fl_Preferences.H
-${PLIST.cs}include/FL/Fl_Preferences.h
-include/FL/Fl_Printer.H
-${PLIST.cs}include/FL/Fl_Printer.h
-include/FL/Fl_Progress.H
-${PLIST.cs}include/FL/Fl_Progress.h
-include/FL/Fl_RGB_Image.H
-${PLIST.cs}include/FL/Fl_RGB_Image.h
-include/FL/Fl_Radio_Button.H
-${PLIST.cs}include/FL/Fl_Radio_Button.h
-include/FL/Fl_Radio_Light_Button.H
-${PLIST.cs}include/FL/Fl_Radio_Light_Button.h
-include/FL/Fl_Radio_Round_Button.H
-${PLIST.cs}include/FL/Fl_Radio_Round_Button.h
-include/FL/Fl_Repeat_Button.H
-${PLIST.cs}include/FL/Fl_Repeat_Button.h
-include/FL/Fl_Return_Button.H
-${PLIST.cs}include/FL/Fl_Return_Button.h
-include/FL/Fl_Roller.H
-${PLIST.cs}include/FL/Fl_Roller.h
-include/FL/Fl_Round_Button.H
-${PLIST.cs}include/FL/Fl_Round_Button.h
-include/FL/Fl_Round_Clock.H
-${PLIST.cs}include/FL/Fl_Round_Clock.h
-include/FL/Fl_Scroll.H
-${PLIST.cs}include/FL/Fl_Scroll.h
-include/FL/Fl_Scrollbar.H
-${PLIST.cs}include/FL/Fl_Scrollbar.h
-include/FL/Fl_Secret_Input.H
-${PLIST.cs}include/FL/Fl_Secret_Input.h
-include/FL/Fl_Select_Browser.H
-${PLIST.cs}include/FL/Fl_Select_Browser.h
-include/FL/Fl_Shared_Image.H
-${PLIST.cs}include/FL/Fl_Shared_Image.h
-include/FL/Fl_Simple_Counter.H
-${PLIST.cs}include/FL/Fl_Simple_Counter.h
-include/FL/Fl_Single_Window.H
-${PLIST.cs}include/FL/Fl_Single_Window.h
-include/FL/Fl_Slider.H
-${PLIST.cs}include/FL/Fl_Slider.h
-include/FL/Fl_Spinner.H
-${PLIST.cs}include/FL/Fl_Spinner.h
-include/FL/Fl_Sys_Menu_Bar.H
-${PLIST.cs}include/FL/Fl_Sys_Menu_Bar.h
-include/FL/Fl_Table.H
-${PLIST.cs}include/FL/Fl_Table.h
-include/FL/Fl_Table_Row.H
-${PLIST.cs}include/FL/Fl_Table_Row.h
-include/FL/Fl_Tabs.H
-${PLIST.cs}include/FL/Fl_Tabs.h
-include/FL/Fl_Text_Buffer.H
-${PLIST.cs}include/FL/Fl_Text_Buffer.h
-include/FL/Fl_Text_Display.H
-${PLIST.cs}include/FL/Fl_Text_Display.h
-include/FL/Fl_Text_Editor.H
-${PLIST.cs}include/FL/Fl_Text_Editor.h
-include/FL/Fl_Tile.H
-${PLIST.cs}include/FL/Fl_Tile.h
-include/FL/Fl_Tiled_Image.H
-${PLIST.cs}include/FL/Fl_Tiled_Image.h
-include/FL/Fl_Timer.H
-${PLIST.cs}include/FL/Fl_Timer.h
-include/FL/Fl_Toggle_Button.H
-${PLIST.cs}include/FL/Fl_Toggle_Button.h
-include/FL/Fl_Toggle_Light_Button.H
-${PLIST.cs}include/FL/Fl_Toggle_Light_Button.h
-include/FL/Fl_Toggle_Round_Button.H
-${PLIST.cs}include/FL/Fl_Toggle_Round_Button.h
-include/FL/Fl_Tooltip.H
-${PLIST.cs}include/FL/Fl_Tooltip.h
-include/FL/Fl_Tree.H
-${PLIST.cs}include/FL/Fl_Tree.h
-include/FL/Fl_Tree_Item.H
-${PLIST.cs}include/FL/Fl_Tree_Item.h
-include/FL/Fl_Tree_Item_Array.H
-${PLIST.cs}include/FL/Fl_Tree_Item_Array.h
-include/FL/Fl_Tree_Prefs.H
-${PLIST.cs}include/FL/Fl_Tree_Prefs.h
-include/FL/Fl_Valuator.H
-${PLIST.cs}include/FL/Fl_Valuator.h
-include/FL/Fl_Value_Input.H
-${PLIST.cs}include/FL/Fl_Value_Input.h
-include/FL/Fl_Value_Output.H
-${PLIST.cs}include/FL/Fl_Value_Output.h
-include/FL/Fl_Value_Slider.H
-${PLIST.cs}include/FL/Fl_Value_Slider.h
-include/FL/Fl_Widget.H
-${PLIST.cs}include/FL/Fl_Widget.h
-include/FL/Fl_Window.H
-${PLIST.cs}include/FL/Fl_Window.h
-include/FL/Fl_Wizard.H
-${PLIST.cs}include/FL/Fl_Wizard.h
-include/FL/Fl_XBM_Image.H
-${PLIST.cs}include/FL/Fl_XBM_Image.h
-include/FL/Fl_XPM_Image.H
-${PLIST.cs}include/FL/Fl_XPM_Image.h
-include/FL/abi-version.h
-include/FL/dirent.h
-include/FL/filename.H
-${PLIST.cs}include/FL/filename.h
-include/FL/fl_ask.H
-${PLIST.cs}include/FL/fl_ask.h
-include/FL/fl_draw.H
-${PLIST.cs}include/FL/fl_draw.h
-${PLIST.cs}include/FL/fl_file_chooser.H
-${PLIST.cs}include/FL/fl_file_chooser.h
-include/FL/fl_message.H
-${PLIST.cs}include/FL/fl_message.h
-include/FL/fl_show_colormap.H
-${PLIST.cs}include/FL/fl_show_colormap.h
-include/FL/fl_show_input.H
-${PLIST.cs}include/FL/fl_show_input.h
-include/FL/fl_types.h
-include/FL/fl_utf8.h
-include/FL/forms.H
-${PLIST.cs}include/FL/forms.h
-include/FL/gl.h
-include/FL/gl2opengl.h
-include/FL/gl_draw.H
-${PLIST.cs}include/FL/gl_draw.h
-include/FL/glu.h
-include/FL/glut.H
-${PLIST.cs}include/FL/glut.h
-include/FL/mac.H
-${PLIST.cs}include/FL/mac.h
-include/FL/math.h
-include/FL/names.h
-include/FL/platform.H
-${PLIST.cs}include/FL/platform.h
-include/FL/win32.H
-${PLIST.cs}include/FL/win32.h
-include/FL/x.H
-${PLIST.cs}include/FL/x.h
-${PLIST.cs}include/Fl
-lib/libfltk.la
-lib/libfltk_forms.la
-${PLIST.opengl}lib/libfltk_gl.la
-lib/libfltk_images.la
-man/man1/fltk-config.1
-man/man1/fluid.1
-man/man3/fltk.3
diff --git a/fltk13/buildlink3.mk b/fltk13/buildlink3.mk
deleted file mode 100644
index 66313c4415..0000000000
--- a/fltk13/buildlink3.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD$
-
-BUILDLINK_TREE+=	fltk
-
-.if !defined(FLTK_BUILDLINK3_MK)
-FLTK_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.fltk+=	fltk>=1.3.0
-BUILDLINK_ABI_DEPENDS.fltk?=	fltk>=1.3.3nb4
-BUILDLINK_PKGSRCDIR.fltk?=	../../x11/fltk13
-BUILDLINK_FILES.fltk+=		include/Fl/*
-
-.include "../../mk/bsd.fast.prefs.mk"
-.if ${OPSYS} != "Darwin"
-.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXft/buildlink3.mk"
-.include "../../x11/libXinerama/buildlink3.mk"
-.endif
-.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/fltk13/distinfo b/fltk13/distinfo
deleted file mode 100644
index 9fd28ce0f6..0000000000
--- a/fltk13/distinfo
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
-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
diff --git a/fltk13/patches/patch-aa b/fltk13/patches/patch-aa
deleted file mode 100644
index 3ed5a17c87..0000000000
--- a/fltk13/patches/patch-aa
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD$
-
---- Makefile.orig	2016-09-30 11:33:14.000000000 +0000
-+++ Makefile
-@@ -18,7 +18,7 @@
- 
- include makeinclude
- 
--DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid test documentation
-+DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid documentation
- 
- all: makeinclude fltk-config
- 	for dir in $(DIRS); do\
-@@ -26,6 +26,14 @@ all: makeinclude fltk-config
- 		(cd $$dir; $(MAKE) $(MFLAGS)) || exit 1;\
- 	done
- 
-+test: makeinclude
-+	dir=test;\
-+	echo "=== making $$dir ===";\
-+	if test ! -f $$dir/makedepend; then\
-+		touch $$dir/makedepend;\
-+	fi;\
-+	(cd $$dir; $(MAKE) $(MFLAGS)) || break;\
-+
- install: makeinclude
- 	-mkdir -p $(DESTDIR)$(bindir)
- 	$(RM) $(DESTDIR)$(bindir)/fltk-config
diff --git a/fltk13/patches/patch-ac b/fltk13/patches/patch-ac
deleted file mode 100644
index 4b5b418c78..0000000000
--- a/fltk13/patches/patch-ac
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD$
-
---- configure.orig	2016-11-11 16:04:30.000000000 +0000
-+++ configure
-@@ -3816,7 +3816,22 @@ if test "${enable_shared+set}" = set; th
-   enableval=$enable_shared;
- fi
- 
--if test x$enable_shared = xyes; then
-+
-+# 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 "$enable_shared" = "yes"; then
-+
-     PICFLAG=1
-     SHAREDSUFFIX=""
-     FLUID="fluid-shared"
-@@ -4051,6 +4066,20 @@ else
-     LINKSHARED="$LINKFLTKCAIRO ../lib/libfltk_images.a ../lib/libfltk_forms.a ../lib/libfltk.a"
- fi
- 
-+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
-+    LINKSHARED="-lfltk_images -lfltk_forms -lfltk"
-+    DSONAME="libfltk.la"
-+    FLDSONAME="libfltk_forms.la"
-+    GLDSONAME="libfltk_gl.la"
-+    IMGDSONAME="libfltk_images.la"
-+fi
- 
- 
- 
diff --git a/fltk13/patches/patch-ad b/fltk13/patches/patch-ad
deleted file mode 100644
index 1f6cdfe298..0000000000
--- a/fltk13/patches/patch-ad
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
---- documentation/Makefile.orig	2015-06-16 13:18:28.000000000 +0000
-+++ documentation/Makefile
-@@ -88,11 +88,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_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
diff --git a/fltk13/patches/patch-af b/fltk13/patches/patch-af
deleted file mode 100644
index 29aa0d061e..0000000000
--- a/fltk13/patches/patch-af
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD$
-
---- makeinclude.in.orig	2015-03-25 20:06:54.000000000 +0000
-+++ makeinclude.in
-@@ -150,20 +150,20 @@ 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/fltk13/patches/patch-ag b/fltk13/patches/patch-ag
deleted file mode 100644
index 7bb28b97bb..0000000000
--- a/fltk13/patches/patch-ag
+++ /dev/null
@@ -1,88 +0,0 @@
-$NetBSD$
-
---- src/Makefile.orig	2015-03-25 20:06:54.000000000 +0000
-+++ src/Makefile
-@@ -237,6 +237,10 @@ $(LIBNAME): $(OBJECTS)
- 	$(LIBCOMMAND) $@ $(OBJECTS)
- 	$(RANLIB) $@
- 
-+libfltk.la: $(OBJECTS)
-+	echo $(CXX) $@ ...
-+	${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(OBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 1:9 $(LDLIBS)
-+
- libfltk.so.$(FL_DSO_VERSION): $(OBJECTS)
- 	echo $(DSOCOMMAND) $@ ...
- 	$(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS)
-@@ -273,6 +277,10 @@ $(FLLIBNAME): $(FLOBJECTS)
- 	$(LIBCOMMAND) $@ $(FLOBJECTS)
- 	$(RANLIB) $@
- 
-+libfltk_forms.la: $(FLOBJECTS)
-+	echo $(CXX) $@ ...
-+	${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(FLOBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 1:9 $(LDLIBS)
-+
- 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)
- 	$(LIBCOMMAND) $@ $(GLOBJECTS)
- 	$(RANLIB) $@
- 
-+libfltk_gl.la: $(GLOBJECTS)
-+	echo $(CXX) $@ ...
-+	${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(GLOBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 1:9 $(LDLIBS)
-+
- 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)
- 	$(LIBCOMMAND) $@ $(IMGOBJECTS)
- 	$(RANLIB) $@
- 
-+libfltk_images.la: $(IMGOBJECTS)
-+	echo $(CXX) $@ ...
-+	${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(IMGOBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 1:9 $(LDLIBS)
-+
- 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) \
- 		$(INSTALL_LIB) $(GLLIBNAME) $(DESTDIR)$(libdir); \
- 		$(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBBASENAME); \
- 	fi
-+	if test x$(DSONAME) = xlibfltk.la; then\
-+		${LIBTOOL} --mode=install $(INSTALL_LIB) libfltk.la $(DESTDIR)$(libdir); \
-+	fi
- 	$(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) \
- 		$(RM) $(DESTDIR)$(libdir)/libfltk_s.a;\
- 		$(INSTALL_LIB) libfltk_s.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$(DSONAME) = xcygfltknox-$(FL_DSO_VERSION).dll; then\
- 		$(RM) $(DESTDIR)$(bindir)/$(DSONAME);\
- 		$(INSTALL_LIB) $(DSONAME) $(DESTDIR)$(bindir); \
-@@ -607,6 +629,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
-+	if test x$(GLDSONAME) = xlibfltk_gl.la; then\
-+		${LIBTOOL} --mode=install $(INSTALL_LIB) libfltk_gl.la $(DESTDIR)$(libdir); \
-+	fi
- 	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) \
- 		$(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/fltk13/patches/patch-fluid_Makefile b/fltk13/patches/patch-fluid_Makefile
deleted file mode 100644
index 09124fe412..0000000000
--- a/fltk13/patches/patch-fluid_Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
-Use libtool.
-
---- fluid/Makefile.orig	2019-03-03 08:40:23.000000000 +0000
-+++ fluid/Makefile
-@@ -50,7 +50,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
- 	$(OSX_ONLY) $(INSTALL_BIN) fluid fluid.app/Contents/MacOS
-@@ -74,7 +74,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)/usr/share/applications
diff --git a/fltk13/patches/patch-test_Makefile b/fltk13/patches/patch-test_Makefile
deleted file mode 100644
index 2a5a667e06..0000000000
--- a/fltk13/patches/patch-test_Makefile
+++ /dev/null
@@ -1,207 +0,0 @@
-$NetBSD$
-
-Use libtool.
-
---- test/Makefile.orig	2019-03-03 08:40:23.000000000 +0000
-+++ test/Makefile
-@@ -308,14 +308,14 @@ 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) $(INSTALL_BIN) blocks$(EXEEXT) blocks.app/Contents/MacOS
- 
- 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) $(INSTALL_BIN) checkers$(EXEEXT) checkers.app/Contents/MacOS
-@@ -324,7 +324,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)
- 	$(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
- 
- 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)
- 	$(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 ../ide/Xcode4/plists/editor-Info.plist editor.app/Contents/Info.plist
- 
-@@ -360,21 +360,21 @@ 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
- 
- 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 $@
- 
- hello$(EXEEXT): hello.o
- 
- help$(EXEEXT): help.o $(IMGLIBNAME)
- 	echo Linking $@...
--	$(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 $@
- 	$(OSX_ONLY) mkdir -p help.app/Contents/Resources
- 	$(OSX_ONLY) cp -f help-test.html help.app/Contents/Resources/
-@@ -394,14 +394,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 $(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
-@@ -410,7 +410,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)
-@@ -423,7 +423,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
-@@ -432,7 +432,7 @@ offscreen$(EXEEXT): offscreen.o
- 
- 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)
- 	$(OSX_ONLY) ../fltk-config --post $@
- 
- overlay$(EXEEXT): overlay.o
-@@ -443,7 +443,7 @@ pixmap$(EXEEXT): pixmap.o
- 
- 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
-@@ -467,7 +467,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) -r -f sudoku.app/Contents/MacOS
- 	$(OSX_ONLY) mkdir sudoku.app/Contents/MacOS
- 	$(OSX_ONLY) $(INSTALL_BIN) sudoku$(EXEEXT) sudoku.app/Contents/MacOS
-@@ -475,7 +475,7 @@ sudoku: sudoku.o
- sudoku.exe: sudoku.o sudoku.rc
- 	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
- 
-@@ -507,7 +507,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 $@
-@@ -518,37 +518,37 @@ 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 $@
- 
- 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) $(LINKFLTKCAIRO) $(GLDLIBS)
-+	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(CAIROFLAGS) $(LDFLAGS) -o $@ cairo_test.o $(LINKFLTK) $(LINKFLTKCAIRO) $(GLDLIBS)
- 	$(OSX_ONLY) ../fltk-config --post $@
- 
- #



Home | Main Index | Thread Index | Old Index