fltk13: Adapted libtool-patch for test programs

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: fltk13: Adapted libtool-patch for test programs
From: Michael Baeuerle <micha%NetBSD.org@localhost>
Date: Fri, 07 May 2021 10:01:43 +0000
Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Fri May 7 12:01:43 2021 +0200
Changeset:	2f21865ea586dd9b6792bf020cb19b8ddb0b9548

Modified Files:
	fltk13/distinfo
Added Files:
	fltk13/patches/patch-test_Makefile

Log Message:
fltk13: Adapted libtool-patch for test programs

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

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

diffstat:
 fltk13/distinfo                    |   1 +
 fltk13/patches/patch-test_Makefile | 207 +++++++++++++++++++++++++++++++++++++
 2 files changed, 208 insertions(+)

diffs:
diff --git a/fltk13/distinfo b/fltk13/distinfo
index bf800f732a..c7966d7c55 100644
--- a/fltk13/distinfo
+++ b/fltk13/distinfo
@@ -10,3 +10,4 @@ SHA1 (patch-documentation_Makefile) = 4c0c4243311c170d6c645db41b8bb1821d053712
 SHA1 (patch-fluid_Makefile) = 3281a0933042495c22a0f84297ecb0d01570ce37
 SHA1 (patch-makeinclude.in) = 2abf1b5f89895e6485966c552093dbc0e1d28935
 SHA1 (patch-src_Makefile) = 50fc3c76402517b46d5bdc4946a282b0b607f8f8
+SHA1 (patch-test_Makefile) = cc06bd57c632c3cda1eaeb62298b8b116496ed61
diff --git a/fltk13/patches/patch-test_Makefile b/fltk13/patches/patch-test_Makefile
new file mode 100644
index 0000000000..50a542c50f
--- /dev/null
+++ b/fltk13/patches/patch-test_Makefile
@@ -0,0 +1,207 @@
+$NetBSD$
+
+Use libtool.
+
+--- test/Makefile.orig	2021-05-04 17:36:17.000000000 +0000
++++ test/Makefile
+@@ -302,7 +302,7 @@ 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
+ 	$(OSX_ONLY) mkdir -p blocks.app/Contents/MacOS blocks.app/Contents/Resources
+ 	$(OSX_ONLY) $(INSTALL_BIN) blocks$(EXEEXT) blocks.app/Contents/MacOS
+@@ -311,7 +311,7 @@ blocks$(EXEEXT): blocks.o
+ 
+ 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) $(RM) -f -r checkers.app
+ 	$(OSX_ONLY) mkdir -p checkers.app/Contents/MacOS checkers.app/Contents/Resources
+ 	$(OSX_ONLY) $(INSTALL_BIN) checkers$(EXEEXT) checkers.app/Contents/MacOS
+@@ -322,7 +322,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 $(LINKFLTK) $(LDLIBS)
+ 	$(OSX_ONLY) ../fltk-config --post $@
+ 	$(OSX_ONLY) mkdir -p colbrowser.app/Contents/Resources
+ 	$(OSX_ONLY) cp -f rgb.txt colbrowser.app/Contents/Resources/
+@@ -335,21 +335,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 $(LINKFLTK) $(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 mac-resources/editor.plist editor.app/Contents/Info.plist
+ 
+@@ -358,7 +358,7 @@ 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
+@@ -367,14 +367,14 @@ 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$(EXEEXT): help.o $(IMGLIBNAME)
+ 	echo Linking $@...
+-	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) help.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
++	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) help.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
+ 	$(OSX_ONLY) ../fltk-config --post $@
+ 	$(OSX_ONLY) mkdir -p help.app/Contents/Resources
+ 	$(OSX_ONLY) cp -f help_dialog.html help.app/Contents/Resources/
+@@ -394,14 +394,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 $(LINKFLTK) $(LDLIBS)
+ 	$(OSX_ONLY) ../fltk-config --post $@
+ 
+ line_style$(EXEEXT): line_style.o
+@@ -410,7 +410,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)
+@@ -423,7 +423,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
+@@ -432,7 +432,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 $(LINKFLTK) $(LDLIBS)
+ 	$(OSX_ONLY) ../fltk-config --post $@
+ 
+ overlay$(EXEEXT): overlay.o
+@@ -443,7 +443,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
+@@ -467,7 +467,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) -f -r sudoku.app
+ 	$(OSX_ONLY) mkdir -p sudoku.app/Contents/MacOS sudoku.app/Contents/Resources
+ 	$(OSX_ONLY) $(INSTALL_BIN) sudoku$(EXEEXT) sudoku.app/Contents/MacOS
+@@ -477,7 +477,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
+ 
+@@ -509,7 +509,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 $@
+@@ -520,35 +520,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 $@ 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 $@
Prev by Date: wm/shod: add ref to sxhkd to DESCR
Next by Date: fltk13: Update comments of libtool patches
Previous by Thread: wm/shod: add ref to sxhkd to DESCR
Next by Thread: fltk13: Update comments of libtool patches
Indexes:
Home | Main Index | Thread Index | Old Index