devel/gettext: Update to 0.22

Convert post-patch commands to real patches.  This way there are errors
when the underlying code changes.

*/*: Fix gettext issues.  The new gettext tools are more strict.

PR:		272210
Exp-run by:	antoine

37 files changed, 302 insertions, 64 deletions

diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index 745b557daa01..08354df6f2dd 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -1,8 +1,12 @@
 PORTNAME=	audacity
 DISTVERSIONPREFIX=	Audacity-
 DISTVERSION=	3.3.3
+PORTREVISION=	1
 CATEGORIES=	audio
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	4c833569fb12.patch:-p1
+
 MAINTAINER=	xxjack12xx@gmail.com
 COMMENT=	GUI editor for digital audio waveforms
 WWW=		https://www.audacityteam.org/
@@ -165,4 +169,3 @@ post-install-DOCS-on:
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
-
diff --git a/audio/audacity/distinfo b/audio/audacity/distinfo
index c1063de5a435..e00fae0a9cd8 100644
--- a/audio/audacity/distinfo
+++ b/audio/audacity/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1686455314
+TIMESTAMP = 1688376242
 SHA256 (audacity-audacity-Audacity-3.3.3_GH0.tar.gz) = bf6863553bd2b822d3f236acb2de32527c93a968d114c6663920d2ebf61bf743
 SIZE (audacity-audacity-Audacity-3.3.3_GH0.tar.gz) = 57120215
+SHA256 (4c833569fb12.patch) = 587b8c504c978136ec473b430f1f0969aa75d0886c7e019106f4ebfb32b490b2
+SIZE (4c833569fb12.patch) = 9593
diff --git a/deskutils/gtimer/Makefile b/deskutils/gtimer/Makefile
index b9c1a6c88eba..68919609e4f2 100644
--- a/deskutils/gtimer/Makefile
+++ b/deskutils/gtimer/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gtimer
 PORTVERSION=	2.0.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	deskutils
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
 
diff --git a/deskutils/gtimer/files/patch-po_es.po b/deskutils/gtimer/files/patch-po_es.po
new file mode 100644
index 000000000000..9d162cc3c7fb
--- /dev/null
+++ b/deskutils/gtimer/files/patch-po_es.po
@@ -0,0 +1,11 @@
+--- po/es.po.orig	2010-03-26 23:07:46 UTC
++++ po/es.po
+@@ -2,7 +2,7 @@ msgstr ""

+ msgstr ""

+ "Date: 1999-03-18 17:50:49-0500\n"

+ "Last-Translator: Carlos Fernandez <c_fern@yahoo.com>\n"

+-"Content-Type: text/plain; charset=\n"

++"Content-Type: text/plain; charset=ISO-8859-1\n"

+ "Xgettext-Options: \n"

+ "Files: annotate.c config.c confirm.c edit.c main.c report.c task.c unhide.c xextras.c\n"

+ 

diff --git a/deskutils/gtimer/files/patch-po_fr.po b/deskutils/gtimer/files/patch-po_fr.po
new file mode 100644
index 000000000000..5eef81aaa56c
--- /dev/null
+++ b/deskutils/gtimer/files/patch-po_fr.po
@@ -0,0 +1,11 @@
+--- po/fr.po.orig	2010-03-26 23:07:46 UTC
++++ po/fr.po
+@@ -2,7 +2,7 @@ msgstr ""
+ msgstr ""
+ "Date: 1999-03-18 17:50:49-0500\n"
+ "From: Craig Knudsen <cknudsen@radix.net>\n"
+-"Content-Type: text/plain; charset=\n"
++"Content-Type: text/plain; charset=ISO-8859-1\n"
+ "Xgettext-Options: \n"
+ "Files: annotate.c config.c confirm.c edit.c main.c report.c task.c unhide.c xextras.c\n"
+ 
diff --git a/devel/efl/Makefile b/devel/efl/Makefile
index 08f83f386fe0..8725697d891b 100644
--- a/devel/efl/Makefile
+++ b/devel/efl/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	efl
 DISTVERSION=	1.26.3
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	devel enlightenment
 MASTER_SITES=	http://download.enlightenment.org/rel/libs/${PORTNAME}/
 DIST_SUBDIR=	enlightenment
diff --git a/devel/efl/files/patch-src_examples_edje_en__IN_domain__name.po b/devel/efl/files/patch-src_examples_edje_en__IN_domain__name.po
new file mode 100644
index 000000000000..50325d1ef8b9
--- /dev/null
+++ b/devel/efl/files/patch-src_examples_edje_en__IN_domain__name.po
@@ -0,0 +1,9 @@
+--- src/examples/edje/en_IN/domain_name.po.orig	2022-09-16 13:16:23 UTC
++++ src/examples/edje/en_IN/domain_name.po
+@@ -1,3 +1,6 @@
++msgid ""
++msgstr "Content-Type: text/plain; charset=UTF-8"
++
+ msgid "LOADING"
+ msgstr "Loading..."
+ 
diff --git a/devel/efl/files/patch-src_examples_edje_hi__IN_domain__name.po b/devel/efl/files/patch-src_examples_edje_hi__IN_domain__name.po
new file mode 100644
index 000000000000..509084dd05b4
--- /dev/null
+++ b/devel/efl/files/patch-src_examples_edje_hi__IN_domain__name.po
@@ -0,0 +1,9 @@
+--- src/examples/edje/hi_IN/domain_name.po.orig	2022-09-16 13:16:23 UTC
++++ src/examples/edje/hi_IN/domain_name.po
+@@ -1,3 +1,6 @@
++msgid ""
++msgstr "Content-Type: text/plain; charset=UTF-8"
++
+ msgid "LOADING"
+ msgstr "लोड हो रहा है..."
+ 
diff --git a/devel/gettext-runtime/files/patch-configure b/devel/gettext-runtime/files/patch-configure
index fab412b86976..e70ae06e4969 100644
--- a/devel/gettext-runtime/files/patch-configure
+++ b/devel/gettext-runtime/files/patch-configure
@@ -1,11 +1,11 @@
---- configure.orig	2022-10-09 21:31:34 UTC
+--- configure.orig	2023-06-17 11:53:59 UTC
 +++ configure
-@@ -22002,7 +22002,7 @@ then :
+@@ -27079,7 +27079,7 @@ then :
               # On Solaris 10 or newer, this test is no longer needed, because
               # libc contains the fully functional pthread functions.
               case "$host_os" in
--               solaris | solaris2.1-9 | solaris2.1-9.* | hpux*)
-+               solaris | solaris2.1-9 | solaris2.1-9.* | hpux* | freebsd*)
+-               solaris | solaris2.[1-9] | solaris2.[1-9].* | hpux*)
++               solaris | solaris2.[1-9] | solaris2.[1-9].* | hpux* | freebsd*)
  
  printf "%s\n" "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h
  
diff --git a/devel/gettext-runtime/files/patch-intl_Makefile.in b/devel/gettext-runtime/files/patch-intl_Makefile.in
new file mode 100644
index 000000000000..40647158d4fb
--- /dev/null
+++ b/devel/gettext-runtime/files/patch-intl_Makefile.in
@@ -0,0 +1,11 @@
+--- intl/Makefile.in.orig	2023-06-17 11:53:53 UTC
++++ intl/Makefile.in
+@@ -1692,7 +1692,7 @@ AM_CPPFLAGS = -Ignulib-lib -I$(srcdir)/gnulib-lib \
+ AM_CPPFLAGS = -Ignulib-lib -I$(srcdir)/gnulib-lib \
+ 	-DLOCALEDIR=$(localedir_c_make) \
+ 	-DLOCALE_ALIAS_PATH=\"$(aliaspath)\" -DLIBDIR=\"$(libdir)\" \
+-	-DBUILDING_LIBINTL $(am__append_1)
++	-DBUILDING_LIBINTL -DBUILDING_DLL $(am__append_1)
+ 
+ # Enable more warning options in this directory.
+ 
diff --git a/devel/gettext-runtime/files/patch-intl-threadlib.c b/devel/gettext-runtime/files/patch-intl_gnulib-lib_glthread_threadlib.c
index 8de65d9244f0..45b8beaf8f98 100644
--- a/devel/gettext-runtime/files/patch-intl-threadlib.c
+++ b/devel/gettext-runtime/files/patch-intl_gnulib-lib_glthread_threadlib.c
@@ -1,8 +1,8 @@
---- intl/threadlib.c.orig	2013-03-07 08:44:37 UTC
-+++ intl/threadlib.c
-@@ -29,11 +29,10 @@
+--- intl/gnulib-lib/glthread/threadlib.c.orig	2023-02-03 13:19:38 UTC
++++ intl/gnulib-lib/glthread/threadlib.c
+@@ -62,11 +62,10 @@ glthread_in_use (void)
  
- # if PTHREAD_IN_USE_DETECTION_HARD
+ /* Test using pthread_create.  */
  
 -/* The function to be executed by a dummy thread.  */
 -static void *
@@ -15,7 +15,7 @@
  }
  
  int
-@@ -44,19 +43,10 @@ glthread_in_use (void)
+@@ -77,19 +76,10 @@ glthread_in_use (void)
  
    if (!tested)
      {
diff --git a/devel/gettext-runtime/pkg-plist b/devel/gettext-runtime/pkg-plist
index 18baf1d96239..454c0413eaf8 100644
--- a/devel/gettext-runtime/pkg-plist
+++ b/devel/gettext-runtime/pkg-plist
@@ -76,6 +76,7 @@ share/locale/hu/LC_MESSAGES/gettext-runtime.mo
 share/locale/id/LC_MESSAGES/gettext-runtime.mo
 share/locale/it/LC_MESSAGES/gettext-runtime.mo
 share/locale/ja/LC_MESSAGES/gettext-runtime.mo
+share/locale/ka/LC_MESSAGES/gettext-runtime.mo
 share/locale/ko/LC_MESSAGES/gettext-runtime.mo
 share/locale/locale.alias
 share/locale/nb/LC_MESSAGES/gettext-runtime.mo
diff --git a/devel/gettext-tools/Makefile b/devel/gettext-tools/Makefile
index 4cb854f6ba66..45be53664d64 100644
--- a/devel/gettext-tools/Makefile
+++ b/devel/gettext-tools/Makefile
@@ -25,7 +25,8 @@ CPE_VENDOR=	gnu
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-csharp --disable-java --with-included-glib \
 		--with-included-libcroco --with-included-libunistring \
-		--with-included-libxml --with-xz --without-emacs \
+		--with-included-libxml --with-installed-libtextstyle \
+		--with-xz --without-emacs \
 		ac_cv_lib_rt_sched_yield=no
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
@@ -43,20 +44,4 @@ OPTIONS_EXCLUDE_DragonFly=	THREADS
 
 THREADS_CONFIGURE_ENABLE=	threads
 
-post-patch:
-# Do not patch system float.h.
-	@${REINPLACE_CMD} 's/FLOAT_H=float\.h//' \
-		${WRKSRC}/configure
-# Use libintl installed by gettext-runtime.
-	@${REINPLACE_CMD} '/^LDADD_no =/s,\.\./intl/libgnuintl.la,,' \
-		${WRKSRC}/tests/Makefile.in
-# Use libasprintf installed by gettext-runtime.
-	@${REINPLACE_CMD} 's,[^ ]*libasprintf.la,-lasprintf,' \
-		${WRKSRC}/tests/lang-c++
-# Use system libtextstyle.
-	@${REINPLACE_CMD} \
-		-e '/:/!s,[[:<:]]textstyle[^[:space:]]*\.h,,g' \
-		-e 's,\.\./\.\./libtextstyle/lib/libtextstyle\.la,-ltextstyle,' \
-		${WRKSRC}/src/Makefile.in
-
 .include <bsd.port.mk>
diff --git a/devel/gettext-tools/files/patch-configure b/devel/gettext-tools/files/patch-configure
index b519ba5fea97..aa7ea1955a41 100644
--- a/devel/gettext-tools/files/patch-configure
+++ b/devel/gettext-tools/files/patch-configure
@@ -1,20 +1,19 @@
---- configure.orig	2022-10-09 21:32:05 UTC
+--- configure.orig	2023-06-17 11:54:38 UTC
 +++ configure
-@@ -24756,7 +24756,7 @@ then :
+@@ -26130,7 +26130,6 @@ printf "%s\n" "$ac_res" >&6; }
+                                         if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
+            || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
+                 && test "$PACKAGE" != gettext-runtime \
+-                && test "$PACKAGE" != gettext-tools \
+                 && test "$PACKAGE" != libintl; }; then
+           gt_use_preinstalled_gnugettext=yes
+         else
+@@ -35320,7 +35319,7 @@ then :
               # On Solaris 10 or newer, this test is no longer needed, because
               # libc contains the fully functional pthread functions.
               case "$host_os" in
--               solaris | solaris2.1-9 | solaris2.1-9.* | hpux*)
-+               solaris | solaris2.1-9 | solaris2.1-9.* | hpux* | freebsd*)
+-               solaris | solaris2.[1-9] | solaris2.[1-9].* | hpux*)
++               solaris | solaris2.[1-9] | solaris2.[1-9].* | hpux* | freebsd*)
  
  printf "%s\n" "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h
  
-@@ -29661,7 +29661,7 @@ printf "%s\n" "$ac_res" >&6; }
-                                         if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
-            || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
-                 && test "$PACKAGE" != gettext-runtime \
--                && test "$PACKAGE" != gettext-tools; }; then
-+                ; }; then
-           gt_use_preinstalled_gnugettext=yes
-         else
-                     LIBINTL=
diff --git a/devel/gettext-tools/files/patch-src_Makefile.in b/devel/gettext-tools/files/patch-src_Makefile.in
new file mode 100644
index 000000000000..6ac2f71193b4
--- /dev/null
+++ b/devel/gettext-tools/files/patch-src_Makefile.in
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig	2023-06-17 11:54:44 UTC
++++ src/Makefile.in
+@@ -696,7 +696,7 @@ am_msginit_OBJECTS = msginit-msginit.$(OBJEXT) \
+ msggrep_OBJECTS = $(am_msggrep_OBJECTS)
+ am_msginit_OBJECTS = msginit-msginit.$(OBJEXT) \
+ 	msginit-lang-table.$(OBJEXT) msginit-plural-count.$(OBJEXT) \
+-	../../gettext-runtime/intl/msginit-localealias.$(OBJEXT)
++
+ msginit_OBJECTS = $(am_msginit_OBJECTS)
+ msginit_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
diff --git a/devel/gettext-tools/files/patch-tests_Makefile.in b/devel/gettext-tools/files/patch-tests_Makefile.in
new file mode 100644
index 000000000000..11bd831120cf
--- /dev/null
+++ b/devel/gettext-tools/files/patch-tests_Makefile.in
@@ -0,0 +1,11 @@
+--- tests/Makefile.in.orig	2023-06-25 16:45:40 UTC
++++ tests/Makefile.in
+@@ -3788,7 +3788,7 @@ LDADD_yes = ../../gettext-runtime/intl/libintl.la @LTL
+ # but libtool doesn't put -Wl,-framework options into .la files.
+ LDADD = $(LDADD_@USE_INCLUDED_LIBINTL@) @INTL_MACOSX_LIBS@
+ LDADD_yes = ../../gettext-runtime/intl/libintl.la @LTLIBTHREAD@
+-LDADD_no = ../../gettext-runtime/intl/libgnuintl.la @LTLIBTHREAD@ @LTLIBINTL@
++LDADD_no = @LTLIBTHREAD@ @LTLIBINTL@
+ tstgettext_SOURCES = \
+   tstgettext.c ../../gettext-runtime/src/escapes.h \
+   setlocale.c
diff --git a/devel/gettext-tools/files/patch-tests_lang-c++ b/devel/gettext-tools/files/patch-tests_lang-c++
new file mode 100644
index 000000000000..887a24e088f8
--- /dev/null
+++ b/devel/gettext-tools/files/patch-tests_lang-c++
@@ -0,0 +1,11 @@
+--- tests/lang-c++.orig	2023-06-08 12:56:56 UTC
++++ tests/lang-c++
+@@ -72,7 +72,7 @@ ${CONFIG_SHELL} "$top_builddir"/libtool --quiet --tag=
+ : ${CONFIG_SHELL=${SHELL-/bin/sh}}
+ ${CONFIG_SHELL} "$top_builddir"/libtool --quiet --tag=CXX --mode=link \
+   ${CXX} ${CXXFLAGS} `echo "X ${LDFLAGS} " | sed -e 's/^X//' -e 's/ -Wl,--disable-auto-import / /'` -o prog prog.${OBJEXT} \
+-         ../../../gettext-runtime/libasprintf/libasprintf.la \
++         -lasprintf \
+          ../../gnulib-lib/libgettextlib.la ${LTLIBINTL} \
+   || Exit 1
+ 
diff --git a/devel/gettext-tools/pkg-plist b/devel/gettext-tools/pkg-plist
index c269acaa82ec..c0dd1f341684 100644
--- a/devel/gettext-tools/pkg-plist
+++ b/devel/gettext-tools/pkg-plist
@@ -27,7 +27,7 @@ lib/libgettextlib.so
 lib/libgettextpo.a
 lib/libgettextpo.so
 lib/libgettextpo.so.0
-lib/libgettextpo.so.0.5.8
+lib/libgettextpo.so.0.5.9
 lib/libgettextsrc-%%PORTVERSION%%.so
 lib/libgettextsrc.so
 man/man1/autopoint.1.gz
@@ -48,6 +48,7 @@ man/man1/msgunfmt.1.gz
 man/man1/msguniq.1.gz
 man/man1/recode-sr-latin.1.gz
 man/man1/xgettext.1.gz
+share/aclocal/build-to-host.m4
 share/aclocal/gettext.m4
 share/aclocal/host-cpu-c-abi.m4
 share/aclocal/iconv.m4
@@ -373,6 +374,60 @@ share/aclocal/progtest.m4
 %%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++/po/zh_CN.po
 %%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++/po/zh_HK.po
 %%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++/po/zh_TW.po
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/INSTALL
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/Makefile.am
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/autoclean.sh
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/autogen.sh
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/configure.ac
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/hello.cc
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/m4/Makefile.am
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/LINGUAS
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/Makevars
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/POTFILES.in
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/af.po
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/ast.po
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/bg.po
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/ca.po
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/cs.po
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/da.po
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/de.po
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/el.po
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/eo.po
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/es.po
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/fi.po
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/fr.po
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/ga.po
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/gl.po
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/hr.po
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/hu.po
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/id.po
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/it.po
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/ja.po
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/ka.po
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/ky.po
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/lv.po
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/ms.po
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/mt.po
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/nb.po
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/nl.po
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/nn.po
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/pl.po
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/pt.po
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/pt_BR.po
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/ro.po
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/ru.po
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/sk.po
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/sl.po
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/sq.po
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/sr.po
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/sv.po
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/ta.po
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/tr.po
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/uk.po
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/vi.po
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/zh_CN.po
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/zh_HK.po
+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/zh_TW.po
 %%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c-gnome/INSTALL
 %%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c-gnome/Makefile.am
 %%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c-gnome/autoclean.sh
@@ -1837,6 +1892,7 @@ share/locale/eu/LC_MESSAGES/gettext-tools.mo
 share/locale/fi/LC_MESSAGES/gettext-tools.mo
 share/locale/fr/LC_MESSAGES/gettext-tools.mo
 share/locale/gl/LC_MESSAGES/gettext-tools.mo
+share/locale/hr/LC_MESSAGES/gettext-tools.mo
 share/locale/id/LC_MESSAGES/gettext-tools.mo
 share/locale/it/LC_MESSAGES/gettext-tools.mo
 share/locale/ja/LC_MESSAGES/gettext-tools.mo
diff --git a/devel/gettext/Makefile.common b/devel/gettext/Makefile.common
index 7e3156c3f060..08cfb9debd9e 100644
--- a/devel/gettext/Makefile.common
+++ b/devel/gettext/Makefile.common
@@ -2,7 +2,7 @@
 # experimental ports run.  Untested commits may be backed out at portmgr's
 # discretion.
 
-PORTVERSION=	0.21.1
+DISTVERSION=	0.22
 PORTREVISION?=	0 # Leave this zero. Set in Makefile instead.
 CATEGORIES=	devel
 MASTER_SITES=	GNU/gettext
diff --git a/devel/gettext/distinfo b/devel/gettext/distinfo
index 6b3256f053d2..0f8a14092eeb 100644
--- a/devel/gettext/distinfo
+++ b/devel/gettext/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1669052475
-SHA256 (gettext-0.21.1.tar.xz) = 50dbc8f39797950aa2c98e939947c527e5ac9ebd2c1b99dd7b06ba33a6767ae6
-SIZE (gettext-0.21.1.tar.xz) = 10054564
+TIMESTAMP = 1687532203
+SHA256 (gettext-0.22.tar.xz) = 0e60393a47061567b46875b249b7d2788b092d6457d656145bb0e7e6a3e26d93
+SIZE (gettext-0.22.tar.xz) = 10008808
diff --git a/devel/libtextstyle/pkg-plist b/devel/libtextstyle/pkg-plist
index 287652c8823e..1a64a38215c6 100644
--- a/devel/libtextstyle/pkg-plist
+++ b/devel/libtextstyle/pkg-plist
@@ -5,7 +5,7 @@ include/textstyle/woe32dll.h
 lib/libtextstyle.a
 lib/libtextstyle.so
 lib/libtextstyle.so.0
-lib/libtextstyle.so.0.1.2
+lib/libtextstyle.so.0.2.0
 %%PORTDOCS%%%%DOCSDIR%%/libtextstyle_1.html
 %%PORTDOCS%%%%DOCSDIR%%/libtextstyle_2.html
 %%PORTDOCS%%%%DOCSDIR%%/libtextstyle_3.html
diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile
index 31e8020950af..7fb934c4f629 100644
--- a/ftp/proftpd/Makefile
+++ b/ftp/proftpd/Makefile
@@ -2,7 +2,7 @@ PORTNAME?=	proftpd
 .if !defined(DISTVERSION)
 PORTVERSION?=	${PROFTPD_VERSION}
 .endif
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	ftp
 MASTER_SITES=	ftp://ftp.proftpd.org/distrib/source/ \
 		https://github.com/downloads/proftpd/proftpd.github.com/ \
diff --git a/ftp/proftpd/files/patch-locale_en__US.po b/ftp/proftpd/files/patch-locale_en__US.po
new file mode 100644
index 000000000000..4397cef8eeea
--- /dev/null
+++ b/ftp/proftpd/files/patch-locale_en__US.po
@@ -0,0 +1,11 @@
+--- locale/en_US.po.orig	2022-12-04 18:43:17 UTC
++++ locale/en_US.po
+@@ -14,7 +14,7 @@ msgstr ""
+ "Language-Team: LANGUAGE <LL@li.org>\n"
+ "Language: \n"
+ "MIME-Version: 1.0\n"
+-"Content-Type: text/plain; charset=CHARSET\n"
++"Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+ 
+ #: ../contrib/mod_auth_otp/mod_auth_otp.c:799
diff --git a/games/tornado/Makefile b/games/tornado/Makefile
index ab6be86e2772..f5e4c954afd4 100644
--- a/games/tornado/Makefile
+++ b/games/tornado/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	tornado
 PORTVERSION=	1.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	https://kiza.eu/media/software/tornado/
 
diff --git a/games/tornado/files/patch-po_no.po b/games/tornado/files/patch-po_no.po
new file mode 100644
index 000000000000..f70abbb935d7
--- /dev/null
+++ b/games/tornado/files/patch-po_no.po
@@ -0,0 +1,11 @@
+--- po/no.po.orig	2009-03-06 06:49:55 UTC
++++ po/no.po
+@@ -13,7 +13,7 @@ msgstr ""
+ "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+ "Language-Team: LANGUAGE <LL@li.org>\n"
+ "MIME-Version: 1.0\n"
+-"Content-Type: text/plain; charset=CHARSET\n"
++"Content-Type: text/plain; charset=ISO-8859-1\n"
+ "Content-Transfer-Encoding: 8bit\n"
+ 
+ #: draw.c:100
diff --git a/games/tornado/files/patch-po_pt.po b/games/tornado/files/patch-po_pt.po
new file mode 100644
index 000000000000..2abda6d3e30a
--- /dev/null
+++ b/games/tornado/files/patch-po_pt.po
@@ -0,0 +1,11 @@
+--- po/pt.po.orig	2009-03-06 06:49:55 UTC
++++ po/pt.po
+@@ -13,7 +13,7 @@ msgstr ""
+ "Last-Translator: Tiago Baptista <Aeroplane@gmx.net>\n"
+ "Language-Team: LANGUAGE <LL@li.org>\n"
+ "MIME-Version: 1.0\n"
+-"Content-Type: text/plain; charset=CHARSET\n"
++"Content-Type: text/plain; charset=ISO-8859-1\n"
+ "Content-Transfer-Encoding: 8bit\n"
+ 
+ #: draw.c:100
diff --git a/graphics/tgif/Makefile b/graphics/tgif/Makefile
index 3ba43524ed59..39be18b60ab8 100644
--- a/graphics/tgif/Makefile
+++ b/graphics/tgif/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	tgif
 PORTVERSION=	4.2.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://bourbon.usc.edu/pub/tgif/ \
 		http://groups.yahoo.com/group/tgif4-announce/files/ \
diff --git a/graphics/tgif/files/patch-po_fr_fr.po b/graphics/tgif/files/patch-po_fr_fr.po
new file mode 100644
index 000000000000..86b9a871dfa2
--- /dev/null
+++ b/graphics/tgif/files/patch-po_fr_fr.po
@@ -0,0 +1,11 @@
+--- po/fr/fr.po.orig	2004-06-18 23:12:02 UTC
++++ po/fr/fr.po
+@@ -10,7 +10,7 @@ msgstr ""


+ "Last-Translator: Roland Baudin <roland.baudin@cnet.francetelecom.fr>\n"


+ "Language-Team: Français"


+ "MIME-Version: 1.0\n"


+-"Content-Type: text/plain; charset= koi8-r\n"


++"Content-Type: text/plain; charset=ISO-8859-1\n"


+ "Content-Transfer-Encoding: 8-bit\n"


+ 


+ msgid "Flip/Rotate"


diff --git a/graphics/tgif/files/patch-po_ja_ja.po b/graphics/tgif/files/patch-po_ja_ja.po
new file mode 100644
index 000000000000..362adb5e55e4
--- /dev/null
+++ b/graphics/tgif/files/patch-po_ja_ja.po
@@ -0,0 +1,11 @@
+--- po/ja/ja.po.orig	2008-03-28 22:16:46 UTC
++++ po/ja/ja.po
+@@ -11,7 +11,7 @@ msgstr ""
+ "Last-Translator: Jun Nishii <jun@vinelinux.org>\n"
+ "Language-Team: Project Vine <Vine@vinelinux.org>\n"
+ "MIME-Version: 1.0\n"
+-"Content-Type: text/plain; charset=JISX-0208-1983-0\n"
++"Content-Type: text/plain; charset=EUC-JP\n"
+ "Content-Transfer-Encoding: 8-bit\n"
+ 
+ #: ../../menuinfo.c:72
diff --git a/multimedia/motion/Makefile b/multimedia/motion/Makefile
index 7b34fa417502..ee336ece13d7 100644
--- a/multimedia/motion/Makefile
+++ b/multimedia/motion/Makefile
@@ -1,7 +1,7 @@
 # PORTNAME block
 PORTNAME=	motion
 PORTVERSION=	4.3.2
-PORTREVISION=	5
+PORTREVISION=	6
 DISTVERSIONPREFIX=	release-
 CATEGORIES=	multimedia
 
diff --git a/multimedia/motion/files/patch-po_de.po b/multimedia/motion/files/patch-po_de.po
new file mode 100644
index 000000000000..c37dd7b9b01c
--- /dev/null
+++ b/multimedia/motion/files/patch-po_de.po
@@ -0,0 +1,11 @@
+--- po/de.po.orig	2020-10-25 20:53:44 UTC
++++ po/de.po
+@@ -1920,7 +1920,7 @@ msgid "Could not allocate %llu bytes of memory!"
+ #: src/motion.c
+ #, c-format
+ msgid "Could not allocate %llu bytes of memory!"
+-msgstr "%Llu Bytes Speicher konnten nicht zugeordnet werden!"
++msgstr "%llu Bytes Speicher konnten nicht zugeordnet werden!"
+ 
+ #: src/motion.c
+ #, c-format
diff --git a/multimedia/motion/files/patch-po_fi.po b/multimedia/motion/files/patch-po_fi.po
new file mode 100644
index 000000000000..952e2d54f245
--- /dev/null
+++ b/multimedia/motion/files/patch-po_fi.po
@@ -0,0 +1,11 @@
+--- po/fi.po.orig	2020-10-25 20:53:44 UTC
++++ po/fi.po
+@@ -1907,7 +1907,7 @@ msgid "Could not allocate %llu bytes of memory!"
+ #: src/motion.c
+ #, c-format
+ msgid "Could not allocate %llu bytes of memory!"
+-msgstr "%Llu-tavua muistia ei voitu varata!"
++msgstr "%llu-tavua muistia ei voitu varata!"
+ 
+ #: src/motion.c
+ #, c-format
diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile
index bec017a5bb10..e82903ed460e 100644
--- a/print/fontforge/Makefile
+++ b/print/fontforge/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	fontforge
 DISTVERSION=	20220308
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${DISTVERSION}/
 
@@ -97,14 +97,6 @@ X11_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 X11_RUN_DEPENDS=	${LOCALBASE}/share/fonts/gnu-unifont/unifont.pcf.gz:x11-fonts/gnu-unifont
 X11_CMAKE_BOOL=	ENABLE_X11
 
-post-patch-FREETYPE-on:
-	@${LN} -s $$(${MAKE} -C ${PORTSDIR}/print/freetype2 -V WRKSRC) \
-		${WRKSRC}/freetype
-
-post-stage-DOCS-on:
-	@${RM} ${STAGEDIR}${DOCSDIR}/.buildinfo \
-		${STAGEDIR}${DOCSDIR}/.nojekyll
-
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGTK3} || ${PORT_OPTIONS:MX11}
@@ -113,4 +105,21 @@ CMAKE_ARGS+=	-DENABLE_GUI:BOOL=true
 CMAKE_ARGS+=	-DENABLE_GUI:BOOL=false
 .endif
 
+post-patch:
+# https://github.com/fontforge/fontforge/issues/5251
+	@${REINPLACE_CMD} 's/\(%[^%[:space:]]*\)hs/\1s/g' \
+		${WRKSRC}/fontforgeexe/searchview.c \
+		${WRKSRC}/po/de.po ${WRKSRC}/po/ca.po ${WRKSRC}/po/hr.po \
+		${WRKSRC}/po/it.po ${WRKSRC}/po/pl.po ${WRKSRC}/po/uk.po \
+		${WRKSRC}/po/en_GB.po ${WRKSRC}/po/fr.po ${WRKSRC}/po/vi.po \
+		${WRKSRC}/po/ko.po ${WRKSRC}/po/ja.po
+
+post-patch-FREETYPE-on:
+	@${LN} -s $$(${MAKE} -C ${PORTSDIR}/print/freetype2 -V WRKSRC) \
+		${WRKSRC}/freetype
+
+post-stage-DOCS-on:
+	@${RM} ${STAGEDIR}${DOCSDIR}/.buildinfo \
+		${STAGEDIR}${DOCSDIR}/.nojekyll
+
 .include <bsd.port.mk>
diff --git a/sysutils/xfsprogs/Makefile b/sysutils/xfsprogs/Makefile
index 1bf61df83144..6a9d97c3cbde 100644
--- a/sysutils/xfsprogs/Makefile
+++ b/sysutils/xfsprogs/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xfsprogs
 PORTVERSION=	3.2.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://oss.sgi.com/projects/xfs/cmd_tars/ \
 		ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/
diff --git a/sysutils/xfsprogs/files/patch-po_de.po b/sysutils/xfsprogs/files/patch-po_de.po
new file mode 100644
index 000000000000..bf9faedd7eda
--- /dev/null
+++ b/sysutils/xfsprogs/files/patch-po_de.po
@@ -0,0 +1,11 @@
+--- po/de.po.orig	2015-07-24 04:28:04 UTC
++++ po/de.po
+@@ -3084,7 +3084,7 @@ msgid "%s will take about %.1f megabytes\n"
+ #: .././estimate/xfs_estimate.c:191
+ #, c-format
+ msgid "%s will take about %.1f megabytes\n"
+-msgstr "%s wird etwa %.lf Megabytes einnehmen\n"
++msgstr "%s wird etwa %.1f Megabytes einnehmen\n"
+ 
+ #: .././estimate/xfs_estimate.c:198
+ #, c-format
diff --git a/x11/mate-panel/Makefile b/x11/mate-panel/Makefile
index 2f211a9b141d..fdfa7da377a1 100644
--- a/x11/mate-panel/Makefile
+++ b/x11/mate-panel/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	mate-panel
 PORTVERSION=	1.26.2
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	x11 mate
 MASTER_SITES=	MATE
diff --git a/x11/mate-panel/files/patch-libmate-panel-applet_Makefile.in b/x11/mate-panel/files/patch-libmate-panel-applet_Makefile.in
new file mode 100644
index 000000000000..a5e10f85d821
--- /dev/null
+++ b/x11/mate-panel/files/patch-libmate-panel-applet_Makefile.in
@@ -0,0 +1,11 @@
+--- libmate-panel-applet/Makefile.in.orig	2023-06-30 15:20:38 UTC
++++ libmate-panel-applet/Makefile.in
+@@ -1030,7 +1030,7 @@ $(noinst_DATA): $(applet_in_files)
+ 			--eprod "GType @enum_name@_get_type (void);\n" \
+ 		$(mate_panel_applet_enum_headers) > $@
+ $(noinst_DATA): $(applet_in_files)
+-	$(AM_V_GEN) $(MSGFMT) --desktop --keyword Name --keyword Description --template $< -d $(top_srcdir)/po -o $@
++	$(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
+ 
+ ###############################
+ # Introspection generation