pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
fltk14-devel: Import FLTK 1.4.x development snapshot
Module Name: pkgsrc-wip
Committed By: Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>
Pushed By: micha
Date: Fri Oct 12 16:10:06 2018 +0200
Changeset: 5ead1341de242bea420e4d6100a846d7230e9634
Added Files:
fltk14-devel/DESCR
fltk14-devel/Makefile
fltk14-devel/PLIST
fltk14-devel/README
fltk14-devel/TODO
fltk14-devel/buildlink3.mk
fltk14-devel/distinfo
fltk14-devel/patches/patch-Makefile
fltk14-devel/patches/patch-configure
fltk14-devel/patches/patch-documentation_Makefile
fltk14-devel/patches/patch-fluid_Makefile
fltk14-devel/patches/patch-makeinclude.in
fltk14-devel/patches/patch-src_Makefile
fltk14-devel/patches/patch-test_Makefile
Log Message:
fltk14-devel: Import FLTK 1.4.x development snapshot
Version 1.4 can use pango to render text.
With pango FLTK supports glyph substitution on X11 platform.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5ead1341de242bea420e4d6100a846d7230e9634
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
fltk14-devel/DESCR | 17 ++
fltk14-devel/Makefile | 90 +++++++
fltk14-devel/PLIST | 306 ++++++++++++++++++++++
fltk14-devel/README | 4 +
fltk14-devel/TODO | 5 +
fltk14-devel/buildlink3.mk | 43 +++
fltk14-devel/distinfo | 13 +
fltk14-devel/patches/patch-Makefile | 31 +++
fltk14-devel/patches/patch-configure | 51 ++++
fltk14-devel/patches/patch-documentation_Makefile | 18 ++
fltk14-devel/patches/patch-fluid_Makefile | 24 ++
fltk14-devel/patches/patch-makeinclude.in | 31 +++
fltk14-devel/patches/patch-src_Makefile | 90 +++++++
fltk14-devel/patches/patch-test_Makefile | 202 ++++++++++++++
14 files changed, 925 insertions(+)
diffs:
diff --git a/fltk14-devel/DESCR b/fltk14-devel/DESCR
new file mode 100644
index 0000000000..325cc5fc55
--- /dev/null
+++ b/fltk14-devel/DESCR
@@ -0,0 +1,17 @@
+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 a version 1.4 development snapshot. From the FLTK website:
+
+ FLTK-1.4.x [under active development]
+ Work on FLTK-1.4.x began at the start of 2016 because it was necessary to
+ break the FLTK-1.3.x ABI in order to fix some long outstanding problems
+ and to add new features. Resetting the ABI also allowed the removal of
+ 200+ areas of conditional compilation involving ABI guards, greatly
+ simplifying the code.
+ FLTK-1.4.x already boasts a completely new abstract device driver class
+ hierarchy to isolate platform specific code in one place instead of using
+ #ifdef everywhere, and to make it easier to port to new platforms.
diff --git a/fltk14-devel/Makefile b/fltk14-devel/Makefile
new file mode 100644
index 0000000000..10b0775d7f
--- /dev/null
+++ b/fltk14-devel/Makefile
@@ -0,0 +1,90 @@
+# $NetBSD$
+
+# pkglint complains if PKGNAME is listed first
+FLTK_VERSION= fltk-1.4.x
+
+DISTNAME= ${FLTK_VERSION}-r13065
+PKGNAME= ${FLTK_VERSION}
+CATEGORIES= x11
+MASTER_SITES= http://fltk.org/pub/fltk/snapshots/
+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
+
+USE_LANGUAGES= c c++
+USE_LIBTOOL= yes
+USE_TOOLS+= gmake nroff
+TEST_TARGET= test
+
+# ------------------------------------------------------
+# Options
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.fltk14
+PKG_SUPPORTED_OPTIONS= cairo opengl pango
+PKG_SUGGESTED_OPTIONS= opengl pango
+PLIST_VARS+= opengl
+
+.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mcairo)
+. include "../../graphics/cairo/buildlink3.mk"
+CONFIGURE_ARGS+= --enable-cairo
+.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
+
+.if !empty(PKG_OPTIONS:Mpango)
+. include "../../devel/pango/buildlink3.mk"
+CONFIGURE_ARGS+= --enable-pango
+.else
+CONFIGURE_ARGS+= --disable-pango
+.endif
+
+# ------------------------------------------------------
+
+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
+
+CONFIGURE_ARGS+= --enable-shared
+# Use pkgsrc versions, not package's bundled versions.
+CONFIGURE_ARGS+= --disable-localjpeg --disable-localzlib --disable-localpng
+
+pre-configure:
+ cd ${WRKSRC} && ${GMAKE} ${MAKE_FLAGS} clean
+
+.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/fltk14-devel/PLIST b/fltk14-devel/PLIST
new file mode 100644
index 0000000000..d6bd3b14a7
--- /dev/null
+++ b/fltk14-devel/PLIST
@@ -0,0 +1,306 @@
+@comment $NetBSD: PLIST,v 1.5 2018/07/13 04:24:39 dbj Exp $
+bin/fltk-config
+bin/fluid
+include/FL/abi-version.h
+include/FL/android.H
+${PLIST.cs}include/FL/android.h
+include/FL/platform.H
+${PLIST.cs}include/FL/platform.h
+${PLIST.cs}include/FL/platform_types.h
+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_Graphics_Driver.H
+${PLIST.cs}include/FL/Fl_Graphics_Driver.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_Rect.H
+${PLIST.cs}include/FL/Fl_Rect.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_Simple_Terminal.H
+${PLIST.cs}include/FL/Fl_Simple_Terminal.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_SVG_Image.H
+${PLIST.cs}include/FL/Fl_SVG_Image.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_Widget_Surface.H
+${PLIST.cs}include/FL/Fl_Widget_Surface.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/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/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/fltk14-devel/README b/fltk14-devel/README
new file mode 100644
index 0000000000..58170df74b
--- /dev/null
+++ b/fltk14-devel/README
@@ -0,0 +1,4 @@
+FLTK 1.4.x development snapshot
+(intended to test X11 glyph substitution via pango)
+
+This allows applications to render text using multiple fonts.
diff --git a/fltk14-devel/TODO b/fltk14-devel/TODO
new file mode 100644
index 0000000000..57c820b2d2
--- /dev/null
+++ b/fltk14-devel/TODO
@@ -0,0 +1,5 @@
+[X] Add pango option to support glyph substitution on X11
+[X] Suggest pango option ad default
+[X] Port patches from 1.3.4
+[X] Make build work
+[X] Update PLIST
diff --git a/fltk14-devel/buildlink3.mk b/fltk14-devel/buildlink3.mk
new file mode 100644
index 0000000000..6a65e6f4c7
--- /dev/null
+++ b/fltk14-devel/buildlink3.mk
@@ -0,0 +1,43 @@
+# $NetBSD: buildlink3.mk,v 1.11 2018/03/12 11:15:49 wiz Exp $
+
+BUILDLINK_TREE+= fltk
+
+.if !defined(FLTK_BUILDLINK3_MK)
+FLTK_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.fltk+= fltk>=1.4.0
+BUILDLINK_ABI_DEPENDS.fltk?= fltk>=1.4.0
+BUILDLINK_PKGSRCDIR.fltk?= ../../wip/fltk14-devel
+BUILDLINK_FILES.fltk+= include/Fl/*
+
+pkgbase := fltk
+.include "../../mk/pkg-build-options.mk"
+
+.if !empty(PKG_BUILD_OPTIONS.fltk:Mcairo)
+. include "../../graphics/cairo/buildlink3.mk"
+.endif
+
+.if !empty(PKG_BUILD_OPTIONS.fltk:Mopengl)
+. if ${OPSYS} != "Darwin"
+. include "../../graphics/Mesa/buildlink3.mk"
+. endif
+.endif
+
+.if !empty(PKG_BUILD_OPTIONS.fltk:Mpango)
+. include "../../devel/pango/buildlink3.mk"
+.endif
+
+.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/fltk14-devel/distinfo b/fltk14-devel/distinfo
new file mode 100644
index 0000000000..b2876980db
--- /dev/null
+++ b/fltk14-devel/distinfo
@@ -0,0 +1,13 @@
+$NetBSD: distinfo,v 1.10 2018/07/13 04:24:39 dbj Exp $
+
+SHA1 (fltk-1.4.x-r13065.tar.bz2) = be3e0a647797b6f8987631e9f6f61b648cec6abc
+RMD160 (fltk-1.4.x-r13065.tar.bz2) = b1fc24d9f8869e116200bd794e6d2f01261059f3
+SHA512 (fltk-1.4.x-r13065.tar.bz2) = 2e56237708119c0803a8d0849d7064d060e59e7e1d8964413e0b361bb8e50c449bf22d7812b4eabb8ca50aad089dc8fd8eea76418531676259c79e47749fb4d2
+Size (fltk-1.4.x-r13065.tar.bz2) = 5405807 bytes
+SHA1 (patch-Makefile) = 7db024b114282797a0b1b20df70f73a487fec0e2
+SHA1 (patch-configure) = 7c0f973352802dedbc38564b18950c10d1829d12
+SHA1 (patch-documentation_Makefile) = ce2872dae289672a8bc603e1c10225df8d06f126
+SHA1 (patch-fluid_Makefile) = 5b566f80f9b7dc9212edabc71b11c50f66c156d7
+SHA1 (patch-makeinclude.in) = b79a32c2d7571f79078f8ec6036a0e41604f6fac
+SHA1 (patch-src_Makefile) = c36f590280da5604ebf949142074db02d0cc327e
+SHA1 (patch-test_Makefile) = d3d67f4053dc6f59cad0988358b3cd5dc38e89e8
diff --git a/fltk14-devel/patches/patch-Makefile b/fltk14-devel/patches/patch-Makefile
new file mode 100644
index 0000000000..f2e426316a
--- /dev/null
+++ b/fltk14-devel/patches/patch-Makefile
@@ -0,0 +1,31 @@
+$NetBSD: patch-aa,v 1.2 2018/07/13 04:24:39 dbj Exp $
+
+Remove tests from directory list.
+Added makeinclude as dependency for test target.
+
+--- 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/fltk14-devel/patches/patch-configure b/fltk14-devel/patches/patch-configure
new file mode 100644
index 0000000000..ae3006c7b7
--- /dev/null
+++ b/fltk14-devel/patches/patch-configure
@@ -0,0 +1,51 @@
+$NetBSD: patch-ac,v 1.2 2018/07/13 04:24:39 dbj Exp $
+
+Modify configure script for "--enable-libtool".
+
+--- configure.orig 2016-11-11 16:04:30.000000000 +0000
++++ configure
+@@ -3841,7 +3841,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"
+@@ -4076,6 +4091,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/fltk14-devel/patches/patch-documentation_Makefile b/fltk14-devel/patches/patch-documentation_Makefile
new file mode 100644
index 0000000000..ed3e817dec
--- /dev/null
+++ b/fltk14-devel/patches/patch-documentation_Makefile
@@ -0,0 +1,18 @@
+$NetBSD: patch-ad,v 1.2 2018/07/13 04:24:39 dbj Exp $
+
+Do not install manpages to cat1/cat3 directories.
+
+--- 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/fltk14-devel/patches/patch-fluid_Makefile b/fltk14-devel/patches/patch-fluid_Makefile
new file mode 100644
index 0000000000..f66e9288e1
--- /dev/null
+++ b/fltk14-devel/patches/patch-fluid_Makefile
@@ -0,0 +1,24 @@
+$NetBSD: patch-ae,v 1.3 2018/07/13 04:24:39 dbj Exp $
+
+Use libtool to link and install fluid.
+
+--- fluid/Makefile.orig 2016-07-17 19:51:54.000000000 +0000
++++ fluid/Makefile
+@@ -57,7 +57,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) $(INSTALL_BIN) fluid fluid.app/Contents/MacOS
+
+ fluid-shared$(EXEEXT): $(OBJECTS) ../src/$(DSONAME) ../src/$(FLDSONAME) \
+@@ -79,7 +79,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/fltk14-devel/patches/patch-makeinclude.in b/fltk14-devel/patches/patch-makeinclude.in
new file mode 100644
index 0000000000..77b788af8a
--- /dev/null
+++ b/fltk14-devel/patches/patch-makeinclude.in
@@ -0,0 +1,31 @@
+$NetBSD: patch-af,v 1.3 2018/07/13 04:24:39 dbj Exp $
+
+Use libtool to build and link binaries.
+
+--- makeinclude.in.orig 2015-03-25 20:06:54.000000000 +0000
++++ makeinclude.in
+@@ -153,20 +153,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/fltk14-devel/patches/patch-src_Makefile b/fltk14-devel/patches/patch-src_Makefile
new file mode 100644
index 0000000000..bf7a1c5e1a
--- /dev/null
+++ b/fltk14-devel/patches/patch-src_Makefile
@@ -0,0 +1,90 @@
+$NetBSD: patch-ag,v 1.3 2018/07/13 04:24:39 dbj Exp $
+
+Use libtool to link and install binaries.
+
+--- src/Makefile.orig 2018-04-30 08:36:52.000000000 +0000
++++ src/Makefile
+@@ -353,6 +353,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)
+@@ -389,6 +393,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)
+@@ -425,6 +433,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)
+@@ -461,6 +473,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)
+@@ -687,6 +703,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*;\
+@@ -707,6 +726,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); \
+@@ -724,6 +746,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); \
+@@ -781,6 +806,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/fltk14-devel/patches/patch-test_Makefile b/fltk14-devel/patches/patch-test_Makefile
new file mode 100644
index 0000000000..21231d1980
--- /dev/null
+++ b/fltk14-devel/patches/patch-test_Makefile
@@ -0,0 +1,202 @@
+$NetBSD$
+
+Use libtool to link test programs.
+
+--- test/Makefile.orig 2017-10-17 00:28:56.000000000 +0000
++++ test/Makefile
+@@ -308,19 +308,19 @@ 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) $(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) $(INSTALL_BIN) checkers$(EXEEXT) checkers.app/Contents/MacOS
+
+ 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/
+@@ -333,21 +333,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 editor-Info.plist editor.app/Contents/Info.plist
+
+@@ -356,21 +356,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_dialog$(EXEEXT): help_dialog.o $(IMGLIBNAME)
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) help_dialog.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) help_dialog.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
+ $(OSX_ONLY) ../fltk-config --post $@
+ $(OSX_ONLY) mkdir -p help_dialog.app/Contents/Resources
+ $(OSX_ONLY) cp -f help_dialog.html help_dialog.app/Contents/Resources/
+@@ -390,14 +390,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
+@@ -406,7 +406,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)
+@@ -419,7 +419,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
+@@ -428,7 +428,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
+@@ -439,7 +439,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
+@@ -463,13 +463,13 @@ 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) $(INSTALL_BIN) sudoku$(EXEEXT) sudoku.app/Contents/MacOS
+
+ 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
+
+@@ -501,7 +501,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 $@
+@@ -512,37 +512,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