graphics/fotoxx: update the port to version 23.2.

4 files changed, 23 insertions, 26 deletions

diff --git a/graphics/fotoxx/Makefile b/graphics/fotoxx/Makefile
index e00480f51c2e..a451331ad8bd 100644
--- a/graphics/fotoxx/Makefile
+++ b/graphics/fotoxx/Makefile
@@ -1,8 +1,8 @@
 PORTNAME=	fotoxx
-PORTVERSION=	23.1
-PORTREVISION=	1
+PORTVERSION=	23.2
 CATEGORIES=	graphics
 MASTER_SITES=	https://kornelix.net/downloads/downloads/
+DISTNAME=	${PORTNAME}-${PORTVERSION}-source
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Image editing and collection management program
@@ -31,13 +31,9 @@ OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e \
-		'/#include <sys\/prctl\.h>/d' ${WRKSRC}/f.meta.cc
-	@${REINPLACE_CMD} -e \
 		's,pidof,pgrep -d\\\\ ,' ${WRKSRC}/fotoxx.cc
 	@${REINPLACE_CMD} -e \
 		'/#include/s,wait\.h,sys/&,' ${WRKSRC}/fotoxx.h
-	@${REINPLACE_CMD} -e \
-		's|/usr/share/fotoxx|${DATADIR}|' ${WRKSRC}/fotoxx.desktop
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/fotoxx
diff --git a/graphics/fotoxx/distinfo b/graphics/fotoxx/distinfo
index 37042b8b235a..24b804d75adb 100644
--- a/graphics/fotoxx/distinfo
+++ b/graphics/fotoxx/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1675202410
-SHA256 (fotoxx-23.1.tar.gz) = 2043daedac89d5826699ff2833e6e697caad707ae174bebb9470e21b692312c1
-SIZE (fotoxx-23.1.tar.gz) = 9198469
+TIMESTAMP = 1677658228
+SHA256 (fotoxx-23.2-source.tar.gz) = 9e8098582c4b3dec51c6bf232670204e939372d0e9b66f281a0661ac36c2cce9
+SIZE (fotoxx-23.2-source.tar.gz) = 9233622
diff --git a/graphics/fotoxx/files/patch-f.refine.cc b/graphics/fotoxx/files/patch-f.refine.cc
index e123f0053fe2..7867f66b007f 100644
--- a/graphics/fotoxx/files/patch-f.refine.cc
+++ b/graphics/fotoxx/files/patch-f.refine.cc
@@ -1,6 +1,6 @@
---- f.refine.cc.orig	2022-01-01 11:16:58 UTC
+--- f.refine.cc.orig	2023-03-01 07:32:06 UTC
 +++ f.refine.cc
-@@ -223,7 +223,7 @@ void m_edit_dist(GtkWidget *, cchar *menu)
+@@ -223,7 +223,7 @@ void m_edit_dist(GtkWidget *, ch  *menu)
     EFedit_dist.Farea = 2;                                                        //  select area usable
     EFedit_dist.Frestart = 1;                                                     //  restart allowed
     EFedit_dist.Fscript = 1;                                                      //  scripting supported 
@@ -9,21 +9,21 @@
     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
+@@ -589,7 +589,7 @@ void m_flatdist(GtkWidget *, ch  *menu)
+    EFflatdist.Frestart = 1;                                                      //  restartable
+    EFflatdist.Fpaintedits = 1;                                                   //  use with paint edits OK
+    EFflatdist.Fscript = 1;                                                       //  scripting supported
+-   EFflatdist.threadfunc = thread;
++   EFflatdist.threadfunc = flatdist_names::thread;
+    if (! edit_setup(EFflatdist)) 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;
+@@ -1067,7 +1067,7 @@ void flatdist_func(int _radius, int _flatten, int _deb
+    EFflatdist.menufunc = m_flatdist;
+    EFflatdist.Farea = 2;                                                         //  select area usable
+    EFflatdist.Frestart = 1;                                                      //  restartable
+-   EFflatdist.threadfunc = thread;
++   EFflatdist.threadfunc = flatdist_names::thread;
  
-    if (! edit_setup(EFflatten_dist)) return;                                     //  setup edit
+    if (! edit_setup(EFflatdist)) return;                                         //  setup edit
  
diff --git a/graphics/fotoxx/pkg-plist b/graphics/fotoxx/pkg-plist
index 498e96fc3cfc..6bf31c2d3394 100644
--- a/graphics/fotoxx/pkg-plist
+++ b/graphics/fotoxx/pkg-plist
@@ -103,7 +103,6 @@ share/applications/fotoxx.desktop
 %%DATADIR%%/images/albums-popmenu.jpg
 %%DATADIR%%/images/alien-colors1.jpg
 %%DATADIR%%/images/alien-colors2.jpg
-%%DATADIR%%/images/all-folders.jpg
 %%DATADIR%%/images/area-rescale.jpg
 %%DATADIR%%/images/area-rescale2.jpg
 %%DATADIR%%/images/batch-change-meta.jpg
@@ -195,6 +194,7 @@ share/applications/fotoxx.desktop
 %%DATADIR%%/images/flatten1.jpg
 %%DATADIR%%/images/flatten2.jpg
 %%DATADIR%%/images/folder.png
+%%DATADIR%%/images/folder-tree.jpg
 %%DATADIR%%/images/fotoxx-views.jpg
 %%DATADIR%%/images/fotoxx.png
 %%DATADIR%%/images/gallery-screen.jpg
@@ -296,6 +296,7 @@ share/applications/fotoxx.desktop
 %%DATADIR%%/images/saturation.jpg
 %%DATADIR%%/images/save.png
 %%DATADIR%%/images/search-images.jpg
+%%DATADIR%%/images/search-images-metadata.jpg
 %%DATADIR%%/images/select-area-finish.jpg
 %%DATADIR%%/images/select-area.jpg
 %%DATADIR%%/images/select.png