Revert "fltk14-devel: Rebase to Git commit af4954aee3483f03ff69e990e80f4e4a18e8b7f6"

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

Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Fri Feb 18 17:19:31 2022 +0100
Changeset:	1fe47a619fcd8495932fbfd80f65f506454417e4

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

Log Message:
Revert "fltk14-devel: Rebase to Git commit af4954aee3483f03ff69e990e80f4e4a18e8b7f6"

This reverts commit 73dfd31a059c2c92704003ff86a458f6db2a30f5.
This snapshot does not work correctly.

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

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

diffstat:
 fltk14-devel/Makefile                             |  3 +--
 fltk14-devel/PLIST                                |  9 +++------
 fltk14-devel/distinfo                             | 10 +++++-----
 fltk14-devel/patches/patch-documentation_Makefile |  2 +-
 fltk14-devel/patches/patch-test_Makefile          |  6 +++---
 5 files changed, 13 insertions(+), 17 deletions(-)

diffs:
diff --git a/fltk14-devel/Makefile b/fltk14-devel/Makefile
index d64f033940..acc954ae05 100644
--- a/fltk14-devel/Makefile
+++ b/fltk14-devel/Makefile
@@ -3,8 +3,7 @@
 DISTNAME=	fltk-1.4.x
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GITHUB:=fltk/}
-GITHUB_TAG=	af4954aee3483f03ff69e990e80f4e4a18e8b7f6
-#GITHUB_TAG=	ec974ce6b8714c6c9ee344bd94f4e53b68cd4df2
+GITHUB_TAG=	787c67afea179735f2fea12f95ad04c80b3717e7
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	micha%NetBSD.org@localhost
diff --git a/fltk14-devel/PLIST b/fltk14-devel/PLIST
index dac62d7893..e522d4c96c 100644
--- a/fltk14-devel/PLIST
+++ b/fltk14-devel/PLIST
@@ -102,7 +102,6 @@ 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
@@ -131,16 +130,15 @@ include/FL/Fl_Window.H
 include/FL/Fl_Wizard.H
 include/FL/Fl_XBM_Image.H
 include/FL/Fl_XPM_Image.H
+include/FL/abi-version.h
+include/FL/android.H
 include/FL/filename.H
 include/FL/fl_ask.H
-include/FL/fl_attr.h
-include/FL/fl_casts.H
-include/FL/fl_config.h
 include/FL/fl_draw.H
 include/FL/fl_message.H
 include/FL/fl_show_colormap.H
 include/FL/fl_show_input.H
-include/FL/fl_string_functions.h
+include/FL/fl_string.h
 include/FL/fl_types.h
 include/FL/fl_utf8.h
 include/FL/forms.H
@@ -156,7 +154,6 @@ include/FL/platform.H
 include/FL/platform_types.h
 include/FL/win32.H
 include/FL/x.H
-include/FL/x11.H
 lib/libfltk.a
 lib/libfltk.so
 lib/libfltk.so.1.4
diff --git a/fltk14-devel/distinfo b/fltk14-devel/distinfo
index ae7069d415..c06f4f7865 100644
--- a/fltk14-devel/distinfo
+++ b/fltk14-devel/distinfo
@@ -1,8 +1,8 @@
 $NetBSD$
 
-BLAKE2s (fltk-1.4.x-af4954aee3483f03ff69e990e80f4e4a18e8b7f6.zip) = 7ac1970931a87915f07706d21171caa6b38d842c8b17abe8a6399a28fcb0e2de
-SHA512 (fltk-1.4.x-af4954aee3483f03ff69e990e80f4e4a18e8b7f6.zip) = 99235afbe51154e5eae62cf0180a37c18169735661ed9781833e3584349e3be11072b0b7b982fd0c4fc1033be9f271a81c50088ef5fb144de76b20503f76c24c
-Size (fltk-1.4.x-af4954aee3483f03ff69e990e80f4e4a18e8b7f6.zip) = 6717840 bytes
+RMD160 (fltk-1.4.x-787c67afea179735f2fea12f95ad04c80b3717e7.zip) = 6c79266be7be44467d8cca99b771bb4200c953a5
+SHA512 (fltk-1.4.x-787c67afea179735f2fea12f95ad04c80b3717e7.zip) = f63baf6408b996ab19cccf4425e35f582cb2beeff96f71ad6c6f4680cc7f5c1038859c1ab26265b3044adbdb2a619956c3ef9ee6160941236b318b6fe4158854
+Size (fltk-1.4.x-787c67afea179735f2fea12f95ad04c80b3717e7.zip) = 6955205 bytes
 SHA1 (patch-Makefile) = 0d87ce49eb74d4faffb0bc9d6ca59f53d87ba4b4
-SHA1 (patch-documentation_Makefile) = ee829cc7da2d46b0f2ebf3bd10d54bdd0ef7101c
-SHA1 (patch-test_Makefile) = 0cb1a9b04cd89de70ed2750292500c9a55db0851
+SHA1 (patch-documentation_Makefile) = 560593c4165eb7aef1841d765cc206bfb87f483d
+SHA1 (patch-test_Makefile) = bcb866d62a4d5995a131dbe7467c4f483d8ae464
diff --git a/fltk14-devel/patches/patch-documentation_Makefile b/fltk14-devel/patches/patch-documentation_Makefile
index b7a736b899..bad50c76f3 100644
--- a/fltk14-devel/patches/patch-documentation_Makefile
+++ b/fltk14-devel/patches/patch-documentation_Makefile
@@ -4,7 +4,7 @@ Do not install manpages to cat1/cat3 directories.
 
 --- documentation/Makefile.orig	2015-06-16 13:18:28.000000000 +0000
 +++ documentation/Makefile
-@@ -87,11 +87,6 @@ install: $(MANPAGES)
+@@ -86,11 +86,6 @@ install: $(MANPAGES)
  	  $(INSTALL_DATA) fltk.pdf $(DESTDIR)$(docdir); \
  	fi
  	echo "Installing man pages in $(DESTDIR)$(mandir) ..."
diff --git a/fltk14-devel/patches/patch-test_Makefile b/fltk14-devel/patches/patch-test_Makefile
index 18c0c78656..bb04108526 100644
--- a/fltk14-devel/patches/patch-test_Makefile
+++ b/fltk14-devel/patches/patch-test_Makefile
@@ -2,10 +2,10 @@ $NetBSD$
 
 Add note that GUI test programs are not executed automatically.
 
---- test/Makefile.orig	2022-02-16 13:51:00.000000000 +0000
+--- test/Makefile.orig	2020-07-16 10:25:51.000000000 +0000
 +++ test/Makefile
-@@ -233,6 +233,10 @@ GLALL = \
- 	unittests$(EXEEXT)
+@@ -195,6 +195,10 @@ GLALL = \
+ 	shape$(EXEEXT)
  
  all:	$(ALL) $(GLDEMOS)
 +	echo "-------------------------------------------"