poedit: update to 2.3.

Version 2.3
-------------

- Improved pre-translation performance.
- Added support for XLIFF 1.0.
- Improved handling of punctuation in QA checks.
- Improved macOS 10.15 Catalina compatiblity.

6 files changed, 62 insertions, 43 deletions

diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile
index 6fd4a920620..7e7e072e905 100644
--- a/editors/poedit/Makefile
+++ b/editors/poedit/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.88 2020/02/17 13:54:48 mef Exp $
+# $NetBSD: Makefile,v 1.89 2020/03/07 11:05:28 wiz Exp $
 
-VERSION=	2.2.3
+VERSION=	2.3
 DISTNAME=	poedit-${VERSION}
-PKGREVISION=	4
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_GITHUB:=vslavik/}
 GITHUB_TAG=	v${VERSION}-oss
@@ -12,10 +11,10 @@ HOMEPAGE=	http://www.poedit.net/
 COMMENT=	Cross-platform gettext catalogs (.po files) editor
 LICENSE=	mit
 
-WRKSRC=		${WRKDIR}/${DISTNAME}
+WRKSRC=			${WRKDIR}/${DISTNAME}-oss
 USE_LANGUAGES=		c c++
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake pkg-config zip:run
+USE_TOOLS+=		autoconf automake autoreconf gmake msgfmt pkg-config zip:run
 GNU_CONFIGURE=		yes
 
 CONFIGURE_ARGS+=	--with-boost=${BUILDLINK_PREFIX.boost-libs}
@@ -24,6 +23,12 @@ CXXFLAGS+=		-fpermissive
 BUILDLINK_TRANSFORM+=	rm:-Wall
 BUILDLINK_TRANSFORM+=	rm:-Wextra
 
+pre-configure:
+	cd ${WRKSRC} && autoreconf -fiv
+
+post-build:
+	cd ${WRKSRC}/locales && ${SETENV} ${MAKE_ENV} ${GMAKE} allmo
+
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../textproc/gtkspell3/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
@@ -31,5 +36,6 @@ BUILDLINK_TRANSFORM+=	rm:-Wextra
 .include "../../x11/wxGTK30/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../textproc/pugixml/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/poedit/distinfo b/editors/poedit/distinfo
index 43aa18cc3d0..2fa466d6037 100644
--- a/editors/poedit/distinfo
+++ b/editors/poedit/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.11 2019/05/21 17:44:46 wiz Exp $
+$NetBSD: distinfo,v 1.12 2020/03/07 11:05:28 wiz Exp $
 
-SHA1 (poedit-2.2.3.tar.gz) = 4675bb29b7b1f7e2eada68355273ee0d36bb19a6
-RMD160 (poedit-2.2.3.tar.gz) = 682c7ef9bde1c75e3cb5088a79066ce29febc73c
-SHA512 (poedit-2.2.3.tar.gz) = 566f397add593d0b05b995cbd1cff1b063b6eb49b02058511f13c27ed5887685816f8dd9280e1a6be2dd594049c6eecd73efc5cf7835475d3cb5a94fe38f280f
-Size (poedit-2.2.3.tar.gz) = 2834106 bytes
-SHA1 (patch-aa) = ec8d4d55bbfdd890c126e2f742fd83e3612170f2
-SHA1 (patch-src_welcomescreen.cpp) = bd8ef11e4b6bae515a3bbb241bacef1f779a410d
+SHA1 (poedit-2.3.tar.gz) = 971cd53ff0032cf636da02522b69647f59cedbd4
+RMD160 (poedit-2.3.tar.gz) = e8113cd16595816a6701789bc909fe5bbaea713f
+SHA512 (poedit-2.3.tar.gz) = 7c06c30f5b4e73b1e285ee31c4e48f212d2d6a33bb715bc249fb2546e832bb9658111b0546b9eff54ed4ad2942cbb48957b1c0bbbfea5a8b45d3c290e9ea2be5
+Size (poedit-2.3.tar.gz) = 132733031 bytes
+SHA1 (patch-deps_icu4c_source_configure) = bbff019d47c8113b48c0f377e19cf07277bc750f
+SHA1 (patch-deps_icu4c_source_configure.ac) = 94564cdf420f8ca12197f77c8b9fdd5ff0b27e66
diff --git a/editors/poedit/patches/patch-aa b/editors/poedit/patches/patch-aa
deleted file mode 100644
index 20d6611a0d3..00000000000
--- a/editors/poedit/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2019/05/21 17:44:46 wiz Exp $
-
-Fix unportable test(1) operator.
-https://github.com/vslavik/poedit/pull/575
-
---- configure.orig	2017-07-23 17:10:09.000000000 +0000
-+++ configure
-@@ -8787,7 +8787,7 @@ fi
- 
- 
- 
--if test "x$GXX" == "xyes"; then
-+if test "x$GXX" = "xyes"; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
- $as_echo_n "checking for a sed that does not truncate output... " >&6; }
- if ${ac_cv_path_SED+:} false; then :
diff --git a/editors/poedit/patches/patch-deps_icu4c_source_configure b/editors/poedit/patches/patch-deps_icu4c_source_configure
new file mode 100644
index 00000000000..e89b5249f30
--- /dev/null
+++ b/editors/poedit/patches/patch-deps_icu4c_source_configure
@@ -0,0 +1,22 @@
+$NetBSD: patch-deps_icu4c_source_configure,v 1.1 2020/03/07 11:05:28 wiz Exp $
+
+Fix unportable test(1) operator.
+
+--- deps/icu4c/source/configure.orig	2020-02-03 14:01:01.000000000 +0000
++++ deps/icu4c/source/configure
+@@ -7765,13 +7765,13 @@ fi
+ # Now that we're done using CPPFLAGS etc. for tests, we can change it
+ # for build.
+ 
+-if test "${CC}" == "clang"; then
++if test "${CC}" = "clang"; then
+    CLANGCFLAGS="-Qunused-arguments -Wno-parentheses-equality"
+ else
+    CLANGCFLAGS=""
+ fi
+ 
+-if test "${CXX}" == "clang++"; then
++if test "${CXX}" = "clang++"; then
+    CLANGCXXFLAGS="-Qunused-arguments -Wno-parentheses-equality"
+ else
+    CLANGCXXFLAGS=""
diff --git a/editors/poedit/patches/patch-deps_icu4c_source_configure.ac b/editors/poedit/patches/patch-deps_icu4c_source_configure.ac
new file mode 100644
index 00000000000..29e77f0a2bf
--- /dev/null
+++ b/editors/poedit/patches/patch-deps_icu4c_source_configure.ac
@@ -0,0 +1,22 @@
+$NetBSD: patch-deps_icu4c_source_configure.ac,v 1.1 2020/03/07 11:05:28 wiz Exp $
+
+Fix unportable test(1) operator.
+
+--- deps/icu4c/source/configure.ac.orig	2020-02-03 14:01:01.000000000 +0000
++++ deps/icu4c/source/configure.ac
+@@ -1287,13 +1287,13 @@ fi
+ # Now that we're done using CPPFLAGS etc. for tests, we can change it
+ # for build.
+ 
+-if test "${CC}" == "clang"; then
++if test "${CC}" = "clang"; then
+    CLANGCFLAGS="-Qunused-arguments -Wno-parentheses-equality"
+ else
+    CLANGCFLAGS=""
+ fi
+ 
+-if test "${CXX}" == "clang++"; then
++if test "${CXX}" = "clang++"; then
+    CLANGCXXFLAGS="-Qunused-arguments -Wno-parentheses-equality"
+ else
+    CLANGCXXFLAGS=""
diff --git a/editors/poedit/patches/patch-src_welcomescreen.cpp b/editors/poedit/patches/patch-src_welcomescreen.cpp
deleted file mode 100644
index ed0d6e8bf53..00000000000
--- a/editors/poedit/patches/patch-src_welcomescreen.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_welcomescreen.cpp,v 1.1 2019/05/21 17:44:46 wiz Exp $
-
-Add header for LearnMoreLink.
-https://github.com/vslavik/poedit/pull/576
-
---- src/welcomescreen.cpp.orig	2019-05-20 11:39:34.000000000 +0000
-+++ src/welcomescreen.cpp
-@@ -26,6 +26,7 @@
- #include "welcomescreen.h"
- 
- #include "colorscheme.h"
-+#include "customcontrols.h"
- #include "crowdin_gui.h"
- #include "edapp.h"
- #include "edframe.h"