fltk13: Update to 1.3.6

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: fltk13: Update to 1.3.6
From: Michael Baeuerle <micha%NetBSD.org@localhost>
Date: Wed, 05 May 2021 15:45:00 +0000
Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Wed May 5 17:45:00 2021 +0200
Changeset:	583d79e5a6be4274a75fff19eb0016b4da292438

Added Files:
	fltk13/DESCR
	fltk13/Makefile
	fltk13/PLIST
	fltk13/buildlink3.mk
	fltk13/distinfo
	fltk13/patches/patch-Makefile
	fltk13/patches/patch-configure
	fltk13/patches/patch-documentation_Makefile
	fltk13/patches/patch-fluid_Makefile
	fltk13/patches/patch-makeinclude.in
	fltk13/patches/patch-src_Makefile

Log Message:
fltk13: Update to 1.3.6

CHANGES IN FLTK 1.3.6rc2                                RELEASED: May 04 2021

FLTK 1.3.6rc2 fixes some minor issues in 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

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

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

diffstat:
 fltk13/DESCR                                |  12 ++
 fltk13/Makefile                             |  77 ++++++++
 fltk13/PLIST                                | 294 ++++++++++++++++++++++++++++
 fltk13/buildlink3.mk                        |  35 ++++
 fltk13/distinfo                             |  12 ++
 fltk13/patches/patch-Makefile               |  30 +++
 fltk13/patches/patch-configure              |  51 +++++
 fltk13/patches/patch-documentation_Makefile |  18 ++
 fltk13/patches/patch-fluid_Makefile         |  24 +++
 fltk13/patches/patch-makeinclude.in         |  31 +++
 fltk13/patches/patch-src_Makefile           |  90 +++++++++
 11 files changed, 674 insertions(+)

diffs:
diff --git a/fltk13/DESCR b/fltk13/DESCR
new file mode 100644
index 0000000000..c575d968e7
--- /dev/null
+++ b/fltk13/DESCR
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 0000000000..368a7e42f3
--- /dev/null
+++ b/fltk13/Makefile
@@ -0,0 +1,77 @@
+# $NetBSD$
+
+DISTNAME=	fltk-1.3.6rc2-source
+PKGNAME=	${DISTNAME:S/-source//}
+VERS=		${DISTNAME:S/fltk-//:S/-source//}
+CATEGORIES=	x11
+MASTER_SITES=	https://fltk.org/pub/fltk/${VERS:S/rc2//}/
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=	https://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.options.mk"
+
+PTHREAD_OPTS+=		require
+GNU_CONFIGURE=		yes
+GNU_CONFIGURE_STRICT=	no	# --enable-libtool is not officially known,
+				# it is added partly in patch-ac.
+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/MesaLib/buildlink3.mk"
+.    include "../../graphics/glu/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 "../../x11/libXcursor/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
new file mode 100644
index 0000000000..7032a20afa
--- /dev/null
+++ b/fltk13/PLIST
@@ -0,0 +1,294 @@
+@comment $NetBSD: PLIST,v 1.6 2019/07/16 11:21:25 micha Exp $
+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
new file mode 100644
index 0000000000..eda243d6a3
--- /dev/null
+++ b/fltk13/buildlink3.mk
@@ -0,0 +1,35 @@
+# $NetBSD: buildlink3.mk,v 1.16 2020/08/17 20:17:49 leot Exp $
+
+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.5nb1
+BUILDLINK_PKGSRCDIR.fltk?=	../../wip/fltk13
+BUILDLINK_FILES.fltk+=		include/Fl/*
+
+pkgbase := fltk
+.include "../../mk/pkg-build-options.mk"
+
+# For "opengl" option
+.if ${PKG_BUILD_OPTIONS.fltk:Mopengl}
+.  if ${OPSYS} != "Darwin"
+.    include "../../graphics/MesaLib/buildlink3.mk"
+.    include "../../graphics/glu/buildlink3.mk"
+.  endif
+.endif
+
+.if ${OPSYS} != "Darwin"
+.  include "../../x11/libXcursor/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
new file mode 100644
index 0000000000..bf800f732a
--- /dev/null
+++ b/fltk13/distinfo
@@ -0,0 +1,12 @@
+$NetBSD: distinfo,v 1.11 2019/07/16 11:21:25 micha Exp $
+
+SHA1 (fltk-1.3.6rc2-source.tar.bz2) = 0fc8074a18bef1181286e58c70b919f5573f247a
+RMD160 (fltk-1.3.6rc2-source.tar.bz2) = 7c0743ae4e841a1f4185194998ad560589b99beb
+SHA512 (fltk-1.3.6rc2-source.tar.bz2) = 3dfc2b05b7a67feecc929a924db790aeb841c45b6bfe980ab53ba8b09b8fb14ee2154dd64ecefbfc42ddff978dae1be7f256332553ce43d2a850585712370dba
+Size (fltk-1.3.6rc2-source.tar.bz2) = 4572597 bytes
+SHA1 (patch-Makefile) = c10e99516649e8fc02b6041be162229baec7a550
+SHA1 (patch-configure) = 8f89285c4b007dcb7ca5ff7f5336b095415ea601
+SHA1 (patch-documentation_Makefile) = 4c0c4243311c170d6c645db41b8bb1821d053712
+SHA1 (patch-fluid_Makefile) = 3281a0933042495c22a0f84297ecb0d01570ce37
+SHA1 (patch-makeinclude.in) = 2abf1b5f89895e6485966c552093dbc0e1d28935
+SHA1 (patch-src_Makefile) = 50fc3c76402517b46d5bdc4946a282b0b607f8f8
diff --git a/fltk13/patches/patch-Makefile b/fltk13/patches/patch-Makefile
new file mode 100644
index 0000000000..32aec93b93
--- /dev/null
+++ b/fltk13/patches/patch-Makefile
@@ -0,0 +1,30 @@
+$NetBSD$
+
+Remove "test" from directory list to build.
+
+--- Makefile.orig	2021-05-04 17:36:17.000000000 +0000
++++ Makefile
+@@ -16,7 +16,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\
+@@ -24,6 +24,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-configure b/fltk13/patches/patch-configure
new file mode 100644
index 0000000000..0c4a8836e7
--- /dev/null
+++ b/fltk13/patches/patch-configure
@@ -0,0 +1,51 @@
+$NetBSD$
+
+Add libtool support.
+
+--- configure.orig	2021-05-04 18:40:48.000000000 +0000
++++ configure
+@@ -3830,7 +3830,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"
+@@ -4071,6 +4086,20 @@ else
+   FLUID_BUILD="../fluid/fluid$EXEEXT"
+ 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-documentation_Makefile b/fltk13/patches/patch-documentation_Makefile
new file mode 100644
index 0000000000..4e306d6015
--- /dev/null
+++ b/fltk13/patches/patch-documentation_Makefile
@@ -0,0 +1,18 @@
+$NetBSD$
+
+Do not install formatted man pages.
+
+--- documentation/Makefile.orig	2021-05-04 17:36:17.000000000 +0000
++++ documentation/Makefile
+@@ -86,11 +86,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-fluid_Makefile b/fltk13/patches/patch-fluid_Makefile
new file mode 100644
index 0000000000..0964aaa732
--- /dev/null
+++ b/fltk13/patches/patch-fluid_Makefile
@@ -0,0 +1,24 @@
+$NetBSD$
+
+Use libtool.
+
+--- fluid/Makefile.orig	2021-05-04 17:36:17.000000000 +0000
++++ fluid/Makefile
+@@ -48,7 +48,7 @@ all:	$(FLUID) fluid$(EXEEXT)
+ fluid$(EXEEXT):		$(OBJECTS) $(LIBNAME) $(FLLIBNAME) \
+ 			$(IMGLIBNAME)
+ 	echo Linking $@...
+-	$(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
+@@ -78,7 +78,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-makeinclude.in b/fltk13/patches/patch-makeinclude.in
new file mode 100644
index 0000000000..c199ba6ccc
--- /dev/null
+++ b/fltk13/patches/patch-makeinclude.in
@@ -0,0 +1,31 @@
+$NetBSD$
+
+Use libtool.
+
+--- makeinclude.in.orig	2021-05-04 17:36:17.000000000 +0000
++++ makeinclude.in
+@@ -152,20 +152,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-src_Makefile b/fltk13/patches/patch-src_Makefile
new file mode 100644
index 0000000000..d6ada34bac
--- /dev/null
+++ b/fltk13/patches/patch-src_Makefile
@@ -0,0 +1,90 @@
+$NetBSD$
+
+Use libtool.
+
+--- src/Makefile.orig	2021-05-04 17:36:17.000000000 +0000
++++ src/Makefile
+@@ -235,6 +235,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)
+@@ -271,6 +275,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)
+@@ -307,6 +315,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)
+@@ -343,6 +355,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)
+@@ -582,6 +598,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*;\
+@@ -602,6 +621,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); \
+@@ -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
++	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); \
+@@ -676,6 +701,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); \
Prev by Date: peak-classifier: Update to 0.0.1.27
Next by Date: Makefile: +fltk13
Previous by Thread: peak-classifier: Update to 0.0.1.27
Next by Thread: auto-admin: Update to 0.7.2.13
Indexes:
Home | Main Index | Thread Index | Old Index