Fri Jul 13 04:24:39 2018 UTC ()
x11/fltk13: update to fltk-1.3.4

CHANGES IN FLTK 1.3.4					RELEASED: Nov 11 2016

Bug fixes and other improvements

	- Fix test/native-filechooser help display artifact (STR #3349).
	- MacOS: fix a crash when closing a fullscreen window.
	- Accept empty Fl_Pixmap in Fl_RGB_Image c'tor (STR #3348).
	- MacOS: fix drawing error when a window containing a hidden subwindow
	  is changed to fullscreen (error visible with the tabs test program).
	- MacOS: fix possible crash when enabling fullscreen in test/scroll.
	- Add a snapshot of known STR's and RFE's (KNOWN_BUGS.html).

CHANGES IN FLTK 1.3.4rc3				RELEASED: Oct 31 2016

	Bug fixes and other improvements

	- Fix string truncation in fluid (STR #2722 continued).
	- MacOS: fix a small problem where the Command-Quit menu hotkey
	  may not work if Fl_Native_File_Chooser is used before any
	  window is shown.

CHANGES IN FLTK 1.3.4rc2				RELEASED: Oct 24 2016

	Bug fixes and other improvements

	- Make sure the "File Systems" menu item of Fl_File_Chooser
	  lists "/" as the first mounted file system (Linux/Unix platform).
	- Added line numbers to fluid Edit -> Show Source Code viewer.
	- Improved fluid's template handling (STR #3335).

CHANGES IN FLTK 1.3.4rc1				RELEASED: Oct 17 2016

	New features and extensions

	- Added support for Mac OS 10.11 "El Capitan" and 10.12 "Sierra".
	- Added full support of true subwindows to the Mac OS X platform.
	  Window nesting to any depth is possible. An Fl_Gl_Window window or
	  subwindow can contain Fl_Window's as subwindows.
        - Fluid now supports external editors (STR#3213)
	  See: Edit -> GUI Settings -> Use external editor
	- Added method Fl_Widget::is_label_copied().
	- Added methods Fl_Copy_Surface::w(), Fl_Copy_Surface::h(),
	  and Fl_Copy_Surface::draw_decorated_window().
	- Added method Fl_Image_Surface::draw_decorated_window().
	- Added method Fl_Shared_Image *Fl_Image_Surface::highres_image()
	  to draw into a high-resolution bitmap image (Mac OS X only).
	- Added support for OpenGL version 3 and later.
	- Added method Fl_Mac_App_Menu::custom_application_menu_items()
	  allowing customization of the application menu (Mac OS X only).
	- Added 'fluid -u' command-line switch to upgrade fluid files in
	  batch mode. This option opens a fluid ('.fl') file and saves it
	  overwriting the old file with the current syntax and library version
	  number. Use with care (input file is overwritten unconditionally).
	- Added FL_ZOOM_GESTURE gesture for OS X (only). Needs implementation
	  on other platforms.
	- Added FL_ABI_VERSION, FL_API_VERSION, Fl::abi_version(), and
	  Fl::api_version(). Constants can be used to determine the compiled
	  FLTK version. Functions can be used to find the linked library version.
	- Added Fl::abi_check() method to test if the runtime (linked)
	  ABI version is correct.
	- Added Fl_Image::fail() to test if an image was loaded successfully
	  to allow for easier error detection when loading images (STR #2873).
	- Added line numbers to fluid's source code viewer for New -> Code

	New configuration options (ABI version)

	- FLTK's ABI version can now be configured with 'configure', CMake, or
	  by editing a supplied file when using the bundled IDE projects.
	  See documentation in README.abi-version.txt.

	1.3.4 ABI FEATURES

	- Added deactivated user icon to Fl_Tree.
	- Added Fl_Shared_Image::scale(width, height) which gives a shared
	  image its own drawing size, independently of the size of the
	  underlying image. This improves image drawing on high resolution
	  surfaces such as Laser printers, PDF files, and Apple retina displays.

	Other improvements

	- Configure now correctly sets HAVE_* variables only if both the
	  library and the header files were found. The configuration process
	  is aborted if Xft was requested explicitly with --enable-xft and
	  Xft was not found. The configuration summary now shows _found_
	  options as opposed to requested options.
	- Improved drawing of rounded box (STR #2943).
	- Full support of Apple 'retina' displays for which one drawing unit
	  corresponds to two pixels.
	- The Mac OS X platform no longer uses the deprecated AGL
	  (Apple GL library) to draw OpenGL data. Instead, it uses standard
	  Cocoa APIs. This allows FLTK to support drawing GL scenes at high
	  resolution when an Fl_Gl_Window is mapped to a 'retina' display.
	- Added Fl_Gl_Window::pixel_w(), Fl_Gl_Window::pixel_h(), and
	  Fl_Gl_Window::pixels_per_unit() useful for high resolution OpenGL windows.
	- fl_read_image() now captures all pixels within the rectangle
	  described by its arguments, whether they belong to a GL scene
	  or not (STR #3142). It also captures subwindows of GL windows.
	- Fl::delete_widget() now hides the widget or window immediately
	  (i.e. when called) - only destruction is delayed as before.
	- FLTK header files don't expose X11 definitions in user code any more
	  unless requested by including FL/x.H explicitly or implicitly.
	- The PostScript code output when printing images under Linux/Unix
	  is now much smaller by using lossless compression techniques.
	- The Linux/Unix printer dialog now uses BSD-style printing commands
	  (lpr/lpq) when SystemV-style commands (lp/lpstat) are not available.
	- Drawing alpha-blended images under X11 is now accelerated with
	  Xrender.
	- The font used for the FL_COURIER font family was changed on the Mac OS X
	  platform from 'Courier New' to 'Courier' because it was too thin.
	- Text drawing on the Mac platform supports Unicode 'variation selectors'
	  in the range [0xFE00-0xFE0F].
	- Added a Mac OS implementation of Fl_Window::wait_for_expose() that
	  became necessary with Mac OS 10.10 "Yosemite".
	- Added the libfltk target to the Xcode project producing a static
	  version of the FLTK library (Mac OS X).
	- Restored the possibility to call Fl::set_font() before main() starts.
	- Allow using the --enable-x11 configure option on the Mac OS platform
	  which produces an X11 version of the FLTK library (don't use unless
	  you know what you're doing).
	- FLTK code and fluid-generated code can be used in static initializers.
	- Added light gray separator line to fluid's widget browser (STR #2997).
	- Improved tooltip behavior for huge tooltips: remove flicker, support
	  key/mouse dismiss (STR #2650).
	- Modifier key names displayed in shortcut labels can now be localized.
	  See documentation of fl_shortcut_label(). You can set modifier key
	  names for Ctrl, Alt, Shift, and Meta by assigning global string
	  pointers to your translated modifier key names.
	- Many documentation improvements and fixes.
	- Fixed many compiler warnings (STR #2988).
	- Fluid now generates code with less compiler warnings (STR #2813).
	- Many CMake improvements and fixes. Note: CMake is mostly operating
	  now, but not yet recommended for production use. Please test and
	  report issues.
	- Updated bundled zlib from 1.2.5 to 1.2.8.
	- Updated bundled libjpeg from jpeg-8c to jpeg-9a.

	Bug fixes

	- Fix potential crash when using keyboard navigation on Fl_Tabs
	  widget without children (STR #3333).
	- Fix potential crash if Fl_Window::icon(NULL) was called to clear
	  (reset) a window icon. This is now legal and documented behavior.
	  The same applies to Fl_Window::default_icon().
	- Allow widget callback to be NULL, i.e. no callback (STR #2835).
	- Fixed Fl_Help_View buffer overflow (STR #3275).
	- Fl_Browser now correctly adjusts its scrollbars when the default
	  text size is changed with textsize(int) (STR #3057).
	- Fixed Fl_Text_Display/Fl_Text_Editor slow scrolling, line number
	  display, wrap mode "hiding" text behind scrollbars, and more
	  scrollbar handling (alignment) (STR #3272).
	- Fixed valgrind warning (uninitialized variable) in Fl_Window.
	  Visible only with FLTK_ABI_VERSION >= 10303, since FLTK 1.3.3.
	- Fixed Windows drag'n'drop not showing insert position if the drop
	  target is inside the same window or process (STR #3209).
	- Fixed undefined reference building shared cairo library (STR #3276).
	- Fixed Fl_Browser if text argument to some methods is NULL (STR #3269).
	- Fixed missing image release in fluid (STR #2840).
	- Fixed out-of-bounds memory access in fluid (STR #3263).
	- Fixed trailing white space in fluid .fl files (STR #3239).
	- Several box types were not drawn correctly when deactivated.
	  The background color for deactivated widgets is now correct:
	  fl_inactive(color()) (STR #2907).
	- Fix inconsistent interpretation of ld() in image handling
	  (STR #3308). This is a minor issue since ld() is usually 0 or
	  w()*d(). Documentation has been fixed, and ld() handling is now
	  consistent in Fl_(RGB_)Image and fl_draw_image() and friends. See
	  documentation of Fl_Image and Fl_RGB_Image for more information.
	- Fixed Fl_Pixmap (background) drawing to respect the clip region
	  (STR #3206).
	- Fixed reading .pbm image files: 1 is now interpreted as black,
	  and images whose width are a multiple of 8 are correctly read.
	  Note: if you relied on the faulty behavior you may need to fix
	  your image files.
	- Restored window background drawing, particularly the 'plastic'
	  scheme's background (STR #3059). This was a regression since
	  FLTK 1.3.0.
	- Prevent sending (FL_SHORTCUT) events to inactive widgets (STR #3216).
	- Fixed button label clipping (STR #3237).
	- Fixed Fl_Menu_::item_pathname() handling of descending submenu
	  pointers (STR #3177).
	- Fl_Text_Display: style buffer colors are no longer manipulated by
	  fl_contrast() for normal text drawing (fltk.coredev thread started
	  04/08/15, Subject: "RFC: Fl_Text_Display style buffer color weirdness")
	- Fl_Tree::deactivate() now affects draw color of items (must have
	  ABI 1.3.3 or higher enabled). For icons to draw deactivated,
	  enable ABI 1.3.4. (test/tree has a 'deactivate tree' button)
	- Fl_Tree::find_item() did not find items if the pathname contained
	  identical strings (STR #3234).
	- Fixed possible bad border effect when a set of radio menu items
	  is located first in its menu (STR #3176): Fl_Menu_Item::set_only()
	  is deprecated and replaced by Fl_Menu_::set_only(Fl_Menu_item*).
	- Restore the correct state of mouse buttons and keyboard modifier keys
	  after closing a file or printer dialog (STR #3221).
	- Fix for deactivate colors issue with Fl_Text_Display/Editor (STR #3219).
	- Fixed issue with MSWindows platform where the program kept running
	  after closing all its windows (STR #3165).
	- Fix potential buffer overflow (MSWindows: BEX64 error) and problem with
	  MSWindows environment variables "HOME"(MinGW) vs. "UserProfile"(DOS)
	- Fix issue with MSWindows platform where a window would decrease
	  in size after each close/open (STR #3167).
	- Fix undefined reference XGetUtf8FontAndGlyph (STR #3191).
	- Fix potential keyboard hangup (STR #3192).
	- Fix for: .xbm images were not previewed (STR #3131).
	- Fixed crash on Mac platform when resizing a not yet shown() Fl_Gl_Window.
	- Fixed potential Windows GDI leak (STR #3254).
	- Fixed Linux/Unix potential program hang when dialog pops up while
	  a menu is open (STR #3179).
	- Fixed a crash when a Unix/Linux program calls take_focus() before any
	  window has been show()n.
	- Fixed an error on the Mac platform when drawing to an Fl_Image_Surface
	  object without using the Fl_Image_Surface::draw() method.
	- Fixed STR #3268 where a fullscreen window could become relocated
	  behind the menu bar and dock (Mac OS only).
	- Fixed STR #3207: ^C not working when numlock or capslock is on.
	- Fixed code editor in Fluid (STR #3184).
	- Fixed a potential hangup of the Fl::awake() queue under Windows if
	  a window is resized or moved while the Fl::awake() message is sent
	  (STR #3143).
	- Fixed a regression: restore the possibility to call
	  fl_draw_image(buf,X,Y,W,H,D,L) with negative D and/or L arguments.
	- Fixed overflow in Fl_Valuator::precision(int) to 0...9 (STR #3280).


(dbj)
diff -r1.25 -r1.26 pkgsrc/x11/fltk13/Makefile
diff -r1.4 -r1.5 pkgsrc/x11/fltk13/PLIST
diff -r1.9 -r1.10 pkgsrc/x11/fltk13/distinfo
diff -r1.1 -r0 pkgsrc/x11/fltk13/patches/patch-FL_Enumerations.H
diff -r1.1 -r0 pkgsrc/x11/fltk13/patches/patch-src_Fl__Tree__Item.cxx
diff -r1.1 -r0 pkgsrc/x11/fltk13/patches/patch-src_Fl_cocoa.mm
diff -r1.1 -r0 pkgsrc/x11/fltk13/patches/patch-src_Fl_x.cxx
diff -r1.1 -r0 pkgsrc/x11/fltk13/patches/patch-src_xutf8_imKStoUCS.c
diff -r1.2 -r0 pkgsrc/x11/fltk13/patches/patch-FL_Fl_Widget.H
diff -r1.2 -r0 pkgsrc/x11/fltk13/patches/patch-ab
diff -r1.2 -r0 pkgsrc/x11/fltk13/patches/patch-src_Fl.cxx
diff -r1.2 -r0 pkgsrc/x11/fltk13/patches/patch-src_Fl_grab.cxx
diff -r1.1.1.1 -r1.2 pkgsrc/x11/fltk13/patches/patch-aa
diff -r1.1.1.1 -r1.2 pkgsrc/x11/fltk13/patches/patch-ac
diff -r1.1.1.1 -r1.2 pkgsrc/x11/fltk13/patches/patch-ad
diff -r1.2 -r1.3 pkgsrc/x11/fltk13/patches/patch-ae
diff -r1.2 -r1.3 pkgsrc/x11/fltk13/patches/patch-af
diff -r1.2 -r1.3 pkgsrc/x11/fltk13/patches/patch-ag
diff -r1.3 -r1.4 pkgsrc/x11/fltk13/patches/patch-test_Makefile

cvs diff -r1.25 -r1.26 pkgsrc/x11/fltk13/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/fltk13/Makefile 2018/03/12 11:15:49 1.25
+++ pkgsrc/x11/fltk13/Makefile 2018/07/13 04:24:39 1.26
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.25 2018/03/12 11:15:49 wiz Exp $ 1# $NetBSD: Makefile,v 1.26 2018/07/13 04:24:39 dbj Exp $
2 2
3DISTNAME= fltk-1.3.3-source 3DISTNAME= fltk-1.3.4-source
4PKGREVISION= 4 
5PKGNAME= ${DISTNAME:S/-source//} 4PKGNAME= ${DISTNAME:S/-source//}
6VERS= ${DISTNAME:S/fltk-//:S/-source//} 5VERS= ${DISTNAME:S/fltk-//:S/-source//}
7CATEGORIES= x11 6CATEGORIES= x11
8MASTER_SITES= http://fltk.org/pub/fltk/${VERS}/ 7MASTER_SITES= http://fltk.org/pub/fltk/${VERS}/
9 8
10MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.fltk.org/ 10HOMEPAGE= http://www.fltk.org/
12COMMENT= Fast Light Tool Kit for graphical user interfaces 11COMMENT= Fast Light Tool Kit for graphical user interfaces
13LICENSE= gnu-lgpl-v2 12LICENSE= gnu-lgpl-v2
14 13
15WRKSRC= ${WRKDIR}/${DISTNAME:S/-source//} 14WRKSRC= ${WRKDIR}/${DISTNAME:S/-source//}
16USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
17USE_LIBTOOL= yes 16USE_LIBTOOL= yes

cvs diff -r1.4 -r1.5 pkgsrc/x11/fltk13/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/fltk13/PLIST 2015/12/29 06:02:25 1.4
+++ pkgsrc/x11/fltk13/PLIST 2018/07/13 04:24:39 1.5
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1@comment $NetBSD: PLIST,v 1.4 2015/12/29 06:02:25 dholland Exp $ 1@comment $NetBSD: PLIST,v 1.5 2018/07/13 04:24:39 dbj Exp $
2bin/fltk-config 2bin/fltk-config
3bin/fluid 3bin/fluid
 4include/FL/abi-version.h
4include/FL/Enumerations.H 5include/FL/Enumerations.H
5${PLIST.cs}include/FL/Enumerations.h 6${PLIST.cs}include/FL/Enumerations.h
6include/FL/Fl.H 7include/FL/Fl.H
7${PLIST.cs}include/FL/Fl.h 8${PLIST.cs}include/FL/Fl.h
8include/FL/Fl_Adjuster.H 9include/FL/Fl_Adjuster.H
9${PLIST.cs}include/FL/Fl_Adjuster.h 10${PLIST.cs}include/FL/Fl_Adjuster.h
10include/FL/Fl_BMP_Image.H 11include/FL/Fl_BMP_Image.H
11${PLIST.cs}include/FL/Fl_BMP_Image.h 12${PLIST.cs}include/FL/Fl_BMP_Image.h
12include/FL/Fl_Bitmap.H 13include/FL/Fl_Bitmap.H
13${PLIST.cs}include/FL/Fl_Bitmap.h 14${PLIST.cs}include/FL/Fl_Bitmap.h
14include/FL/Fl_Box.H 15include/FL/Fl_Box.H
15${PLIST.cs}include/FL/Fl_Box.h 16${PLIST.cs}include/FL/Fl_Box.h
16include/FL/Fl_Browser.H 17include/FL/Fl_Browser.H

cvs diff -r1.9 -r1.10 pkgsrc/x11/fltk13/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/fltk13/distinfo 2016/12/16 00:08:03 1.9
+++ pkgsrc/x11/fltk13/distinfo 2018/07/13 04:24:39 1.10
@@ -1,22 +1,13 @@ @@ -1,22 +1,13 @@
1$NetBSD: distinfo,v 1.9 2016/12/16 00:08:03 joerg Exp $ 1$NetBSD: distinfo,v 1.10 2018/07/13 04:24:39 dbj Exp $
2 2
3SHA1 (fltk-1.3.3-source.tar.gz) = 873aac49b277149e054b9740378e2ca87b0bd435 3SHA1 (fltk-1.3.4-source.tar.gz) = 3c58770d2920a219d07641fa403de2c8c57bb7f0
4RMD160 (fltk-1.3.3-source.tar.gz) = a1736ec7da1ff751153e09bc5b5136d2fa95c18b 4RMD160 (fltk-1.3.4-source.tar.gz) = a660ec3b18e89426c2edb76818bbfcec6a6f5890
5SHA512 (fltk-1.3.3-source.tar.gz) = 277ba27e35c20e2d4fc5296bf418c5ab78c821870476e21d49f723765b99b3a559eed4ecd5215ac26d53a1091ada003e17f1553194cebaa97dd854809dd2885d 5SHA512 (fltk-1.3.4-source.tar.gz) = 92c236e426ad9b2a2954a6fc401bc9bf4c4c46d47b08f8c9b879da6031ac158ef9b944f28a8bea64d18072d1af8ceaa09c00abebd745fb76dd628636424446c2
6Size (fltk-1.3.3-source.tar.gz) = 4986376 bytes 6Size (fltk-1.3.4-source.tar.gz) = 5284217 bytes
7SHA1 (patch-FL_Enumerations.H) = 88fd3fc95e361604b3ec735fcf23865db02152e2 7SHA1 (patch-aa) = 335993d2e6b232b0539e583fb2463bafdffbb9b3
8SHA1 (patch-FL_Fl_Widget.H) = c2a80956ba2245a9addb53ca974d658020c5525d 8SHA1 (patch-ac) = 4ee251d11b3840f525f473fe6c320e4d16ac95e1
9SHA1 (patch-aa) = 777b293800af60ac508968946bcb9bc448c1ea00 9SHA1 (patch-ad) = 5a17f8fb46ce65b4795618d6aa22f445b55f6aa8
10SHA1 (patch-ab) = fa941f28b2c17577a8473313f4906e8724183906 10SHA1 (patch-ae) = 4952426cd6ecc67921779de95f68835aa3bdaa9c
11SHA1 (patch-ac) = 9ab9a8ab5d2fd54ff0fcdeb7e2486aa3b83be5de 11SHA1 (patch-af) = 4c2b772cc8bd6729aeb94ee4e871c2d982356616
12SHA1 (patch-ad) = 01a25d7265784572fbd0c7d2c6f029d45333ad21 12SHA1 (patch-ag) = 2339189b49551d27a8246d9efd9fed4b26732dde
13SHA1 (patch-ae) = 88da94679399b3a8710c23b7f41a7debc8bc92b8 13SHA1 (patch-test_Makefile) = a2e47c0c21983b8906898eea3f19b19c2f09386c
14SHA1 (patch-af) = a4154e31fca9ecf125922a84ac39771bc71dcb0f 
15SHA1 (patch-ag) = 61e6d166d0910e02558bacea629f7fb736f7304c 
16SHA1 (patch-src_Fl.cxx) = 169ed990645180694b7cce5baad72a28ac4fcb7a 
17SHA1 (patch-src_Fl__Tree__Item.cxx) = 39c0c4cbb905caef8cb2ff4159fa12c42ed890d6 
18SHA1 (patch-src_Fl_cocoa.mm) = 878038c611623b5337634e43d756bfb291872b18 
19SHA1 (patch-src_Fl_grab.cxx) = 08e2ddabf55c7de46558681ec651acc134182e01 
20SHA1 (patch-src_Fl_x.cxx) = ca7e4b98c52a84d0bc23ecf33fc30f94c0d16d35 
21SHA1 (patch-src_xutf8_imKStoUCS.c) = 55ba2343b6f021bba03f67410078ae419b3354be 
22SHA1 (patch-test_Makefile) = 5c3ad88366f45af1580690af938d54cd81b6beb7 

File Deleted: pkgsrc/x11/fltk13/patches/Attic/patch-FL_Enumerations.H

File Deleted: pkgsrc/x11/fltk13/patches/Attic/patch-src_Fl__Tree__Item.cxx

File Deleted: pkgsrc/x11/fltk13/patches/Attic/patch-src_Fl_cocoa.mm

File Deleted: pkgsrc/x11/fltk13/patches/Attic/patch-src_Fl_x.cxx

File Deleted: pkgsrc/x11/fltk13/patches/Attic/patch-src_xutf8_imKStoUCS.c

File Deleted: pkgsrc/x11/fltk13/patches/Attic/patch-FL_Fl_Widget.H

File Deleted: pkgsrc/x11/fltk13/patches/Attic/patch-ab

File Deleted: pkgsrc/x11/fltk13/patches/Attic/patch-src_Fl.cxx

File Deleted: pkgsrc/x11/fltk13/patches/Attic/patch-src_Fl_grab.cxx

cvs diff -r1.1.1.1 -r1.2 pkgsrc/x11/fltk13/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/x11/fltk13/patches/Attic/patch-aa 2011/12/01 16:35:12 1.1.1.1
+++ pkgsrc/x11/fltk13/patches/Attic/patch-aa 2018/07/13 04:24:39 1.2
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1$NetBSD: patch-aa,v 1.1.1.1 2011/12/01 16:35:12 is Exp $ 1$NetBSD: patch-aa,v 1.2 2018/07/13 04:24:39 dbj Exp $
2 2
3--- Makefile.orig 2011-02-15 15:29:03.000000000 +0000 3--- Makefile.orig 2016-09-30 11:33:14.000000000 +0000
4+++ Makefile 4+++ Makefile
5@@ -27,7 +27,7 @@ 5@@ -18,7 +18,7 @@
6  6
7 include makeinclude 7 include makeinclude
8  8
9-DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid test documentation 9-DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid test documentation
10+DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid documentation 10+DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid documentation
11  11
12 all: makeinclude fltk-config 12 all: makeinclude fltk-config
13 for dir in $(DIRS); do\ 13 for dir in $(DIRS); do\
14@@ -35,6 +35,14 @@ all: makeinclude fltk-config 14@@ -26,6 +26,14 @@ all: makeinclude fltk-config
15 (cd $$dir; $(MAKE) $(MFLAGS)) || exit 1;\ 15 (cd $$dir; $(MAKE) $(MFLAGS)) || exit 1;\
16 done 16 done
17  17
18+test: makeinclude 18+test: makeinclude
19+ dir=test;\ 19+ dir=test;\
20+ echo "=== making $$dir ===";\ 20+ echo "=== making $$dir ===";\
21+ if test ! -f $$dir/makedepend; then\ 21+ if test ! -f $$dir/makedepend; then\
22+ touch $$dir/makedepend;\ 22+ touch $$dir/makedepend;\
23+ fi;\ 23+ fi;\
24+ (cd $$dir; $(MAKE) $(MFLAGS)) || break;\ 24+ (cd $$dir; $(MAKE) $(MFLAGS)) || break;\
25+ 25+
26 install: makeinclude 26 install: makeinclude
27 -mkdir -p $(DESTDIR)$(bindir) 27 -mkdir -p $(DESTDIR)$(bindir)

cvs diff -r1.1.1.1 -r1.2 pkgsrc/x11/fltk13/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/x11/fltk13/patches/Attic/patch-ac 2011/12/01 16:35:13 1.1.1.1
+++ pkgsrc/x11/fltk13/patches/Attic/patch-ac 2018/07/13 04:24:39 1.2
@@ -1,42 +1,42 @@ @@ -1,42 +1,42 @@
1$NetBSD: patch-ac,v 1.1.1.1 2011/12/01 16:35:13 is Exp $ 1$NetBSD: patch-ac,v 1.2 2018/07/13 04:24:39 dbj Exp $
2 2
3--- configure.orig 2011-06-16 15:50:44.000000000 +0000 3--- configure.orig 2016-11-11 16:04:30.000000000 +0000
4+++ configure 4+++ configure
5@@ -1999,7 +1999,22 @@ if test "${enable_shared+set}" = set; th 5@@ -3816,7 +3816,22 @@ if test "${enable_shared+set}" = set; th
6 enableval=$enable_shared; 6 enableval=$enable_shared;
7 fi 7 fi
8  8
9-if test x$enable_shared = xyes; then 9-if test x$enable_shared = xyes; then
10+ 10+
11+# Check whether --enable-libtool or --disable-libtool was given. 11+# Check whether --enable-libtool or --disable-libtool was given.
12+if test "${enable_libtool+set}" = set; then 12+if test "${enable_libtool+set}" = set; then
13+ enableval="$enable_libtool" 13+ enableval="$enable_libtool"
14+ 14+
15+if test x$enable_libtool != xno; then 15+if test x$enable_libtool != xno; then
16+ LIBTOOL="$enable_libtool" 16+ LIBTOOL="$enable_libtool"
17+ enable_shared=no 17+ enable_shared=no
18+else 18+else
19+ LIBTOOL="" 19+ LIBTOOL=""
20+fi 20+fi
21+fi 21+fi
22+ 22+
23+ 23+
24+if test "$enable_shared" = "yes"; then 24+if test "$enable_shared" = "yes"; then
25+ 25+
26 PICFLAG=1 26 PICFLAG=1
27 SHAREDSUFFIX="" 27 SHAREDSUFFIX=""
28 FLUID="fluid-shared" 28 FLUID="fluid-shared"
29@@ -2138,6 +2153,20 @@ else 29@@ -4051,6 +4066,20 @@ else
30 LINKSHARED="$LINKFLTKCAIRO ../lib/libfltk_images.a ../lib/libfltk_forms.a ../lib/libfltk.a" 30 LINKSHARED="$LINKFLTKCAIRO ../lib/libfltk_images.a ../lib/libfltk_forms.a ../lib/libfltk.a"
31 fi 31 fi
32  32
33+if test "x$LIBTOOL" != "x"; then 33+if test "x$LIBTOOL" != "x"; then
34+ LINKFLTK="../src/libfltk.la" 34+ LINKFLTK="../src/libfltk.la"
35+ if test "x$LINKFLTKGL" != "x"; then 35+ if test "x$LINKFLTKGL" != "x"; then
36+ LINKFLTKGL="../src/libfltk_gl.la" 36+ LINKFLTKGL="../src/libfltk_gl.la"
37+ fi 37+ fi
38+ if test "x$LINKFLTKIMG" != "x"; then 38+ if test "x$LINKFLTKIMG" != "x"; then
39+ LINKFLTKIMG="../src/libfltk_images.la" 39+ LINKFLTKIMG="../src/libfltk_images.la"
40+ fi 40+ fi
41+ LINKSHARED="-lfltk_images -lfltk_forms -lfltk" 41+ LINKSHARED="-lfltk_images -lfltk_forms -lfltk"
42+ DSONAME="libfltk.la" 42+ DSONAME="libfltk.la"

cvs diff -r1.1.1.1 -r1.2 pkgsrc/x11/fltk13/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/x11/fltk13/patches/Attic/patch-ad 2011/12/01 16:35:13 1.1.1.1
+++ pkgsrc/x11/fltk13/patches/Attic/patch-ad 2018/07/13 04:24:39 1.2
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-ad,v 1.1.1.1 2011/12/01 16:35:13 is Exp $ 1$NetBSD: patch-ad,v 1.2 2018/07/13 04:24:39 dbj Exp $
2 2
3--- documentation/Makefile.orig 2011-01-05 23:00:33.000000000 +0000 3--- documentation/Makefile.orig 2015-06-16 13:18:28.000000000 +0000
4+++ documentation/Makefile 4+++ documentation/Makefile
5@@ -92,11 +92,6 @@ install: $(MANPAGES) 5@@ -88,11 +88,6 @@ install: $(MANPAGES)
6 $(INSTALL_DATA) fltk.pdf $(DESTDIR)$(docdir); \ 6 $(INSTALL_DATA) fltk.pdf $(DESTDIR)$(docdir); \
7 fi 7 fi
8 echo "Installing man pages in $(DESTDIR)$(mandir) ..." 8 echo "Installing man pages in $(DESTDIR)$(mandir) ..."
9- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat1 9- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat1
10- $(INSTALL_MAN) $(SRC_DOCDIR)/fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1 10- $(INSTALL_MAN) $(SRC_DOCDIR)/fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
11- $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1 11- $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
12- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat3 12- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat3
13- $(INSTALL_MAN) $(SRC_DOCDIR)/fltk.$(CAT3EXT) $(DESTDIR)$(mandir)/cat3 13- $(INSTALL_MAN) $(SRC_DOCDIR)/fltk.$(CAT3EXT) $(DESTDIR)$(mandir)/cat3
14 -$(INSTALL_DIR) $(DESTDIR)$(mandir)/man1 14 -$(INSTALL_DIR) $(DESTDIR)$(mandir)/man1
15 $(INSTALL_MAN) $(SRC_DOCDIR)/fluid.man $(DESTDIR)$(mandir)/man1/fluid.1 15 $(INSTALL_MAN) $(SRC_DOCDIR)/fluid.man $(DESTDIR)$(mandir)/man1/fluid.1
16 $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.man $(DESTDIR)$(mandir)/man1/fltk-config.1 16 $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.man $(DESTDIR)$(mandir)/man1/fltk-config.1

cvs diff -r1.2 -r1.3 pkgsrc/x11/fltk13/patches/Attic/patch-ae (expand / switch to unified diff)

--- pkgsrc/x11/fltk13/patches/Attic/patch-ae 2015/07/21 21:36:41 1.2
+++ pkgsrc/x11/fltk13/patches/Attic/patch-ae 2018/07/13 04:24:39 1.3
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1$NetBSD: patch-ae,v 1.2 2015/07/21 21:36:41 markd Exp $ 1$NetBSD: patch-ae,v 1.3 2018/07/13 04:24:39 dbj Exp $
2 2
3--- fluid/Makefile.orig 2013-09-21 17:23:09.000000000 +0000 3--- fluid/Makefile.orig 2016-07-17 19:51:54.000000000 +0000
4+++ fluid/Makefile 4+++ fluid/Makefile
5@@ -48,7 +48,7 @@ all: $(FLUID) fluid$(EXEEXT) 5@@ -50,7 +50,7 @@ all: $(FLUID) fluid$(EXEEXT)
6 fluid$(EXEEXT): $(OBJECTS) $(LIBNAME) $(FLLIBNAME) \ 6 fluid$(EXEEXT): $(OBJECTS) $(LIBNAME) $(FLLIBNAME) \
7 $(IMGLIBNAME) 7 $(IMGLIBNAME)
8 echo Linking $@... 8 echo Linking $@...
9- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS) 9- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS)
10+ ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS) 10+ ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS)
11 $(OSX_ONLY) $(INSTALL_BIN) fluid fluid.app/Contents/MacOS 11 $(OSX_ONLY) $(INSTALL_BIN) fluid fluid.app/Contents/MacOS
12  12
13 fluid-shared$(EXEEXT): $(OBJECTS) ../src/$(DSONAME) ../src/$(FLDSONAME) \ 13 fluid-shared$(EXEEXT): $(OBJECTS) ../src/$(DSONAME) ../src/$(FLDSONAME) \
14@@ -70,7 +70,7 @@ include makedepend 14@@ -72,7 +72,7 @@ include makedepend
15 install: all 15 install: all
16 echo "Installing FLUID in $(DESTDIR)$(bindir)..." 16 echo "Installing FLUID in $(DESTDIR)$(bindir)..."
17 -$(INSTALL_DIR) $(DESTDIR)$(bindir) 17 -$(INSTALL_DIR) $(DESTDIR)$(bindir)
18- $(INSTALL_BIN) $(FLUID) $(DESTDIR)$(bindir)/fluid$(EXEEXT) 18- $(INSTALL_BIN) $(FLUID) $(DESTDIR)$(bindir)/fluid$(EXEEXT)
19+ ${LIBTOOL} --mode=install $(INSTALL_BIN) $(FLUID) $(DESTDIR)$(bindir)/fluid$(EXEEXT) 19+ ${LIBTOOL} --mode=install $(INSTALL_BIN) $(FLUID) $(DESTDIR)$(bindir)/fluid$(EXEEXT)
20  20
21 install-linux: 21 install-linux:
22 -$(INSTALL_DIR) $(DESTDIR)/usr/share/applications 22 -$(INSTALL_DIR) $(DESTDIR)/usr/share/applications

cvs diff -r1.2 -r1.3 pkgsrc/x11/fltk13/patches/Attic/patch-af (expand / switch to unified diff)

--- pkgsrc/x11/fltk13/patches/Attic/patch-af 2013/06/09 16:09:35 1.2
+++ pkgsrc/x11/fltk13/patches/Attic/patch-af 2018/07/13 04:24:39 1.3
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: patch-af,v 1.2 2013/06/09 16:09:35 ryoon Exp $ 1$NetBSD: patch-af,v 1.3 2018/07/13 04:24:39 dbj Exp $
2 2
3--- makeinclude.in.orig 2012-12-05 14:53:03.000000000 +0000 3--- makeinclude.in.orig 2015-03-25 20:06:54.000000000 +0000
4+++ makeinclude.in 4+++ makeinclude.in
5@@ -138,20 +138,20 @@ UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@ 5@@ -150,20 +150,20 @@ UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@
6  6
7 .o$(EXEEXT): 7 .o$(EXEEXT):
8 echo Linking $@... 8 echo Linking $@...
9- $(CXX) $(ARCHFLAGS) $(LDFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@ 9- $(CXX) $(ARCHFLAGS) $(LDFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@
10+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@ 10+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@
11 $(OSX_ONLY) ../fltk-config --post $@ 11 $(OSX_ONLY) ../fltk-config --post $@
12  12
13 .c.o: 13 .c.o:
14 echo Compiling $<... 14 echo Compiling $<...
15- $(CC) -I.. $(ARCHFLAGS) @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CFLAGS) -c $< -o $@ 15- $(CC) -I.. $(ARCHFLAGS) @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CFLAGS) -c $< -o $@
16+ $(LIBTOOL) --mode=compile $(CC) -I.. $(ARCHFLAGS) @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CFLAGS) -c $< -o $@ 16+ $(LIBTOOL) --mode=compile $(CC) -I.. $(ARCHFLAGS) @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CFLAGS) -c $< -o $@
17  17
18 .cxx.o: 18 .cxx.o:

cvs diff -r1.2 -r1.3 pkgsrc/x11/fltk13/patches/Attic/patch-ag (expand / switch to unified diff)

--- pkgsrc/x11/fltk13/patches/Attic/patch-ag 2015/07/21 21:36:41 1.2
+++ pkgsrc/x11/fltk13/patches/Attic/patch-ag 2018/07/13 04:24:39 1.3
@@ -1,88 +1,88 @@ @@ -1,88 +1,88 @@
1$NetBSD: patch-ag,v 1.2 2015/07/21 21:36:41 markd Exp $ 1$NetBSD: patch-ag,v 1.3 2018/07/13 04:24:39 dbj Exp $
2 2
3--- src/Makefile.orig 2014-10-30 16:05:22.000000000 +0000 3--- src/Makefile.orig 2015-03-25 20:06:54.000000000 +0000
4+++ src/Makefile 4+++ src/Makefile
5@@ -234,6 +234,10 @@ $(LIBNAME): $(OBJECTS) 5@@ -237,6 +237,10 @@ $(LIBNAME): $(OBJECTS)
6 $(LIBCOMMAND) $@ $(OBJECTS) 6 $(LIBCOMMAND) $@ $(OBJECTS)
7 $(RANLIB) $@ 7 $(RANLIB) $@
8  8
9+libfltk.la: $(OBJECTS) 9+libfltk.la: $(OBJECTS)
10+ echo $(CXX) $@ ... 10+ echo $(CXX) $@ ...
11+ ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(OBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 1:9 $(LDLIBS) 11+ ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(OBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 1:9 $(LDLIBS)
12+ 12+
13 libfltk.so.1.3: $(OBJECTS) 13 libfltk.so.$(FL_DSO_VERSION): $(OBJECTS)
14 echo $(DSOCOMMAND) $@ ... 14 echo $(DSOCOMMAND) $@ ...
15 $(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS) 15 $(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS)
16@@ -270,6 +274,10 @@ $(FLLIBNAME): $(FLOBJECTS) 16@@ -273,6 +277,10 @@ $(FLLIBNAME): $(FLOBJECTS)
17 $(LIBCOMMAND) $@ $(FLOBJECTS) 17 $(LIBCOMMAND) $@ $(FLOBJECTS)
18 $(RANLIB) $@ 18 $(RANLIB) $@
19  19
20+libfltk_forms.la: $(FLOBJECTS) 20+libfltk_forms.la: $(FLOBJECTS)
21+ echo $(CXX) $@ ... 21+ echo $(CXX) $@ ...
22+ ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(FLOBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 1:9 $(LDLIBS) 22+ ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(FLOBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 1:9 $(LDLIBS)
23+ 23+
24 libfltk_forms.so.1.3: $(FLOBJECTS) libfltk.so.1.3 24 libfltk_forms.so.$(FL_DSO_VERSION): $(FLOBJECTS) libfltk.so.$(FL_DSO_VERSION)
25 echo $(DSOCOMMAND) $@ ... 25 echo $(DSOCOMMAND) $@ ...
26 $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk $(LDLIBS) 26 $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk $(LDLIBS)
27@@ -306,6 +314,10 @@ $(GLLIBNAME): $(GLOBJECTS) 27@@ -309,6 +317,10 @@ $(GLLIBNAME): $(GLOBJECTS)
28 $(LIBCOMMAND) $@ $(GLOBJECTS) 28 $(LIBCOMMAND) $@ $(GLOBJECTS)
29 $(RANLIB) $@ 29 $(RANLIB) $@
30  30
31+libfltk_gl.la: $(GLOBJECTS) 31+libfltk_gl.la: $(GLOBJECTS)
32+ echo $(CXX) $@ ... 32+ echo $(CXX) $@ ...
33+ ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(GLOBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 1:9 $(LDLIBS) 33+ ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(GLOBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 1:9 $(LDLIBS)
34+ 34+
35 libfltk_gl.so.1.3: $(GLOBJECTS) libfltk.so.1.3 35 libfltk_gl.so.$(FL_DSO_VERSION): $(GLOBJECTS) libfltk.so.$(FL_DSO_VERSION)
36 echo $(DSOCOMMAND) $@ ... 36 echo $(DSOCOMMAND) $@ ...
37 $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk $(LDLIBS) $(GLDLIBS) 37 $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk $(LDLIBS) $(GLDLIBS)
38@@ -342,6 +354,10 @@ $(IMGLIBNAME): $(IMGOBJECTS) 38@@ -345,6 +357,10 @@ $(IMGLIBNAME): $(IMGOBJECTS)
39 $(LIBCOMMAND) $@ $(IMGOBJECTS) 39 $(LIBCOMMAND) $@ $(IMGOBJECTS)
40 $(RANLIB) $@ 40 $(RANLIB) $@
41  41
42+libfltk_images.la: $(IMGOBJECTS) 42+libfltk_images.la: $(IMGOBJECTS)
43+ echo $(CXX) $@ ... 43+ echo $(CXX) $@ ...
44+ ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(IMGOBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 1:9 $(LDLIBS) 44+ ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(IMGOBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 1:9 $(LDLIBS)
45+ 45+
46 libfltk_images.so.1.3: $(IMGOBJECTS) libfltk.so.1.3 46 libfltk_images.so.$(FL_DSO_VERSION): $(IMGOBJECTS) libfltk.so.$(FL_DSO_VERSION)
47 echo $(DSOCOMMAND) $@ ... 47 echo $(DSOCOMMAND) $@ ...
48 $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk $(LDLIBS) 48 $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk $(LDLIBS)
49@@ -568,6 +584,9 @@ install: $(LIBNAME) $(DSONAME) \ 49@@ -570,6 +586,9 @@ install: $(LIBNAME) $(DSONAME) \
 50 $(INSTALL_LIB) $(GLLIBNAME) $(DESTDIR)$(libdir); \
50 $(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBBASENAME); \ 51 $(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBBASENAME); \
51 fi 52 fi
52 $(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBBASENAME) 
53+ if test x$(DSONAME) = xlibfltk.la; then\ 53+ if test x$(DSONAME) = xlibfltk.la; then\
54+ ${LIBTOOL} --mode=install $(INSTALL_LIB) libfltk.la $(DESTDIR)$(libdir); \ 54+ ${LIBTOOL} --mode=install $(INSTALL_LIB) libfltk.la $(DESTDIR)$(libdir); \
55+ fi 55+ fi
56 if test x$(DSONAME) = xlibfltk.so.1.3; then\ 56 $(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBBASENAME)
 57 if test x$(DSONAME) = xlibfltk.so.$(FL_DSO_VERSION); then\
57 $(RM) $(DESTDIR)$(libdir)/libfltk.so*;\ 58 $(RM) $(DESTDIR)$(libdir)/libfltk.so*;\
58 $(INSTALL_LIB) libfltk.so.1.3 $(DESTDIR)$(libdir); \ 59@@ -590,6 +609,9 @@ install: $(LIBNAME) $(DSONAME) \
59@@ -587,6 +606,9 @@ install: $(LIBNAME) $(DSONAME) \ 
60 $(RM) $(DESTDIR)$(libdir)/libfltk_s.a;\ 60 $(RM) $(DESTDIR)$(libdir)/libfltk_s.a;\
61 $(INSTALL_LIB) libfltk_s.a $(DESTDIR)$(libdir); \ 61 $(INSTALL_LIB) libfltk_s.a $(DESTDIR)$(libdir); \
62 fi 62 fi
63+ if test x$(FLDSONAME) = xlibfltk_forms.la; then\ 63+ if test x$(FLDSONAME) = xlibfltk_forms.la; then\
64+ ${LIBTOOL} --mode=install $(INSTALL_LIB) libfltk_forms.la $(DESTDIR)$(libdir); \ 64+ ${LIBTOOL} --mode=install $(INSTALL_LIB) libfltk_forms.la $(DESTDIR)$(libdir); \
65+ fi 65+ fi
66 if test x$(DSONAME) = xcygfltknox-1.3.dll; then\ 66 if test x$(DSONAME) = xcygfltknox-$(FL_DSO_VERSION).dll; then\
67 $(RM) $(DESTDIR)$(bindir)/$(DSONAME);\ 67 $(RM) $(DESTDIR)$(bindir)/$(DSONAME);\
68 $(INSTALL_LIB) $(DSONAME) $(DESTDIR)$(bindir); \ 68 $(INSTALL_LIB) $(DSONAME) $(DESTDIR)$(bindir); \
69@@ -604,6 +626,9 @@ install: $(LIBNAME) $(DSONAME) \ 69@@ -607,6 +629,9 @@ install: $(LIBNAME) $(DSONAME) \
70 $(INSTALL_LIB) libfltk_forms.so.1.3 $(DESTDIR)$(libdir); \ 70 $(INSTALL_LIB) libfltk_forms.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir); \
71 $(LN) libfltk_forms.so.1.3 $(DESTDIR)$(libdir)/libfltk_forms.so;\ 71 $(LN) libfltk_forms.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir)/libfltk_forms.so;\
72 fi 72 fi
73+ if test x$(GLDSONAME) = xlibfltk_gl.la; then\ 73+ if test x$(GLDSONAME) = xlibfltk_gl.la; then\
74+ ${LIBTOOL} --mode=install $(INSTALL_LIB) libfltk_gl.la $(DESTDIR)$(libdir); \ 74+ ${LIBTOOL} --mode=install $(INSTALL_LIB) libfltk_gl.la $(DESTDIR)$(libdir); \
75+ fi 75+ fi
76 if test x$(FLDSONAME) = xlibfltk_forms.sl.1.3; then\ 76 if test x$(FLDSONAME) = xlibfltk_forms.sl.$(FL_DSO_VERSION); then\
77 $(RM) $(DESTDIR)$(libdir)/libfltk_forms.sl*;\ 77 $(RM) $(DESTDIR)$(libdir)/libfltk_forms.sl*;\
78 $(INSTALL_LIB) libfltk_forms.sl.1.3 $(DESTDIR)$(libdir); \ 78 $(INSTALL_LIB) libfltk_forms.sl.$(FL_DSO_VERSION) $(DESTDIR)$(libdir); \
79@@ -661,6 +686,9 @@ install: $(LIBNAME) $(DSONAME) \ 79@@ -664,6 +689,9 @@ install: $(LIBNAME) $(DSONAME) \
80 $(RM) $(DESTDIR)$(libdir)/libfltk_gl.dll.a;\ 80 $(RM) $(DESTDIR)$(libdir)/libfltk_gl.dll.a;\
81 $(INSTALL_LIB) libfltk_gl.dll.a $(DESTDIR)$(libdir); \ 81 $(INSTALL_LIB) libfltk_gl.dll.a $(DESTDIR)$(libdir); \
82 fi 82 fi
83+ if test x$(IMGDSONAME) = xlibfltk_images.la; then\ 83+ if test x$(IMGDSONAME) = xlibfltk_images.la; then\
84+ ${LIBTOOL} --mode=install $(INSTALL_LIB) libfltk_images.la $(DESTDIR)$(libdir); \ 84+ ${LIBTOOL} --mode=install $(INSTALL_LIB) libfltk_images.la $(DESTDIR)$(libdir); \
85+ fi 85+ fi
86 if test x$(IMGDSONAME) = xlibfltk_images.so.1.3; then\ 86 if test x$(IMGDSONAME) = xlibfltk_images.so.$(FL_DSO_VERSION); then\
87 $(RM) $(DESTDIR)$(libdir)/libfltk_images.so*;\ 87 $(RM) $(DESTDIR)$(libdir)/libfltk_images.so*;\
88 $(INSTALL_LIB) libfltk_images.so.1.3 $(DESTDIR)$(libdir); \ 88 $(INSTALL_LIB) libfltk_images.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir); \

cvs diff -r1.3 -r1.4 pkgsrc/x11/fltk13/patches/patch-test_Makefile (expand / switch to unified diff)

--- pkgsrc/x11/fltk13/patches/patch-test_Makefile 2015/07/21 21:36:41 1.3
+++ pkgsrc/x11/fltk13/patches/patch-test_Makefile 2018/07/13 04:24:39 1.4
@@ -1,165 +1,169 @@ @@ -1,165 +1,169 @@
1$NetBSD: patch-test_Makefile,v 1.3 2015/07/21 21:36:41 markd Exp $ 1$NetBSD: patch-test_Makefile,v 1.4 2018/07/13 04:24:39 dbj Exp $
2 2
3--- test/Makefile.orig 2014-09-26 23:58:05.000000000 +0000 3--- test/Makefile.orig 2016-09-03 08:14:43.000000000 +0000
4+++ test/Makefile 4+++ test/Makefile
5@@ -302,19 +302,19 @@ buttons$(EXEEXT): buttons.o 5@@ -308,19 +308,19 @@ buttons$(EXEEXT): buttons.o
6  6
7 blocks$(EXEEXT): blocks.o 7 blocks$(EXEEXT): blocks.o
8 echo Linking $@... 8 echo Linking $@...
9- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) blocks.o -o $@ $(AUDIOLIBS) $(LINKFLTK) $(LDLIBS) 9- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) blocks.o -o $@ $(AUDIOLIBS) $(LINKFLTK) $(LDLIBS)
10+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) blocks.o -o $@ $(AUDIOLIBS) $(LINKFLTK) $(LDLIBS) 10+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) blocks.o -o $@ $(AUDIOLIBS) $(LINKFLTK) $(LDLIBS)
11 $(OSX_ONLY) $(INSTALL_BIN) blocks$(EXEEXT) blocks.app/Contents/MacOS 11 $(OSX_ONLY) $(INSTALL_BIN) blocks$(EXEEXT) blocks.app/Contents/MacOS
12  12
13 checkers$(EXEEXT): checkers.o 13 checkers$(EXEEXT): checkers.o
14 echo Linking $@... 14 echo Linking $@...
15- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) checkers.o -o $@ $(LINKFLTK) $(LDLIBS) 15- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) checkers.o -o $@ $(LINKFLTK) $(LDLIBS)
16+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) checkers.o -o $@ $(LINKFLTK) $(LDLIBS) 16+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) checkers.o -o $@ $(LINKFLTK) $(LDLIBS)
17 $(OSX_ONLY) $(INSTALL_BIN) checkers$(EXEEXT) checkers.app/Contents/MacOS 17 $(OSX_ONLY) $(INSTALL_BIN) checkers$(EXEEXT) checkers.app/Contents/MacOS
18  18
19 clock$(EXEEXT): clock.o 19 clock$(EXEEXT): clock.o
20  20
21 colbrowser$(EXEEXT): colbrowser.o 21 colbrowser$(EXEEXT): colbrowser.o
22 echo Linking $@... 22 echo Linking $@...
23- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ colbrowser.o $(LINKFLTKFORMS) $(LDLIBS) 23- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ colbrowser.o $(LINKFLTKFORMS) $(LDLIBS)
24+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ colbrowser.o $(LINKFLTKFORMS) $(LDLIBS) 24+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ colbrowser.o $(LINKFLTKFORMS) $(LDLIBS)
25 $(OSX_ONLY) ../fltk-config --post $@ 25 $(OSX_ONLY) ../fltk-config --post $@
26  26 $(OSX_ONLY) mkdir -p colbrowser.app/Contents/Resources
27 color_chooser$(EXEEXT): color_chooser.o 27 $(OSX_ONLY) cp -f rgb.txt colbrowser.app/Contents/Resources/
28@@ -325,18 +325,18 @@ curve$(EXEEXT): curve.o 28@@ -333,21 +333,21 @@ curve$(EXEEXT): curve.o
29  29
30 demo$(EXEEXT): demo.o 30 demo$(EXEEXT): demo.o
31 echo Linking $@... 31 echo Linking $@...
32- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ demo.o $(LINKFLTKFORMS) $(LDLIBS) 32- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ demo.o $(LINKFLTKFORMS) $(LDLIBS)
33+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ demo.o $(LINKFLTKFORMS) $(LDLIBS) 33+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ demo.o $(LINKFLTKFORMS) $(LDLIBS)
 34 $(OSX_ONLY) ../fltk-config --post $@
 35 $(OSX_ONLY) mkdir -p demo.app/Contents/Resources
 36 $(OSX_ONLY) cp -f demo.menu demo.app/Contents/Resources/
34  37
35 device$(EXEEXT): device.o $(IMGLIBNAME) 38 device$(EXEEXT): device.o $(IMGLIBNAME)
36 echo Linking $@... 39 echo Linking $@...
37- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) device.o -o $@ $(LINKFLTKIMG) $(LDLIBS) 40- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) device.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
38+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) device.o -o $@ $(LINKFLTKIMG) $(LDLIBS) 41+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) device.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
39 $(OSX_ONLY) ../fltk-config --post $@ 42 $(OSX_ONLY) ../fltk-config --post $@
40  43
41 doublebuffer$(EXEEXT): doublebuffer.o 44 doublebuffer$(EXEEXT): doublebuffer.o
42  45
43 editor$(EXEEXT): editor.o 46 editor$(EXEEXT): editor.o
44 echo Linking $@... 47 echo Linking $@...
45- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) editor.o -o $@ $(LINKFLTKIMG) $(LDLIBS) 48- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) editor.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
46+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) editor.o -o $@ $(LINKFLTKIMG) $(LDLIBS) 49+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) editor.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
47 $(OSX_ONLY) ../fltk-config --post $@ 50 $(OSX_ONLY) ../fltk-config --post $@
 51 $(OSX_ONLY) cp -f ../ide/Xcode4/plists/editor-Info.plist editor.app/Contents/Info.plist
48  52
49 fast_slow$(EXEEXT): fast_slow.o 53@@ -356,21 +356,21 @@ fast_slow.cxx: fast_slow.fl ../fluid/flu
50@@ -344,21 +344,21 @@ fast_slow.cxx: fast_slow.fl ../fluid/flu 
51  54
52 file_chooser$(EXEEXT): file_chooser.o $(IMGLIBNAME) 55 file_chooser$(EXEEXT): file_chooser.o $(IMGLIBNAME)
53 echo Linking $@... 56 echo Linking $@...
54- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) file_chooser.o -o $@ $(LINKFLTKIMG) $(LDLIBS) 57- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) file_chooser.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
55+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) file_chooser.o -o $@ $(LINKFLTKIMG) $(LDLIBS) 58+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) file_chooser.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
56 $(OSX_ONLY) ../fltk-config --post $@ 59 $(OSX_ONLY) ../fltk-config --post $@
57  60
58 fonts$(EXEEXT): fonts.o 61 fonts$(EXEEXT): fonts.o
59  62
60 forms$(EXEEXT): forms.o 63 forms$(EXEEXT): forms.o
61 echo Linking $@... 64 echo Linking $@...
62- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ forms.o $(LINKFLTKFORMS) $(LDLIBS) 65- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ forms.o $(LINKFLTKFORMS) $(LDLIBS)
63+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ forms.o $(LINKFLTKFORMS) $(LDLIBS) 66+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ forms.o $(LINKFLTKFORMS) $(LDLIBS)
64 $(OSX_ONLY) ../fltk-config --post $@ 67 $(OSX_ONLY) ../fltk-config --post $@
65  68
66 hello$(EXEEXT): hello.o 69 hello$(EXEEXT): hello.o
67  70
68 help$(EXEEXT): help.o $(IMGLIBNAME) 71 help$(EXEEXT): help.o $(IMGLIBNAME)
69 echo Linking $@... 72 echo Linking $@...
70- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) help.o -o $@ $(LINKFLTKIMG) $(LDLIBS) 73- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) help.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
71+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) help.o -o $@ $(LINKFLTKIMG) $(LDLIBS) 74+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) help.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
72 $(OSX_ONLY) ../fltk-config --post $@ 75 $(OSX_ONLY) ../fltk-config --post $@
73  76 $(OSX_ONLY) mkdir -p help.app/Contents/Resources
74 icon$(EXEEXT): icon.o 77 $(OSX_ONLY) cp -f help-test.html help.app/Contents/Resources/
75@@ -376,14 +376,14 @@ input_choice$(EXEEXT): input_choice.o 78@@ -390,14 +390,14 @@ input_choice$(EXEEXT): input_choice.o
76  79
77 keyboard$(EXEEXT): keyboard_ui.o keyboard.o 80 keyboard$(EXEEXT): keyboard_ui.o keyboard.o
78 echo Linking $@... 81 echo Linking $@...
79- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ keyboard.o keyboard_ui.o $(LINKFLTK) $(LDLIBS) 82- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ keyboard.o keyboard_ui.o $(LINKFLTK) $(LDLIBS)
80+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ keyboard.o keyboard_ui.o $(LINKFLTK) $(LDLIBS) 83+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ keyboard.o keyboard_ui.o $(LINKFLTK) $(LDLIBS)
81 $(OSX_ONLY) ../fltk-config --post $@ 84 $(OSX_ONLY) ../fltk-config --post $@
82 keyboard_ui.o: keyboard_ui.h 85 keyboard_ui.o: keyboard_ui.h
83 keyboard_ui.cxx: keyboard_ui.fl ../fluid/fluid$(EXEEXT) 86 keyboard_ui.cxx: keyboard_ui.fl ../fluid/fluid$(EXEEXT)
84  87
85 label$(EXEEXT): label.o 88 label$(EXEEXT): label.o
86 echo Linking $@... 89 echo Linking $@...
87- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ label.o $(LINKFLTKFORMS) $(LDLIBS) 90- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ label.o $(LINKFLTKFORMS) $(LDLIBS)
88+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ label.o $(LINKFLTKFORMS) $(LDLIBS) 91+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ label.o $(LINKFLTKFORMS) $(LDLIBS)
89 $(OSX_ONLY) ../fltk-config --post $@ 92 $(OSX_ONLY) ../fltk-config --post $@
90  93
91 line_style$(EXEEXT): line_style.o 94 line_style$(EXEEXT): line_style.o
92@@ -392,7 +392,7 @@ list_visuals$(EXEEXT): list_visuals.o 95@@ -406,7 +406,7 @@ list_visuals$(EXEEXT): list_visuals.o
93  96
94 mandelbrot$(EXEEXT): mandelbrot_ui.o mandelbrot.o 97 mandelbrot$(EXEEXT): mandelbrot_ui.o mandelbrot.o
95 echo Linking $@... 98 echo Linking $@...
96- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ mandelbrot.o mandelbrot_ui.o $(LINKFLTK) $(LDLIBS) 99- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ mandelbrot.o mandelbrot_ui.o $(LINKFLTK) $(LDLIBS)
97+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ mandelbrot.o mandelbrot_ui.o $(LINKFLTK) $(LDLIBS) 100+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ mandelbrot.o mandelbrot_ui.o $(LINKFLTK) $(LDLIBS)
98 $(OSX_ONLY) ../fltk-config --post $@ 101 $(OSX_ONLY) ../fltk-config --post $@
99 mandelbrot_ui.o: mandelbrot_ui.h 102 mandelbrot_ui.o: mandelbrot_ui.h
100 mandelbrot_ui.cxx: mandelbrot_ui.fl ../fluid/fluid$(EXEEXT) 103 mandelbrot_ui.cxx: mandelbrot_ui.fl ../fluid/fluid$(EXEEXT)
101@@ -405,14 +405,14 @@ minimum$(EXEEXT): minimum.o 104@@ -419,7 +419,7 @@ minimum$(EXEEXT): minimum.o
102  105
103 native-filechooser$(EXEEXT): native-filechooser.o $(IMGLIBNAME) 106 native-filechooser$(EXEEXT): native-filechooser.o $(IMGLIBNAME)
104 echo Linking $@... 107 echo Linking $@...
105- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) native-filechooser.o -o $@ $(LINKFLTKIMG) $(LDLIBS) 108- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) native-filechooser.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
106+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) native-filechooser.o -o $@ $(LINKFLTKIMG) $(LDLIBS) 109+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) native-filechooser.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
107 $(OSX_ONLY) ../fltk-config --post $@ 110 $(OSX_ONLY) ../fltk-config --post $@
108  111
109 navigation$(EXEEXT): navigation.o 112 navigation$(EXEEXT): navigation.o
 113@@ -428,7 +428,7 @@ offscreen$(EXEEXT): offscreen.o
110  114
111 output$(EXEEXT): output.o $(FLLIBNAME) 115 output$(EXEEXT): output.o $(FLLIBNAME)
112 echo Linking $@... 116 echo Linking $@...
113- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ output.o $(LINKFLTKFORMS) $(LDLIBS) 117- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ output.o $(LINKFLTKFORMS) $(LDLIBS)
114+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ output.o $(LINKFLTKFORMS) $(LDLIBS) 118+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ output.o $(LINKFLTKFORMS) $(LDLIBS)
115 $(OSX_ONLY) ../fltk-config --post $@ 119 $(OSX_ONLY) ../fltk-config --post $@
116  120
117 overlay$(EXEEXT): overlay.o 121 overlay$(EXEEXT): overlay.o
118@@ -423,7 +423,7 @@ pixmap$(EXEEXT): pixmap.o 122@@ -439,7 +439,7 @@ pixmap$(EXEEXT): pixmap.o
119  123
120 pixmap_browser$(EXEEXT): pixmap_browser.o $(IMGLIBNAME) 124 pixmap_browser$(EXEEXT): pixmap_browser.o $(IMGLIBNAME)
121 echo Linking $@... 125 echo Linking $@...
122- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) pixmap_browser.o -o $@ $(LINKFLTKIMG) $(LDLIBS) 126- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) pixmap_browser.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
123+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) pixmap_browser.o -o $@ $(LINKFLTKIMG) $(LDLIBS) 127+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) pixmap_browser.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
124 $(OSX_ONLY) ../fltk-config --post $@ 128 $(OSX_ONLY) ../fltk-config --post $@
125  129
126 preferences$(EXEEXT): preferences.o 130 preferences$(EXEEXT): preferences.o
127@@ -447,13 +447,13 @@ subwindow$(EXEEXT): subwindow.o 131@@ -463,13 +463,13 @@ subwindow$(EXEEXT): subwindow.o
128  132
129 sudoku: sudoku.o 133 sudoku: sudoku.o
130 echo Linking $@... 134 echo Linking $@...
131- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) sudoku.o -o $@ $(AUDIOLIBS) $(LINKFLTKIMG) $(LDLIBS) 135- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) sudoku.o -o $@ $(AUDIOLIBS) $(LINKFLTKIMG) $(LDLIBS)
132+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) sudoku.o -o $@ $(AUDIOLIBS) $(LINKFLTKIMG) $(LDLIBS) 136+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) sudoku.o -o $@ $(AUDIOLIBS) $(LINKFLTKIMG) $(LDLIBS)
133 $(OSX_ONLY) $(INSTALL_BIN) sudoku$(EXEEXT) sudoku.app/Contents/MacOS 137 $(OSX_ONLY) $(INSTALL_BIN) sudoku$(EXEEXT) sudoku.app/Contents/MacOS
134  138
135 sudoku.exe: sudoku.o sudoku.rc 139 sudoku.exe: sudoku.o sudoku.rc
136 echo Linking $@... 140 echo Linking $@...
137 $(RC) sudoku.rc sudokures.o 141 $(RC) sudoku.rc sudokures.o
138- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) sudoku.o sudokures.o -o $@ $(AUDIOLIBS) $(LINKFLTKIMG) $(LDLIBS) 142- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) sudoku.o sudokures.o -o $@ $(AUDIOLIBS) $(LINKFLTKIMG) $(LDLIBS)
139+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) sudoku.o sudokures.o -o $@ $(AUDIOLIBS) $(LINKFLTKIMG) $(LDLIBS) 143+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) sudoku.o sudokures.o -o $@ $(AUDIOLIBS) $(LINKFLTKIMG) $(LDLIBS)
140  144
141 symbols$(EXEEXT): symbols.o 145 symbols$(EXEEXT): symbols.o
142  146
143@@ -485,7 +485,7 @@ $(GLALL): $(LIBNAME) $(GLLIBNAME) 147@@ -501,7 +501,7 @@ $(GLALL): $(LIBNAME) $(GLLIBNAME)
144 # OpenGL demos... 148 # OpenGL demos...
145 CubeView$(EXEEXT): CubeMain.o CubeView.o CubeViewUI.o 149 CubeView$(EXEEXT): CubeMain.o CubeView.o CubeViewUI.o
146 echo Linking $@... 150 echo Linking $@...
147- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ \ 151- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ \
148+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ \ 152+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ \
149 CubeMain.o CubeView.o CubeViewUI.o \ 153 CubeMain.o CubeView.o CubeViewUI.o \
150 $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) 154 $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
151 $(OSX_ONLY) ../fltk-config --post $@ 155 $(OSX_ONLY) ../fltk-config --post $@
152@@ -496,37 +496,37 @@ CubeViewUI.cxx: CubeViewUI.fl ../fluid/f 156@@ -512,37 +512,37 @@ CubeViewUI.cxx: CubeViewUI.fl ../fluid/f
153  157
154 cube$(EXEEXT): cube.o 158 cube$(EXEEXT): cube.o
155 echo Linking $@... 159 echo Linking $@...
156- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ cube.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) 160- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ cube.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
157+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ cube.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) 161+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ cube.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
158 $(OSX_ONLY) ../fltk-config --post $@ 162 $(OSX_ONLY) ../fltk-config --post $@
159  163
160 fractals$(EXEEXT): fractals.o fracviewer.o 164 fractals$(EXEEXT): fractals.o fracviewer.o
161 echo Linking $@... 165 echo Linking $@...
162- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ fractals.o fracviewer.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) 166- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ fractals.o fracviewer.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
163+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ fractals.o fracviewer.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) 167+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ fractals.o fracviewer.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
164 $(OSX_ONLY) ../fltk-config --post $@ 168 $(OSX_ONLY) ../fltk-config --post $@
165  169