fltk14-devel: Update to git commit cc15700bdb918699b6977140f27f6183efc3ac76

[Michael Baeuerle <micha%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Fri Mar 1 17:15:43 2024 +0100
Changeset:	988a5053e3b42422ed55e5bad2dd7a98d0a7b71b

Modified Files:
	fltk14-devel/Makefile
	fltk14-devel/PLIST
	fltk14-devel/distinfo
	fltk14-devel/patches/patch-Makefile
	fltk14-devel/patches/patch-documentation_Makefile
	fltk14-devel/patches/patch-test_Makefile

Log Message:
fltk14-devel: Update to git commit cc15700bdb918699b6977140f27f6183efc3ac76

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

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

diffstat:
 fltk14-devel/Makefile                             |  2 +-
 fltk14-devel/PLIST                                | 12 ++++++++++--
 fltk14-devel/distinfo                             | 12 ++++++------
 fltk14-devel/patches/patch-Makefile               | 21 +++++++++------------
 fltk14-devel/patches/patch-documentation_Makefile | 18 +++++++++++++++---
 fltk14-devel/patches/patch-test_Makefile          | 12 ++++++------
 6 files changed, 47 insertions(+), 30 deletions(-)

diffs:
diff --git a/fltk14-devel/Makefile b/fltk14-devel/Makefile
index 31a4c9a545..678ee271f1 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=	31ec6f623ab76d3f1107af9782237b8d7a089026
+GITHUB_TAG=	cc15700bdb918699b6977140f27f6183efc3ac76
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	micha%NetBSD.org@localhost
diff --git a/fltk14-devel/PLIST b/fltk14-devel/PLIST
index f38371bbc6..27ed3c2eb4 100644
--- a/fltk14-devel/PLIST
+++ b/fltk14-devel/PLIST
@@ -1,9 +1,11 @@
 @comment $NetBSD$
 bin/fltk-config
+bin/fltk-options
 bin/fluid
 include/FL/Enumerations.H
 include/FL/Fl.H
 include/FL/Fl_Adjuster.H
+include/FL/Fl_Anim_GIF_Image.H
 include/FL/Fl_BMP_Image.H
 include/FL/Fl_Bitmap.H
 include/FL/Fl_Box.H
@@ -38,6 +40,7 @@ include/FL/Fl_Free.H
 include/FL/Fl_GIF_Image.H
 include/FL/Fl_Gl_Window.H
 include/FL/Fl_Graphics_Driver.H
+include/FL/Fl_Grid.H
 include/FL/Fl_Group.H
 include/FL/Fl_Help_Dialog.H
 include/FL/Fl_Help_View.H
@@ -46,6 +49,7 @@ include/FL/Fl_Hor_Fill_Slider.H
 include/FL/Fl_Hor_Nice_Slider.H
 include/FL/Fl_Hor_Slider.H
 include/FL/Fl_Hor_Value_Slider.H
+include/FL/Fl_ICO_Image.H
 include/FL/Fl_Image.H
 include/FL/Fl_Image_Surface.H
 include/FL/Fl_Input.H
@@ -93,21 +97,23 @@ include/FL/Fl_Round_Button.H
 include/FL/Fl_Round_Clock.H
 include/FL/Fl_SVG_File_Surface.H
 include/FL/Fl_SVG_Image.H
+include/FL/Fl_Scheme.H
+include/FL/Fl_Scheme_Choice.H
 include/FL/Fl_Scroll.H
 include/FL/Fl_Scrollbar.H
 include/FL/Fl_Secret_Input.H
 include/FL/Fl_Select_Browser.H
 include/FL/Fl_Shared_Image.H
+include/FL/Fl_Shortcut_Button.H
 include/FL/Fl_Simple_Counter.H
-include/FL/Fl_Simple_Terminal.H
 include/FL/Fl_Single_Window.H
 include/FL/Fl_Slider.H
 include/FL/Fl_Spinner.H
-include/FL/Fl_String.H
 include/FL/Fl_Sys_Menu_Bar.H
 include/FL/Fl_Table.H
 include/FL/Fl_Table_Row.H
 include/FL/Fl_Tabs.H
+include/FL/Fl_Terminal.H
 include/FL/Fl_Text_Buffer.H
 include/FL/Fl_Text_Display.H
 include/FL/Fl_Text_Editor.H
@@ -135,6 +141,7 @@ include/FL/Fl_XPM_Image.H
 include/FL/filename.H
 include/FL/fl_ask.H
 include/FL/fl_attr.h
+include/FL/fl_callback_macros.H
 include/FL/fl_casts.H
 include/FL/fl_config.h
 include/FL/fl_draw.H
@@ -172,5 +179,6 @@ lib/libfltk_images.a
 lib/libfltk_images.so
 lib/libfltk_images.so.1.4
 man/man1/fltk-config.1
+man/man1/fltk-options.1
 man/man1/fluid.1
 man/man3/fltk.3
diff --git a/fltk14-devel/distinfo b/fltk14-devel/distinfo
index 93f0c04b2f..0dfe7602b8 100644
--- a/fltk14-devel/distinfo
+++ b/fltk14-devel/distinfo
@@ -1,8 +1,8 @@
 $NetBSD$
 
-BLAKE2s (fltk-1.4.x-31ec6f623ab76d3f1107af9782237b8d7a089026.zip) = 629c8f5f09569cb6cb9aa3dec555bf0f64ec11cdd9621cb5ca929df8c40cafb9
-SHA512 (fltk-1.4.x-31ec6f623ab76d3f1107af9782237b8d7a089026.zip) = f8b528073e690385eabc206fecaca6465a312f2173d8d2672f398dd8480bd7b4bddf5871eee255bcd3811564b646ef176795f1e6d27b09aaba8ba95003fd8b1e
-Size (fltk-1.4.x-31ec6f623ab76d3f1107af9782237b8d7a089026.zip) = 6955614 bytes
-SHA1 (patch-Makefile) = cbfbdb41dd4de6cb396780e336350eeee6fc7347
-SHA1 (patch-documentation_Makefile) = ce2872dae289672a8bc603e1c10225df8d06f126
-SHA1 (patch-test_Makefile) = 8e1acc118d7fa4de2b21001a19f681351f4f839b
+BLAKE2s (fltk-1.4.x-cc15700bdb918699b6977140f27f6183efc3ac76.zip) = f0d237e3936e4faf1f1262cb361b91cff9eb5a25b91bc2aa8f98b5093a5c8e42
+SHA512 (fltk-1.4.x-cc15700bdb918699b6977140f27f6183efc3ac76.zip) = 51e6a3b2027d06f8bb62539bb46239aaa6bd8954826eb67c1001f9c5eb91af9e3d5e37fe2f1e70e2960ba431252fb027416e31374f7eb524b16dd79572a3e0ea
+Size (fltk-1.4.x-cc15700bdb918699b6977140f27f6183efc3ac76.zip) = 9325097 bytes
+SHA1 (patch-Makefile) = 6ee1ce87974ccc307c6213ffc7cb5d989cc463d4
+SHA1 (patch-documentation_Makefile) = 2bf2bdcb808ed75bee22d9587a5fc5edb5f22e35
+SHA1 (patch-test_Makefile) = fe53f4571ac0388866e719dd15628a2648319aa9
diff --git a/fltk14-devel/patches/patch-Makefile b/fltk14-devel/patches/patch-Makefile
index 354f1f891b..5445d64c7e 100644
--- a/fltk14-devel/patches/patch-Makefile
+++ b/fltk14-devel/patches/patch-Makefile
@@ -1,30 +1,27 @@
 $NetBSD$
 
 Remove tests from directory list.
-Add target "test" to build test programs.
+Add rule to build tests.
 
---- Makefile.orig	2016-09-30 11:33:14.000000000 +0000
+--- Makefile.orig	2024-03-01 13:00:43.000000000 +0000
 +++ Makefile
 @@ -16,7 +16,7 @@
  
  include makeinclude
  
--DIRS = $(IMAGEDIRS) $(LIBDECORDIR) src $(CAIRODIR) fluid test documentation
-+DIRS = $(IMAGEDIRS) $(LIBDECORDIR) src $(CAIRODIR) fluid documentation
+-DIRS = $(IMAGEDIRS) $(LIBDECORDIR) src $(CAIRODIR) $(FLUIDDIR) fltk-options test \
++DIRS = $(IMAGEDIRS) $(LIBDECORDIR) src $(CAIRODIR) $(FLUIDDIR) fltk-options \
+        documentation
  
  all: makeinclude fltk-config
- 	for dir in $(DIRS); do\
-@@ -24,6 +24,14 @@ all: makeinclude fltk-config
+@@ -25,6 +25,11 @@ all: makeinclude fltk-config
  		(cd $$dir; $(MAKE) $(MFLAGS)) || exit 1;\
  	done
  
++# [pkgsrc] Build only for "make test"
 +test: makeinclude
-+	dir=test;\
-+	echo "=== making $$dir ===";\
-+	if test ! -f $$dir/makedepend; then\
-+		touch $$dir/makedepend;\
-+	fi;\
-+	(cd $$dir; $(MAKE) $(MFLAGS)) || break;\
++	echo "=== making test ===";\
++	(cd test; $(MAKE) $(MFLAGS)) || exit 1;\
 +
  install: makeinclude
  	-mkdir -p $(DESTDIR)$(bindir)
diff --git a/fltk14-devel/patches/patch-documentation_Makefile b/fltk14-devel/patches/patch-documentation_Makefile
index 6276e40f3a..de3a3acb86 100644
--- a/fltk14-devel/patches/patch-documentation_Makefile
+++ b/fltk14-devel/patches/patch-documentation_Makefile
@@ -1,18 +1,30 @@
 $NetBSD$
 
-Do not install manpages to cat1/cat3 directories.
+Do not install manpages to cat1/cat3/cat6 directories.
 
---- documentation/Makefile.orig	2015-06-16 13:18:28.000000000 +0000
+--- documentation/Makefile.orig	2023-04-23 08:03:02.000000000 +0000
 +++ documentation/Makefile
-@@ -88,11 +88,6 @@ install: $(MANPAGES)
+@@ -90,12 +90,6 @@ install: $(MANPAGES)
  	  $(INSTALL_DATA) fltk.pdf $(DESTDIR)$(docdir); \
  	fi
  	echo "Installing man pages in $(DESTDIR)$(mandir) ..."
 -	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat1
 -	$(INSTALL_MAN) $(SRC_DOCDIR)/fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
 -	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
+-	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk-options.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
 -	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat3
 -	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk.$(CAT3EXT) $(DESTDIR)$(mandir)/cat3
  	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/man1
  	$(INSTALL_MAN) $(SRC_DOCDIR)/fluid.man $(DESTDIR)$(mandir)/man1/fluid.1
  	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.man $(DESTDIR)$(mandir)/man1/fltk-config.1
+@@ -104,10 +98,6 @@ install: $(MANPAGES)
+ 	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk.man $(DESTDIR)$(mandir)/man3/fltk.3
+ 
+ install-linux install-osx:
+-	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat6
+-	$(INSTALL_MAN) $(SRC_DOCDIR)/blocks.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6
+-	$(INSTALL_MAN) $(SRC_DOCDIR)/checkers.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6
+-	$(INSTALL_MAN) $(SRC_DOCDIR)/sudoku.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6
+ 	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/man6
+ 	$(INSTALL_MAN) $(SRC_DOCDIR)/blocks.man $(DESTDIR)$(mandir)/man6/blocks.6
+ 	$(INSTALL_MAN) $(SRC_DOCDIR)/checkers.man $(DESTDIR)$(mandir)/man6/checkers.6
diff --git a/fltk14-devel/patches/patch-test_Makefile b/fltk14-devel/patches/patch-test_Makefile
index 631a53402a..2235010c64 100644
--- a/fltk14-devel/patches/patch-test_Makefile
+++ b/fltk14-devel/patches/patch-test_Makefile
@@ -2,16 +2,16 @@ $NetBSD$
 
 Add note that GUI test programs are not executed automatically.
 
---- test/Makefile.orig	2022-10-30 10:46:08.000000000 +0000
+--- test/Makefile.orig	2024-03-01 13:00:43.000000000 +0000
 +++ test/Makefile
-@@ -237,6 +237,10 @@ GLALL = \
+@@ -242,6 +242,10 @@ GLALL = \
+ 	glut_test$(EXEEXT) \
+ 	shape$(EXEEXT) \
  	unittests$(EXEEXT)
- 
- all:	$(ALL) $(GLDEMOS)
 +	echo "-------------------------------------------"
 +	echo 'Test programs were built in $${WRKSRC}/test.'
 +	echo "You have to start them manually."
 +	echo "-------------------------------------------"
  
- gldemos:	$(GLALL)
- 
+ all:	$(ALL) $(GLDEMOS)
+ 	for dir in $(FLUIDDIR); do\