fltk14-devel: Update to git commit 05a95e146b2429154b360030d098f0dae5555706

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

Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Wed Apr 10 18:59:46 2024 +0200
Changeset:	845634ca268710de507ce6951802fe39f4903324

Modified Files:
	fltk14-devel/Makefile
	fltk14-devel/buildlink3.mk
	fltk14-devel/distinfo
	fltk14-devel/options.mk
Removed Files:
	fltk14-devel/patches/patch-src_drivers_Unix_Fl__Unix__System__Driver.cxx

Log Message:
fltk14-devel: Update to git commit 05a95e146b2429154b360030d098f0dae5555706

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

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/buildlink3.mk                         |  4 ++-
 fltk14-devel/distinfo                              |  7 ++--
 fltk14-devel/options.mk                            |  2 +-
 ...h-src_drivers_Unix_Fl__Unix__System__Driver.cxx | 42 ----------------------
 5 files changed, 8 insertions(+), 49 deletions(-)

diffs:
diff --git a/fltk14-devel/Makefile b/fltk14-devel/Makefile
index bb1c390578..1b14b2a125 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=	4742d830beb17bd92fed83eb58cede09bfddd576
+GITHUB_TAG=	05a95e146b2429154b360030d098f0dae5555706
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	micha%NetBSD.org@localhost
diff --git a/fltk14-devel/buildlink3.mk b/fltk14-devel/buildlink3.mk
index 4b3ddf619d..8bdfb3fd97 100644
--- a/fltk14-devel/buildlink3.mk
+++ b/fltk14-devel/buildlink3.mk
@@ -10,8 +10,9 @@ BUILDLINK_ABI_DEPENDS.fltk?=	fltk>=1.4.0
 BUILDLINK_PKGSRCDIR.fltk?=	../../wip/fltk14-devel
 BUILDLINK_FILES.fltk+=		include/Fl/*
 
-pkgbase := fltk
 .include "../../mk/bsd.fast.prefs.mk"
+
+pkgbase := fltk
 .include "../../mk/pkg-build-options.mk"
 
 # For "cairo" option
@@ -85,6 +86,7 @@ BUILDLINK_API_DEPENDS.zlib+=	zlib>=1.2.3
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
+
 .endif # FLTK_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-fltk
diff --git a/fltk14-devel/distinfo b/fltk14-devel/distinfo
index 5ba5549e52..339247aa4a 100644
--- a/fltk14-devel/distinfo
+++ b/fltk14-devel/distinfo
@@ -1,7 +1,6 @@
 $NetBSD$
 
-BLAKE2s (fltk-1.4.x-4742d830beb17bd92fed83eb58cede09bfddd576.zip) = 27fab8115caf7cb1fb6ae9bb7a4fee7ec90ebd77d494de9011d6b9e4f3cfe18d
-SHA512 (fltk-1.4.x-4742d830beb17bd92fed83eb58cede09bfddd576.zip) = 3d87dabf4cc1bb8d14bcdea5261c49ea5e31dfd0951226874b60d13fa9a041dfb8b2fa97f51aa7e521a846b6537b66970fddb3d647a484378d219c5f3b4d3397
-Size (fltk-1.4.x-4742d830beb17bd92fed83eb58cede09bfddd576.zip) = 9338058 bytes
+BLAKE2s (fltk-1.4.x-05a95e146b2429154b360030d098f0dae5555706.zip) = d469e5c7b04267e92647ec97a96bde0bd11b1c00551ce11ee2ed75e29e8c8ec7
+SHA512 (fltk-1.4.x-05a95e146b2429154b360030d098f0dae5555706.zip) = 406063490a69ecad6799cf0b2dc450e8aed48da7a9ef3b204abe34b5716eb21fe0381bdab00a1fae528b3e08cb9e87255bd19556de283514cc4e46852f3a4ef3
+Size (fltk-1.4.x-05a95e146b2429154b360030d098f0dae5555706.zip) = 9340525 bytes
 SHA1 (patch-documentation_Makefile) = 4af65225feb343f8d4bf1af11cfb4929b7fe81c6
-SHA1 (patch-src_drivers_Unix_Fl__Unix__System__Driver.cxx) = f88dbbc696afe375e850555c0579dec67c106ac2
diff --git a/fltk14-devel/options.mk b/fltk14-devel/options.mk
index 24f62077bd..539be9b103 100644
--- a/fltk14-devel/options.mk
+++ b/fltk14-devel/options.mk
@@ -2,7 +2,7 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.fltk14
+PKG_OPTIONS_VAR=	PKG_OPTIONS.fltk
 PKG_SUPPORTED_OPTIONS=	cairo opengl pango x11 xcursor xfixes xft2 xinerama xrender
 PKG_SUPPORTED_OPTIONS+=	wayland  # untested
 # FLTK has native backends for macOS and Windows (Cygwin)
diff --git a/fltk14-devel/patches/patch-src_drivers_Unix_Fl__Unix__System__Driver.cxx b/fltk14-devel/patches/patch-src_drivers_Unix_Fl__Unix__System__Driver.cxx
deleted file mode 100644
index 9e0fbd1946..0000000000
--- a/fltk14-devel/patches/patch-src_drivers_Unix_Fl__Unix__System__Driver.cxx
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD$
-
-Fix mount point detection code for AIX and NetBSD.
-https://github.com/fltk/fltk/issues/942
-https://github.com/fltk/fltk/issues/944
-
---- src/drivers/Unix/Fl_Unix_System_Driver.cxx.orig	2024-03-24 07:48:45.000000000 +0000
-+++ src/drivers/Unix/Fl_Unix_System_Driver.cxx
-@@ -278,6 +278,8 @@ int Fl_Unix_System_Driver::file_browser_
- 
-   // We always have the root filesystem
-   browser->add("/", icon);
-+  num_files++;
-+
-   // Get the required buffer size for the vmount structures
-   res = mntctl(MCTL_QUERY, sizeof(len), (char *) &len);
-   if (!res) {
-@@ -299,6 +301,7 @@ int Fl_Unix_System_Driver::file_browser_
-           if (strcmp("/", filename) != 0) {
-             strlcat(filename, "/", lname);
-             browser->add(filename, icon);
-+            num_files++;
-           }
-           vp = (struct vmount *) ((char *) vp + vp->vmt_length);
-         }
-@@ -317,6 +320,8 @@ int Fl_Unix_System_Driver::file_browser_
- 
-   // We always have the root filesystem
-   browser->add("/", icon);
-+  num_files++;
-+
- #  ifdef HAVE_PTHREAD
-   // Lock mutex for thread safety
-   if (!pthread_mutex_lock(&getvfsstat_mutex)) {
-@@ -330,6 +335,7 @@ int Fl_Unix_System_Driver::file_browser_
-         if (strcmp("/", filename) != 0) {
-           strlcat(filename, "/", lname);
-           browser->add(filename, icon);
-+          num_files++;
-         }
-       }
-     } else {