pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
fltk14-devel: Simplify package and update to last git commit
Module Name: pkgsrc-wip
Committed By: Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By: micha
Date: Fri Jun 25 19:26:22 2021 +0200
Changeset: bf77188e347bf1f2e7cabee8b1fdec78a6d7a0c0
Modified Files:
fltk14-devel/Makefile
fltk14-devel/PLIST
fltk14-devel/README
fltk14-devel/buildlink3.mk
fltk14-devel/distinfo
fltk14-devel/patches/patch-test_Makefile
Added Files:
fltk14-devel/TODO
Removed Files:
fltk14-devel/patches/patch-configure.ac
fltk14-devel/patches/patch-fluid_Makefile
fltk14-devel/patches/patch-makeinclude.in
fltk14-devel/patches/patch-src_Makefile
Log Message:
fltk14-devel: Simplify package and update to last git commit
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=bf77188e347bf1f2e7cabee8b1fdec78a6d7a0c0
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
fltk14-devel/Makefile | 21 +--
fltk14-devel/PLIST | 166 ++----------------------
fltk14-devel/README | 5 +-
fltk14-devel/TODO | 13 ++
fltk14-devel/buildlink3.mk | 2 +
fltk14-devel/distinfo | 14 +-
fltk14-devel/patches/patch-configure.ac | 51 --------
fltk14-devel/patches/patch-fluid_Makefile | 33 -----
fltk14-devel/patches/patch-makeinclude.in | 31 -----
fltk14-devel/patches/patch-src_Makefile | 90 -------------
fltk14-devel/patches/patch-test_Makefile | 204 +-----------------------------
11 files changed, 43 insertions(+), 587 deletions(-)
diffs:
diff --git a/fltk14-devel/Makefile b/fltk14-devel/Makefile
index 9518e5d05c..20420d81bc 100644
--- a/fltk14-devel/Makefile
+++ b/fltk14-devel/Makefile
@@ -3,7 +3,7 @@
DISTNAME= fltk-1.4.x
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GITHUB:=fltk/}
-GITHUB_TAG= 871e7063a27706b22921536232797e43d513793a
+GITHUB_TAG= 713d1bfd7c4a538b7bd3625a5f521f5911a9f500
EXTRACT_SUFX= .zip
MAINTAINER= micha%NetBSD.org@localhost
@@ -19,8 +19,7 @@ TEST_TARGET= test
PTHREAD_OPTS+= require
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --enable-libtool=${LIBTOOL:Q}
-CONFIGURE_ARGS+= --enable-nanosvg
+CONFIGURE_ARGS+= --enable-svg
CONFIGURE_ARGS+= --enable-print
CONFIGURE_ARGS+= --enable-shared
CONFIGURE_ARGS+= --enable-threads
@@ -35,20 +34,6 @@ CONFIGURE_ARGS+= --disable-localzlib
.include "options.mk"
-# Create symlinks for common misspellings of headerfile names
-# (if filesystem is case-sensitive)
-PLIST_VARS+= cs # case-sensitive
-.if !exists(./descr) && ${OPSYS} != "Darwin"
-CONFIGURE_ARGS+= --with-links
-PLIST.cs= yes
-.endif
-
-# ------------------------------------------------------
-# No documentation where and why this was needed for FLTK 1.3 package
-# => Comment out for tests. Reenabled if problem still exists.
-#CONFIGURE_ARGS+= ac_cv_have_overlay=yes
-# ------------------------------------------------------
-
# ------------------------------------------------------
# Clean the source tree first for snapshots
# (CPPFLAGS/LDFLAGS are for modular X)
@@ -60,6 +45,8 @@ pre-configure:
${GMAKE} ${MAKE_FLAGS} clean
# ------------------------------------------------------
+BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.3
+.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/jpeg.buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
diff --git a/fltk14-devel/PLIST b/fltk14-devel/PLIST
index b47a87edf4..e522d4c96c 100644
--- a/fltk14-devel/PLIST
+++ b/fltk14-devel/PLIST
@@ -1,309 +1,171 @@
-@comment $NetBSD: PLIST,v 1.5 2018/07/13 04:24:39 dbj Exp $
+@comment $NetBSD$
bin/fltk-config
bin/fluid
include/FL/Enumerations.H
-${PLIST.cs}include/FL/Enumerations.h
include/FL/Fl.H
-${PLIST.cs}include/FL/Fl.h
include/FL/Fl_Adjuster.H
-${PLIST.cs}include/FL/Fl_Adjuster.h
include/FL/Fl_BMP_Image.H
-${PLIST.cs}include/FL/Fl_BMP_Image.h
include/FL/Fl_Bitmap.H
-${PLIST.cs}include/FL/Fl_Bitmap.h
include/FL/Fl_Box.H
-${PLIST.cs}include/FL/Fl_Box.h
include/FL/Fl_Browser.H
-${PLIST.cs}include/FL/Fl_Browser.h
include/FL/Fl_Browser_.H
-${PLIST.cs}include/FL/Fl_Browser_.h
include/FL/Fl_Button.H
-${PLIST.cs}include/FL/Fl_Button.h
include/FL/Fl_Cairo.H
-${PLIST.cs}include/FL/Fl_Cairo.h
include/FL/Fl_Cairo_Window.H
-${PLIST.cs}include/FL/Fl_Cairo_Window.h
include/FL/Fl_Chart.H
-${PLIST.cs}include/FL/Fl_Chart.h
include/FL/Fl_Check_Browser.H
-${PLIST.cs}include/FL/Fl_Check_Browser.h
include/FL/Fl_Check_Button.H
-${PLIST.cs}include/FL/Fl_Check_Button.h
include/FL/Fl_Choice.H
-${PLIST.cs}include/FL/Fl_Choice.h
include/FL/Fl_Clock.H
-${PLIST.cs}include/FL/Fl_Clock.h
include/FL/Fl_Color_Chooser.H
-${PLIST.cs}include/FL/Fl_Color_Chooser.h
include/FL/Fl_Copy_Surface.H
-${PLIST.cs}include/FL/Fl_Copy_Surface.h
include/FL/Fl_Counter.H
-${PLIST.cs}include/FL/Fl_Counter.h
include/FL/Fl_Device.H
-${PLIST.cs}include/FL/Fl_Device.h
include/FL/Fl_Dial.H
-${PLIST.cs}include/FL/Fl_Dial.h
include/FL/Fl_Double_Window.H
-${PLIST.cs}include/FL/Fl_Double_Window.h
include/FL/Fl_Export.H
-${PLIST.cs}include/FL/Fl_Export.h
include/FL/Fl_File_Browser.H
-${PLIST.cs}include/FL/Fl_File_Browser.h
include/FL/Fl_File_Chooser.H
-${PLIST.cs}include/FL/Fl_File_Chooser.h
include/FL/Fl_File_Icon.H
-${PLIST.cs}include/FL/Fl_File_Icon.h
include/FL/Fl_File_Input.H
-${PLIST.cs}include/FL/Fl_File_Input.h
include/FL/Fl_Fill_Dial.H
-${PLIST.cs}include/FL/Fl_Fill_Dial.h
include/FL/Fl_Fill_Slider.H
-${PLIST.cs}include/FL/Fl_Fill_Slider.h
include/FL/Fl_Float_Input.H
-${PLIST.cs}include/FL/Fl_Float_Input.h
include/FL/Fl_FormsBitmap.H
-${PLIST.cs}include/FL/Fl_FormsBitmap.h
include/FL/Fl_FormsPixmap.H
-${PLIST.cs}include/FL/Fl_FormsPixmap.h
include/FL/Fl_Free.H
-${PLIST.cs}include/FL/Fl_Free.h
include/FL/Fl_GIF_Image.H
-${PLIST.cs}include/FL/Fl_GIF_Image.h
include/FL/Fl_Gl_Window.H
-${PLIST.cs}include/FL/Fl_Gl_Window.h
include/FL/Fl_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_SVG_File_Surface.H
-${PLIST.cs}include/FL/Fl_SVG_File_Surface.h
include/FL/Fl_SVG_Image.H
-${PLIST.cs}include/FL/Fl_SVG_Image.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_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/abi-version.h
include/FL/android.H
-${PLIST.cs}include/FL/android.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_string.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
-${PLIST.cs}include/FL/platform_types.h
+include/FL/platform_types.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
+lib/libfltk.a
+lib/libfltk.so
+lib/libfltk.so.1.4
+lib/libfltk_forms.a
+lib/libfltk_forms.so
+lib/libfltk_forms.so.1.4
+${PLIST.opengl}lib/libfltk_gl.a
+${PLIST.opengl}lib/libfltk_gl.so
+${PLIST.opengl}lib/libfltk_gl.so.1.4
+lib/libfltk_images.a
+lib/libfltk_images.so
+lib/libfltk_images.so.1.4
man/man1/fltk-config.1
man/man1/fluid.1
man/man3/fltk.3
diff --git a/fltk14-devel/README b/fltk14-devel/README
index 1155bd0120..7e2d7b81c1 100644
--- a/fltk14-devel/README
+++ b/fltk14-devel/README
@@ -1,7 +1,10 @@
FLTK 1.4.x development snapshot
Intended to test glyph substitution via Pango with X11 backend.
-This allows applications to render text using multiple fonts.
+The "pango" option allows applications to render text using multiple fonts.
+
+Disabling the "pango" and "xft2" options allows to build a lightweight FLTK
+library that use X11 Core Fonts (rendered by the X server).
Also useful to test compatibility of packages with FLTK 1.4 API.
In general application using the FLTK 1.3 API should work out-of-the-box
diff --git a/fltk14-devel/TODO b/fltk14-devel/TODO
new file mode 100644
index 0000000000..a285978607
--- /dev/null
+++ b/fltk14-devel/TODO
@@ -0,0 +1,13 @@
+[X] Add zlib dependency
+[ ] Static libraries should not be installed with execute permissions.
+ "fltk.list" has entires with 444 permissions, looks like a bug.
+[ ] Check for library suffixes on HP-UX and macOS
+[ ] Some configurations create the compiler warnings below.
+
+drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.cxx: In member function 'virtual const char* Fl_Xlib_Graphics_Driver::get_font_name(Fl_Font, int*)':
+drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.cxx:140:9: warning: this 'if' clause does not guard... [-Wmisleading-indentation]
+ if (*e) e++; x = e; e = fl_font_word(x,1);
+ ^~
+drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.cxx:140:22: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the 'if'
+ if (*e) e++; x = e; e = fl_font_word(x,1);
+ ^
diff --git a/fltk14-devel/buildlink3.mk b/fltk14-devel/buildlink3.mk
index fc509f9d67..177a2acbfa 100644
--- a/fltk14-devel/buildlink3.mk
+++ b/fltk14-devel/buildlink3.mk
@@ -57,6 +57,8 @@ pkgbase := fltk
. endif
.endif
+BUILDLINK_API_DEPENDS.zlib+=<-->zlib>=1.2.3
+.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/jpeg.buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
diff --git a/fltk14-devel/distinfo b/fltk14-devel/distinfo
index 0230d407b4..fb4e7b6bde 100644
--- a/fltk14-devel/distinfo
+++ b/fltk14-devel/distinfo
@@ -1,13 +1,9 @@
$NetBSD$
-SHA1 (fltk-1.4.x-871e7063a27706b22921536232797e43d513793a.zip) = 5f9b8ca4c54f9f766ee1204da103267020433a45
-RMD160 (fltk-1.4.x-871e7063a27706b22921536232797e43d513793a.zip) = 2ee8f7f80c055300d742c7326cfbb1cd77f06997
-SHA512 (fltk-1.4.x-871e7063a27706b22921536232797e43d513793a.zip) = 900f607c3ca6889c815c685985a18ad2670fcfb89c7124f8df5704ac487ffc47c443299a63a81a28d25c66263fc2cf41d0a0d6d29510934e552af53d74606fa7
-Size (fltk-1.4.x-871e7063a27706b22921536232797e43d513793a.zip) = 6907930 bytes
+SHA1 (fltk-1.4.x-713d1bfd7c4a538b7bd3625a5f521f5911a9f500.zip) = 601101aefae122139946c7156fc3906fafc9cdb8
+RMD160 (fltk-1.4.x-713d1bfd7c4a538b7bd3625a5f521f5911a9f500.zip) = c26ff7e1c4766e924e3bd3057fe85240b0c12d1e
+SHA512 (fltk-1.4.x-713d1bfd7c4a538b7bd3625a5f521f5911a9f500.zip) = 89528478fa35560dc72b50f0193d2a327acbe3c2197433ac526e7ff4419fb16a650280d6b80d3ee2b83eb9ac58aa99a964b6551d0430fafcf9dbb6b7dc32ab7d
+Size (fltk-1.4.x-713d1bfd7c4a538b7bd3625a5f521f5911a9f500.zip) = 6954563 bytes
SHA1 (patch-Makefile) = 0d87ce49eb74d4faffb0bc9d6ca59f53d87ba4b4
-SHA1 (patch-configure.ac) = 939bf0df334a2fc76310c3f5e315cb132d806bad
SHA1 (patch-documentation_Makefile) = 560593c4165eb7aef1841d765cc206bfb87f483d
-SHA1 (patch-fluid_Makefile) = 1b7a3697a46999263ece82c6ed3e886d5cc86a1f
-SHA1 (patch-makeinclude.in) = 3c7879c1a80ed0c48d7ca43e0af2827fbd70a508
-SHA1 (patch-src_Makefile) = 743a5168d1f82f64ad86e4824ef800582052f9f2
-SHA1 (patch-test_Makefile) = 76595b447fa154b131124db38e73b178b388b1a0
+SHA1 (patch-test_Makefile) = bcb866d62a4d5995a131dbe7467c4f483d8ae464
diff --git a/fltk14-devel/patches/patch-configure.ac b/fltk14-devel/patches/patch-configure.ac
deleted file mode 100644
index ed8a01364e..0000000000
--- a/fltk14-devel/patches/patch-configure.ac
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD$
-
-Modifications for "--enable-libtool".
-
---- configure.ac.orig 2020-07-16 10:25:51.000000000 +0000
-+++ configure.ac
-@@ -224,7 +224,21 @@ 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]]])
--if test x$enable_shared = xyes; then
-+
-+# Check whether --enable-libtool or --disable-libtool was given.
-+AC_ARG_ENABLE(libtool, [ --enable-libtool use libtool [[default=no]]])
-+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"
-@@ -407,6 +421,21 @@ 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
-+
- AC_SUBST(DSOCOMMAND)
- AC_SUBST(DSOFLAGS)
- AC_SUBST(DSOLINK)
diff --git a/fltk14-devel/patches/patch-fluid_Makefile b/fltk14-devel/patches/patch-fluid_Makefile
deleted file mode 100644
index 6972248248..0000000000
--- a/fltk14-devel/patches/patch-fluid_Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD$
-
-Use libtool to link and install fluid.
-
---- fluid/Makefile.orig 2019-04-07 09:24:20.000000000 +0000
-+++ fluid/Makefile
-@@ -55,7 +55,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/Contents/MacOS
- $(OSX_ONLY) mkdir fluid.app/Contents/MacOS
- $(OSX_ONLY) $(INSTALL_BIN) fluid fluid.app/Contents/MacOS
-@@ -63,7 +63,7 @@ fluid$(EXEEXT): $(OBJECTS) $(LIBNAME) $
- fluid-shared$(EXEEXT): $(OBJECTS) ../src/$(DSONAME) ../src/$(FLDSONAME) \
- ../src/$(IMGDSONAME)
- echo Linking $@...
-- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDFLAGS) $(LDLIBS)
-+ ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDFLAGS) $(LDLIBS)
-
- clean:
- -$(RM) *.o core.* *~ *.bck *.bak
-@@ -83,7 +83,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
deleted file mode 100644
index 9c0c909780..0000000000
--- a/fltk14-devel/patches/patch-makeinclude.in
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD$
-
-Use libtool to build and link binaries.
-
---- makeinclude.in.orig 2020-07-16 10:25:51.000000000 +0000
-+++ makeinclude.in
-@@ -151,20 +151,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
deleted file mode 100644
index 95096f88ef..0000000000
--- a/fltk14-devel/patches/patch-src_Makefile
+++ /dev/null
@@ -1,90 +0,0 @@
-$NetBSD$
-
-Use libtool to link and install binaries.
-
---- src/Makefile.orig 2019-04-07 09:24:20.000000000 +0000
-+++ src/Makefile
-@@ -352,6 +352,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)
-@@ -388,6 +392,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)
-@@ -424,6 +432,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)
-@@ -460,6 +472,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)
-@@ -759,6 +775,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*;\
-@@ -779,6 +798,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); \
-@@ -796,6 +818,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); \
-@@ -853,6 +878,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
index 4d280bf0fe..bb04108526 100644
--- a/fltk14-devel/patches/patch-test_Makefile
+++ b/fltk14-devel/patches/patch-test_Makefile
@@ -1,11 +1,10 @@
$NetBSD$
-Use libtool to link test programs.
Add note that GUI test programs are not executed automatically.
--- test/Makefile.orig 2020-07-16 10:25:51.000000000 +0000
+++ test/Makefile
-@@ -196,6 +196,10 @@ GLALL = \
+@@ -195,6 +195,10 @@ GLALL = \
shape$(EXEEXT)
all: $(ALL) $(GLDEMOS)
@@ -16,204 +15,3 @@ Add note that GUI test programs are not executed automatically.
gldemos: $(GLALL)
-@@ -348,14 +352,14 @@ buttons$(EXEEXT): buttons.o
-
- blocks$(EXEEXT): blocks.o
- echo Linking $@...
-- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) blocks.o -o $@ $(AUDIOLIBS) $(LINKFLTK) $(LDLIBS)
-+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) blocks.o -o $@ $(AUDIOLIBS) $(LINKFLTK) $(LDLIBS)
- $(OSX_ONLY) $(RM) -f -r blocks.app/Contents/MacOS
- $(OSX_ONLY) mkdir blocks.app/Contents/MacOS
- $(OSX_ONLY) $(INSTALL_BIN) blocks$(EXEEXT) blocks.app/Contents/MacOS
-
- checkers$(EXEEXT): checkers.o checkers_pieces.o
- echo Linking $@...
-- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) checkers.o checkers_pieces.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
-+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) checkers.o checkers_pieces.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
- $(OSX_ONLY) $(RM) -f -r checkers.app/Contents/MacOS
- $(OSX_ONLY) mkdir checkers.app/Contents/MacOS
- $(OSX_ONLY) $(INSTALL_BIN) checkers$(EXEEXT) checkers.app/Contents/MacOS
-@@ -368,7 +372,7 @@ clock$(EXEEXT): clock.o
-
- colbrowser$(EXEEXT): colbrowser.o
- echo Linking $@...
-- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ colbrowser.o $(LINKFLTK) $(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/
-@@ -381,21 +385,21 @@ curve$(EXEEXT): curve.o
-
- demo$(EXEEXT): demo.o
- echo Linking $@...
-- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ demo.o $(LINKFLTK) $(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
-
-@@ -404,23 +408,23 @@ 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 $@
-
- fltk-versions$(EXEEXT): fltk-versions.o
-
- 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/
-@@ -440,14 +444,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 $(LINKFLTK) $(LDLIBS)
-+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ label.o $(LINKFLTKFORMS) $(LDLIBS)
- $(OSX_ONLY) ../fltk-config --post $@
-
- line_style$(EXEEXT): line_style.o
-@@ -456,7 +460,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)
-@@ -469,7 +473,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
-@@ -478,7 +482,7 @@ offscreen$(EXEEXT): offscreen.o
-
- output$(EXEEXT): output.o $(FLLIBNAME)
- echo Linking $@...
-- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ output.o $(LINKFLTK) $(LDLIBS)
-+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ output.o $(LINKFLTKFORMS) $(LDLIBS)
- $(OSX_ONLY) ../fltk-config --post $@
-
- overlay$(EXEEXT): overlay.o
-@@ -489,7 +493,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
-@@ -548,7 +552,7 @@ subwindow$(EXEEXT): subwindow.o
-
- sudoku: sudoku.o
- echo Linking $@...
-- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) sudoku.o -o $@ $(AUDIOLIBS) $(LINKFLTKIMG) $(LDLIBS)
-+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) sudoku.o -o $@ $(AUDIOLIBS) $(LINKFLTKIMG) $(LDLIBS)
- $(OSX_ONLY) $(RM) -r -f sudoku.app/Contents/MacOS
- $(OSX_ONLY) mkdir sudoku.app/Contents/MacOS
- $(OSX_ONLY) $(INSTALL_BIN) sudoku$(EXEEXT) sudoku.app/Contents/MacOS
-@@ -556,7 +560,7 @@ sudoku: sudoku.o
- sudoku.exe: sudoku.o sudoku.rc
- echo Linking $@...
- $(RC) sudoku.rc sudokures.o
-- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) sudoku.o sudokures.o -o $@ $(AUDIOLIBS) $(LINKFLTKIMG) $(LDLIBS)
-+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) sudoku.o sudokures.o -o $@ $(AUDIOLIBS) $(LINKFLTKIMG) $(LDLIBS)
-
- symbols$(EXEEXT): symbols.o
-
-@@ -588,7 +592,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 $@
-@@ -599,35 +603,35 @@ 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 $@ gl_overlay.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