git: 8a9c16c52aec - main - graphics/fotoxx: update the port to version 22.11

From: Alexey Dokuchaev <danfe_at_FreeBSD.org>
Date: Sat, 29 Jan 2022 19:45:22 UTC
The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=8a9c16c52aecfdb6ea0dc8696b1a54d907bd1f5c

commit 8a9c16c52aecfdb6ea0dc8696b1a54d907bd1f5c
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2022-01-29 19:43:22 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2022-01-29 19:43:22 +0000

    graphics/fotoxx: update the port to version 22.11
    
    Remove the L-word from the port description while here.
---
 graphics/fotoxx/Makefile             |  2 +-
 graphics/fotoxx/distinfo             |  6 +++---
 graphics/fotoxx/files/patch-Makefile | 29 ++++++++++++++---------------
 graphics/fotoxx/pkg-descr            |  4 ++--
 4 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/graphics/fotoxx/Makefile b/graphics/fotoxx/Makefile
index a646a6eb62ea..997baf997529 100644
--- a/graphics/fotoxx/Makefile
+++ b/graphics/fotoxx/Makefile
@@ -1,7 +1,7 @@
 # Created by: Rod Person <rodperson@rodperson.com>
 
 PORTNAME=	fotoxx
-PORTVERSION=	22.1
+PORTVERSION=	22.11
 CATEGORIES=	graphics
 MASTER_SITES=	https://kornelix.net/downloads/downloads/
 
diff --git a/graphics/fotoxx/distinfo b/graphics/fotoxx/distinfo
index 5710d3cf0a92..f3597a9884f1 100644
--- a/graphics/fotoxx/distinfo
+++ b/graphics/fotoxx/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1641036641
-SHA256 (fotoxx-22.1.tar.gz) = 8c69f8029ca971c51dad55461c14f9a6ec35550e1f71436ec25bdcc4365d575f
-SIZE (fotoxx-22.1.tar.gz) = 8801382
+TIMESTAMP = 1643309765
+SHA256 (fotoxx-22.11.tar.gz) = 755d2dada95e8ec7865254d7bfa8a712096df9072200a3660328daa310de2a2e
+SIZE (fotoxx-22.11.tar.gz) = 8836130
diff --git a/graphics/fotoxx/files/patch-Makefile b/graphics/fotoxx/files/patch-Makefile
index 52f516de635d..a296aa454920 100644
--- a/graphics/fotoxx/files/patch-Makefile
+++ b/graphics/fotoxx/files/patch-Makefile
@@ -1,4 +1,4 @@
---- Makefile.orig	2021-10-17 20:02:26 UTC
+--- Makefile.orig	2022-01-27 10:17:01 UTC
 +++ Makefile
 @@ -1,40 +1,12 @@
  #  fotoxx Makefile
@@ -7,6 +7,13 @@
 -#  export CXX=clang++      clang compiler
 -#  export DEBUG=x          debug build with address checking
  
+-
+-#  Try to included fixed champlain-tile.h but none of this works
+-#  CXXFLAGS += -D GTimeVal=GDateTime
+-#  MAKEDIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
+-#  CXXFLAGS += -I $(MAKEDIR)
+-
+-
 -ifeq ($(CXX), clang++)     #  CLANG
 -   ifdef DEBUG
 -      CXXFLAGS += -Wall -g -O0 -fsanitize=address -Wno-stringop-truncation
@@ -16,7 +23,8 @@
 -   endif
 -else                       #  GCC
 -   ifdef DEBUG
--      CXXFLAGS += -Wall -g -rdynamic -O0 -fsanitize=address -Wno-format-truncation -Wno-stringop-truncation
+-      CXXFLAGS += -Wall -g -rdynamic -O0 -fsanitize=address                      \
+-                           -Wno-format-truncation -Wno-stringop-truncation
 -      LDFLAGS += -fsanitize=address
 -   else
 -      CXXFLAGS += -Wall -g -rdynamic -O2 -Wno-format-truncation -Wno-stringop-truncation
@@ -25,21 +33,12 @@
 -
  PKG_CONFIG ?= pkg-config
  
- CFLAGS = $(CXXFLAGS) $(CPPFLAGS) -c                \
--   `$(PKG_CONFIG) --cflags gtk+-3.0`               \
--   -I/usr/include/clutter-1.0/                     \
--   -I/usr/include/clutter-gtk-1.0/                 \
--   -I/usr/include/champlain-gtk-0.12/              \
--   -I/usr/include/champlain-0.12/                  \
--   -I/usr/include/libchamplain-gtk-0.12/           \
--   -I/usr/include/libchamplain-0.12/               \
--   -I/usr/include/cogl/                            \
--   -I/usr/include/json-glib-1.0/                   \
-+   `$(PKG_CONFIG) pkgconf --cflags champlain-gtk-0.12`
+ CFLAGS = $(CXXFLAGS) $(CPPFLAGS) -c                                           \
+          `$(PKG_CONFIG) --cflags gtk+-3.0 --libs champlain-gtk-0.12`          \
  
  LIBS = `$(PKG_CONFIG) --libs gtk+-3.0`                                              \
 -         -lrt -lpthread -llcms2 -ltiff -lpng -ljpeg                                 \
-+         -lrt -lexecinfo -llcms2 -ltiff -lpng -ljpeg                                 \
++         -lrt -lexecinfo -llcms2 -ltiff -lpng -ljpeg                                \
           -lclutter-1.0 -lclutter-gtk-1.0 -lchamplain-0.12 -lchamplain-gtk-0.12
  
- ALLFILES = fotoxx.o f.widgets.o f.file.o f.gallery.o f.albums.o f.area.o f.meta.o            \
+ ALLFILES = fotoxx.o f.widgets.o f.file.o f.gallery.o f.albums.o f.area.o f.meta.o      \
diff --git a/graphics/fotoxx/pkg-descr b/graphics/fotoxx/pkg-descr
index 45753cbc7625..64154cf8e8ae 100644
--- a/graphics/fotoxx/pkg-descr
+++ b/graphics/fotoxx/pkg-descr
@@ -1,5 +1,5 @@
-Fotoxx is a free open source Linux program for photo editing
-and collection management. The goal is to meet most user needs
+Fotoxx is a free, open-source program for photo editing and
+collection management.  The goal is to meet most user needs
 while remaining fast and easy to use.
 
 WWW: http://www.kornelix.com/fotoxx.html