fltk11: Add copy of x11/fltk (old FLTK 1.1 branch)

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: fltk11: Add copy of x11/fltk (old FLTK 1.1 branch)
From: Michael Baeuerle (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Fri, 31 Jan 2025 11:52:49 +0000
Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Fri Jan 31 12:50:26 2025 +0100
Changeset:	b05bbddcf07717c1162417f5f2132f040873214a

Modified Files:
	Makefile
Added Files:
	fltk11/DESCR
	fltk11/Makefile
	fltk11/PLIST
	fltk11/README
	fltk11/buildlink3.mk
	fltk11/distinfo
	fltk11/patches/patch-aa
	fltk11/patches/patch-ab
	fltk11/patches/patch-ac
	fltk11/patches/patch-ad
	fltk11/patches/patch-ae
	fltk11/patches/patch-af
	fltk11/patches/patch-ag
	fltk11/patches/patch-ah
	fltk11/patches/patch-fluid_Fl__Type.h
	fltk11/patches/patch-src_fl__draw.cxx

Log Message:
fltk11: Add copy of x11/fltk (old FLTK 1.1 branch)

Add license to Makefile.

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

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

diffstat:
 Makefile                              |   1 +
 fltk11/DESCR                          |  13 ++
 fltk11/Makefile                       |  54 +++++
 fltk11/PLIST                          | 426 ++++++++++++++++++++++++++++++++++
 fltk11/README                         |   5 +
 fltk11/buildlink3.mk                  |  21 ++
 fltk11/distinfo                       |  15 ++
 fltk11/patches/patch-aa               |  28 +++
 fltk11/patches/patch-ab               |  75 ++++++
 fltk11/patches/patch-ac               | 119 ++++++++++
 fltk11/patches/patch-ad               |  16 ++
 fltk11/patches/patch-ae               |  22 ++
 fltk11/patches/patch-af               |  24 ++
 fltk11/patches/patch-ag               |  88 +++++++
 fltk11/patches/patch-ah               |  60 +++++
 fltk11/patches/patch-fluid_Fl__Type.h |  13 ++
 fltk11/patches/patch-src_fl__draw.cxx |  25 ++
 17 files changed, 1005 insertions(+)

diffs:
diff --git a/Makefile b/Makefile
index 3283cf0e45..98a2200da2 100644
--- a/Makefile
+++ b/Makefile
@@ -988,6 +988,7 @@ SUBDIR+=	flite2
 SUBDIR+=	flnews-devel
 SUBDIR+=	flowblade
 SUBDIR+=	flpsed
+SUBDIR+=	fltk11
 SUBDIR+=	fltk14-devel
 SUBDIR+=	fltk2
 SUBDIR+=	flux2
diff --git a/fltk11/DESCR b/fltk11/DESCR
new file mode 100644
index 0000000000..7b9224a8e3
--- /dev/null
+++ b/fltk11/DESCR
@@ -0,0 +1,13 @@
+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.1.  From the FLTK website:
+
+  FLTK 1.1.x is the former stable development branch. It is no longer
+  being maintained, and any bug fixes will be applied against FLTK
+  1.3.x.
+
+New applications should use the FLTK 1.4 API.
diff --git a/fltk11/Makefile b/fltk11/Makefile
new file mode 100644
index 0000000000..fe1ade91af
--- /dev/null
+++ b/fltk11/Makefile
@@ -0,0 +1,54 @@
+# $NetBSD$
+
+DISTNAME=	fltk-1.1.10-source
+PKGNAME=	${DISTNAME:S/-source//}
+VERS=		${DISTNAME:S/fltk-//:S/-source//}
+PKGREVISION=	7
+CATEGORIES=	x11
+MASTER_SITES=	http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk/${VERS}/
+MASTER_SITES+=	ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/${VERS}/
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=	https://www.fltk.org/
+COMMENT=	Fast Light Tool Kit for graphical user interfaces (old 1.1 branch)
+LICENSE=	gnu-lgpl-v2
+
+WRKSRC=			${WRKDIR}/${DISTNAME:S/-source//}
+USE_LANGUAGES=		c c++
+USE_LIBTOOL=		yes
+USE_TOOLS+=		gmake
+TEST_TARGET=		test
+
+PTHREAD_OPTS+=		require
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--enable-libtool=${LIBTOOL:Q}
+CONFIGURE_ARGS+=	--enable-threads
+CONFIGURE_ARGS+=	ac_cv_have_overlay=yes
+
+.include "../../mk/bsd.prefs.mk"
+
+PLIST_VARS+=		cs	# case-sensitive
+.if !exists(./descr) && ${OPSYS} != "Darwin"
+CONFIGURE_ARGS+=	--with-links
+PLIST.cs=		yes
+.endif
+
+# Fl_Text_Buffer.cxx: In function 'char chooseNullSubsChar(char*)':
+# Fl_Text_Buffer.cxx:1338:34: error: array subscript has type 'char' [-Werror=char-subscripts]
+#      if ( hist[ replacements[ i ] ] == 0 )
+#                                   ^
+# Maybe fix this later.
+BUILDLINK_TRANSFORM+=	rm:-Werror=char-subscripts
+
+
+BUILDLINK_DEPMETHOD.libXt?=	build
+
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/fltk11/PLIST b/fltk11/PLIST
new file mode 100644
index 0000000000..1d936b2de7
--- /dev/null
+++ b/fltk11/PLIST
@@ -0,0 +1,426 @@
+@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_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_Counter.H
+${PLIST.cs}include/FL/Fl_Counter.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_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_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_Pixmap.H
+${PLIST.cs}include/FL/Fl_Pixmap.h
+include/FL/Fl_Positioner.H
+${PLIST.cs}include/FL/Fl_Positioner.h
+include/FL/Fl_Preferences.H
+${PLIST.cs}include/FL/Fl_Preferences.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_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_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/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/forms.H
+${PLIST.cs}include/FL/forms.h
+include/FL/gl.h
+include/FL/gl2opengl.h
+include/FL/gl_draw.H
+${PLIST.cs}include/FL/gl_draw.h
+include/FL/glu.h
+include/FL/glut.H
+${PLIST.cs}include/FL/glut.h
+include/FL/mac.H
+${PLIST.cs}include/FL/mac.h
+include/FL/mac.r
+include/FL/math.h
+include/FL/names.h
+include/FL/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
+lib/libfltk_gl.la
+lib/libfltk_images.la
+man/man1/fltk-config.1
+man/man1/fluid.1
+man/man3/fltk.3
+share/doc/fltk/FL.gif
+share/doc/fltk/Fl.html
+share/doc/fltk/Fl_Adjuster.html
+share/doc/fltk/Fl_BMP_Image.html
+share/doc/fltk/Fl_Bitmap.html
+share/doc/fltk/Fl_Box.html
+share/doc/fltk/Fl_Browser.html
+share/doc/fltk/Fl_Browser_.html
+share/doc/fltk/Fl_Button.html
+share/doc/fltk/Fl_Chart.html
+share/doc/fltk/Fl_Check_Browser.html
+share/doc/fltk/Fl_Check_Button.gif
+share/doc/fltk/Fl_Check_Button.html
+share/doc/fltk/Fl_Choice.html
+share/doc/fltk/Fl_Clock.html
+share/doc/fltk/Fl_Clock_Output.html
+share/doc/fltk/Fl_Color_Chooser.html
+share/doc/fltk/Fl_Counter.html
+share/doc/fltk/Fl_Dial.html
+share/doc/fltk/Fl_Double_Window.html
+share/doc/fltk/Fl_End.html
+share/doc/fltk/Fl_File_Browser.html
+share/doc/fltk/Fl_File_Chooser.html
+share/doc/fltk/Fl_File_Chooser.jpg
+share/doc/fltk/Fl_File_Icon.html
+share/doc/fltk/Fl_File_Input.gif
+share/doc/fltk/Fl_File_Input.html
+share/doc/fltk/Fl_Float_Input.html
+share/doc/fltk/Fl_Free.html
+share/doc/fltk/Fl_GIF_Image.html
+share/doc/fltk/Fl_Gl_Window.html
+share/doc/fltk/Fl_Group.html
+share/doc/fltk/Fl_Help_Dialog.gif
+share/doc/fltk/Fl_Help_Dialog.html
+share/doc/fltk/Fl_Help_View.html
+share/doc/fltk/Fl_Hold_Browser.html
+share/doc/fltk/Fl_Image.html
+share/doc/fltk/Fl_Input.html
+share/doc/fltk/Fl_Input_.html
+share/doc/fltk/Fl_Input_Choice.html
+share/doc/fltk/Fl_Int_Input.html
+share/doc/fltk/Fl_JPEG_Image.html
+share/doc/fltk/Fl_Light_Button.gif
+share/doc/fltk/Fl_Light_Button.html
+share/doc/fltk/Fl_Menu_.html
+share/doc/fltk/Fl_Menu_Bar.html
+share/doc/fltk/Fl_Menu_Button.html
+share/doc/fltk/Fl_Menu_Item.html
+share/doc/fltk/Fl_Menu_Window.html
+share/doc/fltk/Fl_Multi_Browser.html
+share/doc/fltk/Fl_Multiline_Input.html
+share/doc/fltk/Fl_Multiline_Output.html
+share/doc/fltk/Fl_Output.html
+share/doc/fltk/Fl_Overlay_Window.html
+share/doc/fltk/Fl_PNG_Image.html
+share/doc/fltk/Fl_PNM_Image.html
+share/doc/fltk/Fl_Pack.html
+share/doc/fltk/Fl_Pixmap.html
+share/doc/fltk/Fl_Positioner.html
+share/doc/fltk/Fl_Preferences.html
+share/doc/fltk/Fl_Progress.html
+share/doc/fltk/Fl_RGB_Image.html
+share/doc/fltk/Fl_Repeat_Button.html
+share/doc/fltk/Fl_Return_Button.gif
+share/doc/fltk/Fl_Return_Button.html
+share/doc/fltk/Fl_Roller.gif
+share/doc/fltk/Fl_Roller.html
+share/doc/fltk/Fl_Round_Button.gif
+share/doc/fltk/Fl_Round_Button.html
+share/doc/fltk/Fl_Scroll.gif
+share/doc/fltk/Fl_Scroll.html
+share/doc/fltk/Fl_Scrollbar.html
+share/doc/fltk/Fl_Secret_Input.html
+share/doc/fltk/Fl_Select_Browser.html
+share/doc/fltk/Fl_Shared_Image.html
+share/doc/fltk/Fl_Single_Window.html
+share/doc/fltk/Fl_Slider.html
+share/doc/fltk/Fl_Spinner.html
+share/doc/fltk/Fl_Tabs.html
+share/doc/fltk/Fl_Text_Buffer.html
+share/doc/fltk/Fl_Text_Display.html
+share/doc/fltk/Fl_Text_Editor.html
+share/doc/fltk/Fl_Tile.gif
+share/doc/fltk/Fl_Tile.html
+share/doc/fltk/Fl_Tiled_Image.html
+share/doc/fltk/Fl_Timer.html
+share/doc/fltk/Fl_Toggle_Button.html
+share/doc/fltk/Fl_Tooltip.html
+share/doc/fltk/Fl_Valuator.html
+share/doc/fltk/Fl_Value_Input.gif
+share/doc/fltk/Fl_Value_Input.html
+share/doc/fltk/Fl_Value_Output.gif
+share/doc/fltk/Fl_Value_Output.html
+share/doc/fltk/Fl_Value_Slider.html
+share/doc/fltk/Fl_Widget.html
+share/doc/fltk/Fl_Window.html
+share/doc/fltk/Fl_Wizard.html
+share/doc/fltk/Fl_XBM_Image.html
+share/doc/fltk/Fl_XPM_Image.html
+share/doc/fltk/adjuster1.gif
+share/doc/fltk/advanced.html
+share/doc/fltk/basics.html
+share/doc/fltk/boxtypes.gif
+share/doc/fltk/buttons.gif
+share/doc/fltk/charts.gif
+share/doc/fltk/choice.gif
+share/doc/fltk/clock.gif
+share/doc/fltk/common.html
+share/doc/fltk/counter.gif
+share/doc/fltk/cubeview.gif
+share/doc/fltk/dial.gif
+share/doc/fltk/drawing.html
+share/doc/fltk/editor-replace.gif
+share/doc/fltk/editor.gif
+share/doc/fltk/editor.html
+share/doc/fltk/enumerations.html
+share/doc/fltk/events.html
+share/doc/fltk/examples.html
+share/doc/fltk/fl_alert.gif
+share/doc/fltk/fl_ask.gif
+share/doc/fltk/fl_choice.gif
+share/doc/fltk/fl_color_chooser.jpg
+share/doc/fltk/fl_input.gif
+share/doc/fltk/fl_message.gif
+share/doc/fltk/fl_password.gif
+share/doc/fltk/fl_show_colormap.gif
+share/doc/fltk/fluid-catgets.gif
+share/doc/fltk/fluid-gettext.gif
+share/doc/fltk/fluid-org.gif
+share/doc/fltk/fluid.html
+share/doc/fltk/fluid1.gif
+share/doc/fltk/fluid2.gif
+share/doc/fltk/fluid3-cxx.gif
+share/doc/fltk/fluid3-gui.gif
+share/doc/fltk/fluid3-style.gif
+share/doc/fltk/fluid4.gif
+share/doc/fltk/fluid_prefs.gif
+share/doc/fltk/fluid_widget_cxx.gif
+share/doc/fltk/fluid_widget_gui.gif
+share/doc/fltk/fluid_widget_style.gif
+share/doc/fltk/forms.html
+share/doc/fltk/functions.html
+share/doc/fltk/glut.html
+share/doc/fltk/hello.C.gif
+share/doc/fltk/index.html
+share/doc/fltk/input_choice.jpg
+share/doc/fltk/intro.html
+share/doc/fltk/license.html
+share/doc/fltk/menu.gif
+share/doc/fltk/menu_button.gif
+share/doc/fltk/menubar.gif
+share/doc/fltk/migration.html
+share/doc/fltk/opengl.html
+share/doc/fltk/osissues.html
+share/doc/fltk/positioner.gif
+share/doc/fltk/preface.html
+share/doc/fltk/resizebox1.gif
+share/doc/fltk/resizebox2.gif
+share/doc/fltk/round_clock.gif
+share/doc/fltk/scrollbar.gif
+share/doc/fltk/slider.gif
+share/doc/fltk/subclassing.html
+share/doc/fltk/symbols.gif
+share/doc/fltk/tabs.gif
+share/doc/fltk/text.gif
+share/doc/fltk/valuators.gif
+share/doc/fltk/value_slider.gif
+share/doc/fltk/widgets.html
diff --git a/fltk11/README b/fltk11/README
new file mode 100644
index 0000000000..59164e93b3
--- /dev/null
+++ b/fltk11/README
@@ -0,0 +1,5 @@
+This package provides the FLTK 1.1 API (no longer maintained).
+New applications should use the FLTK 1.4 API.
+
+This package is intended for potential users of the former package x11/fltk
+with FLTK 1.1.
diff --git a/fltk11/buildlink3.mk b/fltk11/buildlink3.mk
new file mode 100644
index 0000000000..a26b4283df
--- /dev/null
+++ b/fltk11/buildlink3.mk
@@ -0,0 +1,21 @@
+# $NetBSD$
+
+BUILDLINK_TREE+=	fltk
+
+.if !defined(FLTK_BUILDLINK3_MK)
+FLTK_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.fltk+=	fltk>=1.1.5rc1<1.3
+BUILDLINK_ABI_DEPENDS.fltk?=	fltk>=1.1.10nb7<1.3
+BUILDLINK_PKGSRCDIR.fltk?=	../../wip/fltk11
+BUILDLINK_FILES.fltk+=		include/Fl/*
+
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.endif # FLTK_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-fltk
diff --git a/fltk11/distinfo b/fltk11/distinfo
new file mode 100644
index 0000000000..a6ad962667
--- /dev/null
+++ b/fltk11/distinfo
@@ -0,0 +1,15 @@
+$NetBSD$
+
+BLAKE2s (fltk-1.1.10-source.tar.bz2) = 64883d2b8ad915a4922bbc3d3c799f5efbd751c77ff9ac3b8fd49d235578f301
+SHA512 (fltk-1.1.10-source.tar.bz2) = 5bdece6855f190e56ea57a54ebe38172f177e9a4ac40d834f7a646a1d419bf92cfda46a30a1434a952c81a2ad14a22a7a02961c8a24d0cfc352f4d80dc3319a6
+Size (fltk-1.1.10-source.tar.bz2) = 2214382 bytes
+SHA1 (patch-aa) = 661dcac75cf50c791c2edcc14ec93e9ee83b062a
+SHA1 (patch-ab) = 6c7b22664d0cc474ec3c26a1afa9150e535061a4
+SHA1 (patch-ac) = 6aa8efbb4bf9d9e49662d30ec02f02725220dfd8
+SHA1 (patch-ad) = b04051b14eb0bc74e8ccfe762e367ab8ccb11b80
+SHA1 (patch-ae) = de29d1be1219c3b17707216a7c54c25a9adb746c
+SHA1 (patch-af) = 791ba33cfc85e41e0f2b75ce0d1b0d6a378d9d0b
+SHA1 (patch-ag) = aaeb376acf79b695e8376e7610534d125dff6a86
+SHA1 (patch-ah) = 876f79b4d0523035307ecc7d76460cad44b40704
+SHA1 (patch-fluid_Fl__Type.h) = b2ea0bebf152ab0755135fbe8cc6179d2f6d79e1
+SHA1 (patch-src_fl__draw.cxx) = 824ee95fe997ed553b88801569b35f3698d11898
diff --git a/fltk11/patches/patch-aa b/fltk11/patches/patch-aa
new file mode 100644
index 0000000000..7d1d14d801
--- /dev/null
+++ b/fltk11/patches/patch-aa
@@ -0,0 +1,28 @@
+$NetBSD$
+
+--- Makefile.orig	2007-11-20 22:15:08.000000000 +0100
++++ Makefile
+@@ -27,7 +27,7 @@
+ 
+ include makeinclude
+ 
+-DIRS	=	$(IMAGEDIRS) src fluid test documentation
++DIRS	=	$(IMAGEDIRS) src fluid documentation
+ 
+ all: makeinclude fltk-config
+ 	for dir in $(DIRS); do\
+@@ -35,6 +35,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/fltk11/patches/patch-ab b/fltk11/patches/patch-ab
new file mode 100644
index 0000000000..270ab3b903
--- /dev/null
+++ b/fltk11/patches/patch-ab
@@ -0,0 +1,75 @@
+$NetBSD$
+
+--- configure.in.orig	2009-09-20 17:25:25.000000000 +0000
++++ configure.in
+@@ -122,6 +122,7 @@ AC_SUBST(GLLIBNAME)
+ AC_SUBST(IMGLIBNAME)
+ AC_SUBST(LIBEXT)
+ AC_SUBST(LIBNAME)
++AC_SUBST(LIBTOOL)
+ AC_SUBST(LINKFLTK)
+ AC_SUBST(LINKFLTKFORMS)
+ AC_SUBST(LINKFLTKGL)
+@@ -143,6 +144,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(libtool, [  --enable-libtool=LIBTOOL_PATH
++                          turn on building with libtool [default=no]],[
++if eval "test x$enable_libtool != xno"; then
++    LIBTOOL="$enable_libtool"
++    enable_shared=no
++else
++    LIBTOOL=""
++fi])
++
+ if test x$enable_shared = xyes; then
+     PICFLAG=1
+     SHAREDSUFFIX=""
+@@ -261,6 +271,21 @@ else
+     FLUID="fluid"
+     LINKSHARED="../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
++
+ 
+ AC_SUBST(DSOCOMMAND)
+ AC_SUBST(DSOFLAGS)
+@@ -611,7 +636,7 @@ AC_ARG_ENABLE(localpng, [  --enable-loca
+ syspnglib_ok=no
+ syspnginc_ok=no
+ if test x$enable_localpng != xyes; then
+-  AC_CHECK_LIB(png, png_read_info, 
++  AC_CHECK_LIB(png16, png_read_info, 
+     [AC_CHECK_HEADER(png.h, 
+ 	AC_DEFINE(HAVE_PNG_H)
+ 	syspnginc_ok=yes)
+@@ -640,11 +665,11 @@ if test x$enable_localpng = xyes -o x$sy
+ else
+     PNGINC=""
+     PNG=""
+-    IMAGELIBS="-lpng $IMAGELIBS"
+-    STATICIMAGELIBS="-lpng $STATICIMAGELIBS"
++    IMAGELIBS="-lpng16 $IMAGELIBS"
++    STATICIMAGELIBS="-lpng16 $STATICIMAGELIBS"
+     AC_DEFINE(HAVE_LIBPNG)
+-    AC_CHECK_LIB(png,png_get_valid, AC_DEFINE(HAVE_PNG_GET_VALID))
+-    AC_CHECK_LIB(png,png_set_tRNS_to_alpha, AC_DEFINE(HAVE_PNG_SET_TRNS_TO_ALPHA))
++    AC_CHECK_LIB(png16,png_get_valid, AC_DEFINE(HAVE_PNG_GET_VALID))
++    AC_CHECK_LIB(png16,png_set_tRNS_to_alpha, AC_DEFINE(HAVE_PNG_SET_TRNS_TO_ALPHA))
+ fi
+ 
+ AC_SUBST(JPEG)
diff --git a/fltk11/patches/patch-ac b/fltk11/patches/patch-ac
new file mode 100644
index 0000000000..ef8d0eaeac
--- /dev/null
+++ b/fltk11/patches/patch-ac
@@ -0,0 +1,119 @@
+$NetBSD$
+
+--- configure.orig	2009-12-27 15:24:34.000000000 +0000
++++ configure
+@@ -1323,6 +1323,8 @@ Optional Features:
+   --enable-debug          turn on debugging default=no
+   --enable-gl             turn on OpenGL support default=yes
+   --enable-shared         turn on shared libraries default=no
++  --enable-libtool=LIBTOOL_PATH
++                          turn on building with libtool [default=no]
+   --enable-threads        enable multi-threading support
+   --enable-quartz         use Quartz instead of Quickdraw (default=no)
+   --disable-largefile     omit support for large files
+@@ -1898,7 +1900,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"
+@@ -2018,8 +2035,20 @@ else
+     LINKSHARED="../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
+ 
+ 
+ 
+@@ -8794,13 +8823,13 @@ fi
+ syspnglib_ok=no
+ syspnginc_ok=no
+ if test x$enable_localpng != xyes; then
+-  { echo "$as_me:$LINENO: checking for png_read_info in -lpng" >&5
+-echo $ECHO_N "checking for png_read_info in -lpng... $ECHO_C" >&6; }
++  { echo "$as_me:$LINENO: checking for png_read_info in -lpng16" >&5
++echo $ECHO_N "checking for png_read_info in -lpng16... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_png_png_read_info+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpng  $LIBS"
++LIBS="-lpng16  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -9161,19 +9190,19 @@ echo "$as_me: WARNING: Cannot find syste
+ else
+     PNGINC=""
+     PNG=""
+-    IMAGELIBS="-lpng $IMAGELIBS"
+-    STATICIMAGELIBS="-lpng $STATICIMAGELIBS"
++    IMAGELIBS="-lpng16 $IMAGELIBS"
++    STATICIMAGELIBS="-lpng16 $STATICIMAGELIBS"
+     cat >>confdefs.h <<\_ACEOF
+ #define HAVE_LIBPNG 1
+ _ACEOF
+ 
+-    { echo "$as_me:$LINENO: checking for png_get_valid in -lpng" >&5
+-echo $ECHO_N "checking for png_get_valid in -lpng... $ECHO_C" >&6; }
++    { echo "$as_me:$LINENO: checking for png_get_valid in -lpng16" >&5
++echo $ECHO_N "checking for png_get_valid in -lpng16... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_png_png_get_valid+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpng  $LIBS"
++LIBS="-lpng16  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -9235,13 +9264,13 @@ _ACEOF
+ 
+ fi
+ 
+-    { echo "$as_me:$LINENO: checking for png_set_tRNS_to_alpha in -lpng" >&5
+-echo $ECHO_N "checking for png_set_tRNS_to_alpha in -lpng... $ECHO_C" >&6; }
++    { echo "$as_me:$LINENO: checking for png_set_tRNS_to_alpha in -lpng16" >&5
++echo $ECHO_N "checking for png_set_tRNS_to_alpha in -lpng16... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_png_png_set_tRNS_to_alpha+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpng  $LIBS"
++LIBS="-lpng16  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
diff --git a/fltk11/patches/patch-ad b/fltk11/patches/patch-ad
new file mode 100644
index 0000000000..83faa4f905
--- /dev/null
+++ b/fltk11/patches/patch-ad
@@ -0,0 +1,16 @@
+$NetBSD$
+
+--- documentation/Makefile.orig	2008-11-10 17:38:24.000000000 +0100
++++ documentation/Makefile
+@@ -237,11 +237,6 @@ install: $(MANPAGES)
+ 		$(INSTALL_DATA) $$file $(DESTDIR)$(docdir); \
+ 	done
+ 	echo "Installing man pages in $(DESTDIR)$(mandir)..."
+-	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat1
+-	$(INSTALL_MAN) fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
+-	$(INSTALL_MAN) fltk-config.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
+-	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat3
+-	$(INSTALL_MAN) fltk.$(CAT3EXT) $(DESTDIR)$(mandir)/cat3
+ 	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/man1
+ 	$(INSTALL_MAN) fluid.man $(DESTDIR)$(mandir)/man1/fluid.1
+ 	$(INSTALL_MAN) fltk-config.man $(DESTDIR)$(mandir)/man1/fltk-config.1
diff --git a/fltk11/patches/patch-ae b/fltk11/patches/patch-ae
new file mode 100644
index 0000000000..0590b697c1
--- /dev/null
+++ b/fltk11/patches/patch-ae
@@ -0,0 +1,22 @@
+$NetBSD$
+
+--- fluid/Makefile.orig	2008-12-29 20:21:29.000000000 +0000
++++ fluid/Makefile
+@@ -57,7 +57,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)
+ 	$(OSX_ONLY) $(INSTALL_BIN) fluid fluid.app/Contents/MacOS
+ 	$(POSTBUILD) $@ ../FL/mac.r
+ 
+@@ -81,7 +81,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/fltk11/patches/patch-af b/fltk11/patches/patch-af
new file mode 100644
index 0000000000..dc97a98699
--- /dev/null
+++ b/fltk11/patches/patch-af
@@ -0,0 +1,24 @@
+$NetBSD$
+
+--- makeinclude.in.orig	2008-12-29 20:21:29.000000000 +0000
++++ makeinclude.in
+@@ -139,16 +139,16 @@ UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@
+ 
+ .o$(EXEEXT):
+ 	echo Linking $@...
+-	$(CXX) $(ARCHFLAGS) $(LDFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@
++	${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@
+ 	$(POSTBUILD) $@ ../FL/mac.r
+ 
+ .c.o:
+ 	echo Compiling $<...
+-	$(CC) -I.. $(ARCHFLAGS) @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CFLAGS) -c $<
++	${LIBTOOL} --mode=compile $(CC) -I.. $(ARCHFLAGS) @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CFLAGS) -c $<
+ 
+ .cxx.o:
+ 	echo Compiling $<...
+-	$(CXX) -I.. $(ARCHFLAGS) @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CXXFLAGS) -c $<
++	${LIBTOOL} --mode=compile $(CXX) -I.. $(ARCHFLAGS) @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CXXFLAGS) -c $<
+ 
+ .man.0 .man.1 .man.3 .man.6:
+ 	echo Formatting $<...
diff --git a/fltk11/patches/patch-ag b/fltk11/patches/patch-ag
new file mode 100644
index 0000000000..559c80c64f
--- /dev/null
+++ b/fltk11/patches/patch-ag
@@ -0,0 +1,88 @@
+$NetBSD$
+
+--- src/Makefile.orig	2009-07-02 09:42:17.000000000 +0000
++++ src/Makefile
+@@ -208,6 +208,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.1.1: $(OBJECTS)
+ 	echo $(DSOCOMMAND) $@ ...
+ 	$(DSOCOMMAND) $@ $(OBJECTS)
+@@ -244,6 +248,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.1.1: $(FLOBJECTS) libfltk.so.1.1
+ 	echo $(DSOCOMMAND) $@ ...
+ 	$(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk
+@@ -280,6 +288,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.1.1: $(GLOBJECTS) libfltk.so.1.1
+ 	echo $(DSOCOMMAND) $@ ...
+ 	$(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk
+@@ -316,6 +328,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.1.1: $(IMGOBJECTS) libfltk.so.1.1
+ 	echo $(DSOCOMMAND) $@ ...
+ 	$(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk
+@@ -504,6 +520,9 @@ install: $(LIBNAME) $(DSONAME) \
+ 		$(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBBASENAME); \
+ 	fi
+ 	$(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBBASENAME)
++	if test x$(DSONAME) = xlibfltk.la; then\
++		${LIBTOOL} --mode=install $(INSTALL_LIB) libfltk.la $(DESTDIR)$(libdir); \
++	fi
+ 	if test x$(DSONAME) = xlibfltk.so.1.1; then\
+ 		$(RM) $(DESTDIR)$(libdir)/libfltk.so*;\
+ 		$(INSTALL_LIB) libfltk.so.1.1 $(DESTDIR)$(libdir); \
+@@ -523,6 +542,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-1.1.dll; then\
+ 		$(RM) $(DESTDIR)$(bindir)/$(DSONAME);\
+ 		$(INSTALL_LIB) $(DSONAME) $(DESTDIR)$(bindir); \
+@@ -540,6 +562,9 @@ install: $(LIBNAME) $(DSONAME) \
+ 		$(INSTALL_LIB) libfltk_forms.so.1.1 $(DESTDIR)$(libdir); \
+ 		$(LN) libfltk_forms.so.1.1 $(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.1.1; then\
+ 		$(RM) $(DESTDIR)$(libdir)/libfltk_forms.sl*;\
+ 		$(INSTALL_LIB) libfltk_forms.sl.1.1 $(DESTDIR)$(libdir); \
+@@ -597,6 +622,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.1.1; then\
+ 		$(RM) $(DESTDIR)$(libdir)/libfltk_images.so*;\
+ 		$(INSTALL_LIB) libfltk_images.so.1.1 $(DESTDIR)$(libdir); \
diff --git a/fltk11/patches/patch-ah b/fltk11/patches/patch-ah
new file mode 100644
index 0000000000..a21c50bdd3
--- /dev/null
+++ b/fltk11/patches/patch-ah
@@ -0,0 +1,60 @@
+$NetBSD$
+
+Fix build with png-1.5.
+http://www.fltk.org/str.php?L2542+P0+S-2+C0+I0+E0+Q
+
+--- src/Fl_PNG_Image.cxx.orig	2006-06-09 16:16:34.000000000 +0000
++++ src/Fl_PNG_Image.cxx
+@@ -66,6 +66,7 @@ Fl_PNG_Image::Fl_PNG_Image(const char *p
+   png_structp	pp;			// PNG read pointer
+   png_infop	info;			// PNG info pointers
+   png_bytep	*rows;			// PNG row pointers
++  int		num_trans = 0;		// PNG # of transp. colors
+ 
+ 
+   // Open the PNG file...
+@@ -75,7 +76,7 @@ Fl_PNG_Image::Fl_PNG_Image(const char *p
+   pp   = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+   info = png_create_info_struct(pp);
+ 
+-  if (setjmp(pp->jmpbuf))
++  if (setjmp(png_jmpbuf(pp)))
+   {
+     Fl::warning("PNG file \"%s\" contains errors!\n", png);
+     return;
+@@ -87,27 +88,28 @@ Fl_PNG_Image::Fl_PNG_Image(const char *p
+   // Get the image dimensions and convert to grayscale or RGB...
+   png_read_info(pp, info);
+ 
+-  if (info->color_type == PNG_COLOR_TYPE_PALETTE)
++  if (png_get_color_type(pp, info) == PNG_COLOR_TYPE_PALETTE)
+     png_set_expand(pp);
+ 
+-  if (info->color_type & PNG_COLOR_MASK_COLOR)
++  if (png_get_color_type(pp, info) & PNG_COLOR_MASK_COLOR)
+     channels = 3;
+   else
+     channels = 1;
+ 
+-  if ((info->color_type & PNG_COLOR_MASK_ALPHA) || info->num_trans)
++  png_get_tRNS(pp, info, 0, &num_trans, 0);
++  if ((png_get_color_type(pp, info) & PNG_COLOR_MASK_ALPHA) || num_trans)
+     channels ++;
+ 
+-  w((int)(info->width));
+-  h((int)(info->height));
++  w((int)(png_get_image_width(pp, info)));
++  h((int)(png_get_image_height(pp, info)));
+   d(channels);
+ 
+-  if (info->bit_depth < 8)
++  if (png_get_bit_depth(pp, info) < 8)
+   {
+     png_set_packing(pp);
+     png_set_expand(pp);
+   }
+-  else if (info->bit_depth == 16)
++  else if (png_get_bit_depth(pp, info) == 16)
+     png_set_strip_16(pp);
+ 
+ #  if defined(HAVE_PNG_GET_VALID) && defined(HAVE_PNG_SET_TRNS_TO_ALPHA)
diff --git a/fltk11/patches/patch-fluid_Fl__Type.h b/fltk11/patches/patch-fluid_Fl__Type.h
new file mode 100644
index 0000000000..0f53cacef8
--- /dev/null
+++ b/fltk11/patches/patch-fluid_Fl__Type.h
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- fluid/Fl_Type.h.orig	2008-01-04 21:45:49.000000000 +0000
++++ fluid/Fl_Type.h
+@@ -44,7 +44,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/fltk11/patches/patch-src_fl__draw.cxx b/fltk11/patches/patch-src_fl__draw.cxx
new file mode 100644
index 0000000000..59d5808c92
--- /dev/null
+++ b/fltk11/patches/patch-src_fl__draw.cxx
@@ -0,0 +1,25 @@
+$NetBSD$
+
+Use std::min correctly.
+
+--- src/fl_draw.cxx.orig	2006-12-21 19:39:26.000000000 +0000
++++ src/fl_draw.cxx
+@@ -32,14 +32,17 @@
+ // Expands all unprintable characters to ^X or \nnn notation
+ // Aligns them against the inside of the box.
+ 
+-#define min(a,b) ((a)<(b)?(a):(b))
++//#define min(a,b) ((a)<(b)?(a):(b))
+ #include <FL/fl_draw.H>
+ #include <FL/Fl_Image.H>
+ 
+ #include "flstring.h"
++#include <algorithm>
+ #include <ctype.h>
+ #include <math.h>
+ 
++using std::min;
++
+ #define MAXBUF 1024
+ 
+ char fl_draw_shortcut;	// set by fl_labeltypes.cxx
Prev by Date: fltk2: Update DESCR
Next by Date: rust183: drop -v option to x.py invocations, to reduce logging volume.
Previous by Thread: fltk2: Update DESCR
Next by Thread: rust183: drop -v option to x.py invocations, to reduce logging volume.
Indexes:
Home | Main Index | Thread Index | Old Index