graphics/fotoxx: update the port to version 22.1

Older versions are not fetchable (never do this).

Reported by:	pkg-fallout

5 files changed, 33 insertions, 42 deletions

diff --git a/graphics/fotoxx/Makefile b/graphics/fotoxx/Makefile
index 52f71293f067..a646a6eb62ea 100644
--- a/graphics/fotoxx/Makefile
+++ b/graphics/fotoxx/Makefile
@@ -1,7 +1,7 @@
 # Created by: Rod Person <rodperson@rodperson.com>
 
 PORTNAME=	fotoxx
-PORTVERSION=	21.60
+PORTVERSION=	22.1
 CATEGORIES=	graphics
 MASTER_SITES=	https://kornelix.net/downloads/downloads/
 
diff --git a/graphics/fotoxx/distinfo b/graphics/fotoxx/distinfo
index 00f4dfcba873..5710d3cf0a92 100644
--- a/graphics/fotoxx/distinfo
+++ b/graphics/fotoxx/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1634502156
-SHA256 (fotoxx-21.60.tar.gz) = 2973e967b04b79ed85ec4dc9ed77d78cd5881340dfc976a61ba85dcbeb4b0dfd
-SIZE (fotoxx-21.60.tar.gz) = 8679841
+TIMESTAMP = 1641036641
+SHA256 (fotoxx-22.1.tar.gz) = 8c69f8029ca971c51dad55461c14f9a6ec35550e1f71436ec25bdcc4365d575f
+SIZE (fotoxx-22.1.tar.gz) = 8801382
diff --git a/graphics/fotoxx/files/patch-f.enhance.cc b/graphics/fotoxx/files/patch-f.enhance.cc
deleted file mode 100644
index 51a2cc8cd300..000000000000
--- a/graphics/fotoxx/files/patch-f.enhance.cc
+++ /dev/null
@@ -1,29 +0,0 @@
---- f.enhance.cc.orig	2021-10-17 20:02:26 UTC
-+++ f.enhance.cc
-@@ -224,7 +224,7 @@ void m_editBD(GtkWidget *, cchar *menu)
-    EFeditBD.Farea = 2;                                                           //  select area usable
-    EFeditBD.Frestart = 1;                                                        //  restart allowed
-    EFeditBD.Fscript = 1;                                                         //  scripting supported 
--   EFeditBD.threadfunc = thread;
-+   EFeditBD.threadfunc = editBD_names::thread;
-    if (! edit_setup(EFeditBD)) return;                                           //  setup edit
- 
- /***
-@@ -590,7 +590,7 @@ void m_flattenBD(GtkWidget *, cchar *menu)
-    EFflattenBD.Frestart = 1;                                                     //  restartable
-    EFflattenBD.Fpaintedits = 1;                                                  //  use with paint edits OK
-    EFflattenBD.Fscript = 1;                                                      //  scripting supported
--   EFflattenBD.threadfunc = thread;
-+   EFflattenBD.threadfunc = flattenBD_names::thread;
-    if (! edit_setup(EFflattenBD)) return;                                        //  setup edit
- 
-    Eww = E0pxm->ww;
-@@ -1067,7 +1067,7 @@ void flattenBDfunc(int _NZ, int _flatten, int _deband1
-    EFflattenBD.menufunc = m_flattenBD;
-    EFflattenBD.Farea = 2;                                                        //  select area usable
-    EFflattenBD.Frestart = 1;                                                     //  restartable
--   EFflattenBD.threadfunc = thread;
-+   EFflattenBD.threadfunc = flattenBD_names::thread;
- 
-    if (! edit_setup(EFflattenBD)) return;                                        //  setup edit
- 
diff --git a/graphics/fotoxx/files/patch-f.refine.cc b/graphics/fotoxx/files/patch-f.refine.cc
new file mode 100644
index 000000000000..e123f0053fe2
--- /dev/null
+++ b/graphics/fotoxx/files/patch-f.refine.cc
@@ -0,0 +1,29 @@
+--- f.refine.cc.orig	2022-01-01 11:16:58 UTC
++++ f.refine.cc
+@@ -223,7 +223,7 @@ void m_edit_dist(GtkWidget *, cchar *menu)
+    EFedit_dist.Farea = 2;                                                        //  select area usable
+    EFedit_dist.Frestart = 1;                                                     //  restart allowed
+    EFedit_dist.Fscript = 1;                                                      //  scripting supported 
+-   EFedit_dist.threadfunc = thread;
++   EFedit_dist.threadfunc = edit_dist_names::thread;
+    if (! edit_setup(EFedit_dist)) return;                                        //  setup edit
+ 
+ /***
+@@ -589,7 +589,7 @@ void m_flatten_dist(GtkWidget *, cchar *menu)
+    EFflatten_dist.Frestart = 1;                                                  //  restartable
+    EFflatten_dist.Fpaintedits = 1;                                               //  use with paint edits OK
+    EFflatten_dist.Fscript = 1;                                                   //  scripting supported
+-   EFflatten_dist.threadfunc = thread;
++   EFflatten_dist.threadfunc = flatten_dist_names::thread;
+    if (! edit_setup(EFflatten_dist)) return;                                     //  setup edit
+ 
+    Eww = E0pxm->ww;
+@@ -1066,7 +1066,7 @@ void flatten_dist_func(int _NZ, int _flatten, int _deb
+    EFflatten_dist.menufunc = m_flatten_dist;
+    EFflatten_dist.Farea = 2;                                                     //  select area usable
+    EFflatten_dist.Frestart = 1;                                                  //  restartable
+-   EFflatten_dist.threadfunc = thread;
++   EFflatten_dist.threadfunc = flatten_dist_names::thread;
+ 
+    if (! edit_setup(EFflatten_dist)) return;                                     //  setup edit
+ 
diff --git a/graphics/fotoxx/files/patch-zfuncs.cc b/graphics/fotoxx/files/patch-zfuncs.cc
index 68438dff0c73..53a47b39738e 100644
--- a/graphics/fotoxx/files/patch-zfuncs.cc
+++ b/graphics/fotoxx/files/patch-zfuncs.cc
@@ -93,15 +93,6 @@
     elapsed = time2.tv_sec - time1.tv_sec;
     elapsed += 0.000000001 * (time2.tv_nsec - time1.tv_nsec);
     time1 = time2;
-@@ -1432,7 +1468,7 @@ void zloop(double dsecs)
- //    ...  protected code           //  only one thread at a time can be in here
- //  spinlock(0);
- 
--pthread_mutex_t   spinmutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;            //  21.44
-+pthread_mutex_t   spinmutex = PTHREAD_MUTEX_INITIALIZER;
- 
- void spinlock(int lock)
- {
 @@ -1649,6 +1685,10 @@ int main_thread()                                     
     return 0;
  }