Hello ports,

Below the diff to update poedit from 1.3.7 to the latest 2.3.1.  While
there I've also updated the homepage to https and formatted the
pkg/DESCR so it fits in 80 columns :)

The MASTER_SITES also changed, as they've migrated to github, and the
patch is no longer needed.

Tested on amd64, I've used it to create a translation file using a
(small) POT.  It seems to work just fine.

It requires the new textproc/luceneplusplus that I've previously sent.

P.S. I'm not sure exactly how to manage this, but this port shouldn't be
in textproc rather than devel?


Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/poedit/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- Makefile    17 Jul 2019 14:49:21 -0000      1.31
+++ Makefile    25 Jun 2020 15:59:31 -0000
@@ -2,36 +2,35 @@

 COMMENT=       cross-platform gettext catalogs (PO-files) editor

-DISTNAME=      poedit-1.3.7
-REVISION=      14
+V=             2.3.1
+DISTNAME=      poedit-${V}
 CATEGORIES=    devel

-HOMEPAGE=      http://www.poedit.net/
+HOMEPAGE=      https://www.poedit.net/

-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=poedit/}
+MASTER_SITES=  https://github.com/vslavik/poedit/releases/download/v${V}-oss/

 # GPL
 PERMIT_PACKAGE=        Yes

 WANTLIB += c m pthread ${COMPILER_LIBCXX}
-WANTLIB += wx_baseu-3.0 wx_baseu_net-3.0 wx_baseu_xml-3.0 wx_gtk3u_adv-3.0
-WANTLIB += wx_gtk3u_core-3.0 wx_gtk3u_html-3.0 wx_gtk3u_qa-3.0
-WANTLIB += wx_gtk3u_xrc-3.0
+WANTLIB += atk-1.0 boost_regex-mt boost_system boost_thread-mt
+WANTLIB += cairo cairo-gobject enchant-2 gdk-3 gdk_pixbuf-2.0
+WANTLIB += gio-2.0 glib-2.0 gobject-2.0 gtk-3 gtkspell3-3 harfbuzz icudata
+WANTLIB += icui18n icuuc intl lucene++ pango-1.0 pangocairo-1.0
+WANTLIB += wx_gtk3u_stc-3.0 wx_baseu-3.0 wx_baseu_net-3.0
+WANTLIB += wx_baseu_xml-3.0 wx_gtk3u_adv-3.0 wx_gtk3u_core-3.0
+WANTLIB += wx_gtk3u_html-3.0 wx_gtk3u_xrc-3.0

-COMPILER =             base-clang ports-gcc base-gcc
+COMPILER=      base-clang ports-gcc base-gcc

 RUN_DEPENDS=   devel/desktop-file-utils \
+               devel/gettext,-tools \
                x11/gtk+3,-guic
-LIB_DEPENDS=   x11/wxWidgets>=2.6.3
+LIB_DEPENDS=   textproc/gtkspell3 \
+               textproc/luceneplusplus \
+               x11/wxWidgets>=2.6.3

 CONFIGURE_STYLE=gnu
-
-CONFIGURE_ARGS=        --disable-spellchecking
-
-LIB_DEPENDS += databases/db/v4
-WANTLIB +=     db>=4
-
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib/db4" \
-               CPPFLAGS="-I${LOCALBASE}/include/db4"

 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/poedit/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo    18 Jan 2015 03:13:40 -0000      1.4
+++ distinfo    25 Jun 2020 15:59:31 -0000
@@ -1,2 +1,2 @@
-SHA256 (poedit-1.3.7.tar.gz) = Zf0KMsahUtfVqtAnfZucszoGMv1ovK0JEwaXRGq2pZQ=
-SIZE (poedit-1.3.7.tar.gz) = 2167648
+SHA256 (poedit-2.3.1.tar.gz) = oDFcpSqQi56gpuQ46mDOHpLZjB9Hf+1Y0LTmF+Ua/sQ=
+SIZE (poedit-2.3.1.tar.gz) = 2891956
Index: patches/patch-src_prefsdlg_cpp
===================================================================
RCS file: patches/patch-src_prefsdlg_cpp
diff -N patches/patch-src_prefsdlg_cpp
--- patches/patch-src_prefsdlg_cpp      2 Jan 2019 12:44:06 -0000       1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_prefsdlg_cpp,v 1.1 2019/01/02 12:44:06 jca Exp $
-
-Index: src/prefsdlg.cpp
---- src/prefsdlg.cpp.orig
-+++ src/prefsdlg.cpp
-@@ -210,7 +210,7 @@ void PreferencesDialog::TransferFrom(wxConfigBase *cfg
-     cfg->Write(_T("custom_font_text_name"),
-                 XRCCTRL(*this, "fontname_text", wxTextCtrl)->GetValue());
-
--    static wxChar *formats[] =
-+    static wxString formats[] =
-         { _T("unix"), _T("win"), _T("mac"), _T("native") };
-     cfg->Write(_T("crlf_format"), formats[
-                 XRCCTRL(*this, "crlf_format", wxChoice)->GetSelection()]);
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/devel/poedit/pkg/DESCR,v
retrieving revision 1.1
diff -u -p -r1.1 DESCR
--- pkg/DESCR   25 Mar 2007 13:02:29 -0000      1.1
+++ pkg/DESCR   25 Jun 2020 15:59:31 -0000
@@ -1,2 +1,3 @@
-poEdit is GUI frontend to GNU Gettext utilities and catalogs editor/source 
code parser.
-It helps with translating application into another language.
+poEdit is GUI frontend to GNU Gettext utilities and catalogs
+editor/source code parser.  It helps with translating application into
+another language.
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/poedit/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- pkg/PLIST   29 Jun 2018 22:16:11 -0000      1.8
+++ pkg/PLIST   25 Jun 2020 15:59:31 -0000
@@ -1,104 +1,57 @@
-@comment $OpenBSD: PLIST,v 1.8 2018/06/29 22:16:11 espie Exp $
-bin/poedit
+@comment $OpenBSD: PLIST,v$
+@bin bin/poedit
 @man man/man1/poedit.1
-share/applications/poedit.desktop
-share/icons/
-share/icons/hicolor/
-share/icons/hicolor/16x16/
-share/icons/hicolor/16x16/apps/
-share/icons/hicolor/16x16/apps/poedit.png
-share/icons/hicolor/32x32/
-share/icons/hicolor/32x32/apps/
-share/icons/hicolor/32x32/apps/poedit.png
-share/icons/hicolor/48x48/
-share/icons/hicolor/48x48/apps/
-share/icons/hicolor/48x48/apps/poedit.png
-share/icons/hicolor/scalable/
-share/icons/hicolor/scalable/apps/
-share/icons/hicolor/scalable/apps/poedit.svg
-share/locale/af_ZA/
-share/locale/af_ZA/LC_MESSAGES/
-share/locale/af_ZA/LC_MESSAGES/poedit.mo
-share/locale/am/
-share/locale/am/LC_MESSAGES/
-share/locale/am/LC_MESSAGES/poedit.mo
-share/locale/ar/
-share/locale/ar/LC_MESSAGES/
+share/applications/net.poedit.Poedit.desktop
+share/applications/net.poedit.PoeditURI.desktop
+share/icons/hicolor/16x16/apps/net.poedit.Poedit.png
+share/icons/hicolor/24x24/apps/net.poedit.Poedit.png
+share/icons/hicolor/256x256/apps/net.poedit.Poedit.png
+share/icons/hicolor/32x32/apps/net.poedit.Poedit.png
+share/icons/hicolor/48x48/apps/net.poedit.Poedit.png
+share/icons/hicolor/512x512/apps/net.poedit.Poedit.png
+share/locale/af/LC_MESSAGES/poedit.mo
+share/locale/an/LC_MESSAGES/poedit.mo
 share/locale/ar/LC_MESSAGES/poedit.mo
-share/locale/ast/
-share/locale/ast/LC_MESSAGES/
-share/locale/ast/LC_MESSAGES/poedit.mo
+share/locale/az/LC_MESSAGES/poedit.mo
 share/locale/be/LC_MESSAGES/poedit.mo
 share/locale/bg/LC_MESSAGES/poedit.mo
-share/locale/bn/
-share/locale/bn/LC_MESSAGES/
-share/locale/bn/LC_MESSAGES/poedit.mo
-share/locale/br/
-share/locale/br/LC_MESSAGES/
-share/locale/br/LC_MESSAGES/poedit.mo
+share/locale/bs/LC_MESSAGES/poedit.mo
 share/locale/ca/LC_MESSAGES/poedit.mo
+share/locale/ckb/LC_MESSAGES/poedit.mo
+share/locale/co/
+share/locale/co/LC_MESSAGES/
+share/locale/co/LC_MESSAGES/poedit.mo
 share/locale/cs/LC_MESSAGES/poedit.mo
 share/locale/da/LC_MESSAGES/poedit.mo
 share/locale/de/LC_MESSAGES/poedit.mo
 share/locale/el/LC_MESSAGES/poedit.mo
-share/locale/eo/LC_MESSAGES/poedit.mo
+share/locale/en_GB/LC_MESSAGES/poedit.mo
 share/locale/es/LC_MESSAGES/poedit.mo
-share/locale/es_PR/
-share/locale/es_PR/LC_MESSAGES/
-share/locale/es_PR/LC_MESSAGES/poedit.mo
 share/locale/et/LC_MESSAGES/poedit.mo
-share/locale/eu/
-share/locale/eu/LC_MESSAGES/
 share/locale/eu/LC_MESSAGES/poedit.mo
-share/locale/fa_IR/
-share/locale/fa_IR/LC_MESSAGES/
-share/locale/fa_IR/LC_MESSAGES/poedit.mo
+share/locale/fa/LC_MESSAGES/poedit.mo
 share/locale/fi/LC_MESSAGES/poedit.mo
 share/locale/fr/LC_MESSAGES/poedit.mo
-share/locale/fur/
-share/locale/fur/LC_MESSAGES/
-share/locale/fur/LC_MESSAGES/poedit.mo
+share/locale/ga/LC_MESSAGES/poedit.mo
 share/locale/gl/LC_MESSAGES/poedit.mo
 share/locale/he/LC_MESSAGES/poedit.mo
-share/locale/hi/
-share/locale/hi/LC_MESSAGES/
-share/locale/hi/LC_MESSAGES/poedit.mo
 share/locale/hr/LC_MESSAGES/poedit.mo
 share/locale/hu/LC_MESSAGES/poedit.mo
+share/locale/hy/LC_MESSAGES/poedit.mo
 share/locale/id/LC_MESSAGES/poedit.mo
-share/locale/is/
-share/locale/is/LC_MESSAGES/
 share/locale/is/LC_MESSAGES/poedit.mo
 share/locale/it/LC_MESSAGES/poedit.mo
 share/locale/ja/LC_MESSAGES/poedit.mo
-share/locale/ka/
-share/locale/ka/LC_MESSAGES/
 share/locale/ka/LC_MESSAGES/poedit.mo
+share/locale/kab/LC_MESSAGES/poedit.mo
+share/locale/kk/LC_MESSAGES/poedit.mo
 share/locale/ko/LC_MESSAGES/poedit.mo
-share/locale/ku/
-share/locale/ku/LC_MESSAGES/
-share/locale/ku/LC_MESSAGES/poedit.mo
-share/locale/ky/
-share/locale/ky/LC_MESSAGES/
-share/locale/ky/LC_MESSAGES/poedit.mo
-share/locale/lt/
-share/locale/lt/LC_MESSAGES/
 share/locale/lt/LC_MESSAGES/poedit.mo
 share/locale/lv/LC_MESSAGES/poedit.mo
-share/locale/mk/
-share/locale/mk/LC_MESSAGES/
-share/locale/mk/LC_MESSAGES/poedit.mo
-share/locale/mn/
-share/locale/mn/LC_MESSAGES/
-share/locale/mn/LC_MESSAGES/poedit.mo
-share/locale/ms/
-share/locale/ms/LC_MESSAGES/
 share/locale/ms/LC_MESSAGES/poedit.mo
 share/locale/nb/LC_MESSAGES/poedit.mo
 share/locale/nl/LC_MESSAGES/poedit.mo
-share/locale/nn/LC_MESSAGES/poedit.mo
-share/locale/pa/
-share/locale/pa/LC_MESSAGES/
+share/locale/oc/LC_MESSAGES/poedit.mo
 share/locale/pa/LC_MESSAGES/poedit.mo
 share/locale/pl/LC_MESSAGES/poedit.mo
 share/locale/pt_BR/LC_MESSAGES/poedit.mo
@@ -109,102 +62,53 @@ share/locale/ro/LC_MESSAGES/poedit.mo
 share/locale/ru/LC_MESSAGES/poedit.mo
 share/locale/sk/LC_MESSAGES/poedit.mo
 share/locale/sl/LC_MESSAGES/poedit.mo
-share/locale/sq_AL/
-share/locale/sq_AL/LC_MESSAGES/
-share/locale/sq_AL/LC_MESSAGES/poedit.mo
+share/locale/sq/LC_MESSAGES/poedit.mo
 share/locale/sr/LC_MESSAGES/poedit.mo
 share/locale/sv/LC_MESSAGES/poedit.mo
-share/locale/ta/
-share/locale/ta/LC_MESSAGES/
-share/locale/ta/LC_MESSAGES/poedit.mo
-share/locale/th/
-share/locale/th/LC_MESSAGES/
+share/locale/tg/LC_MESSAGES/poedit.mo
 share/locale/th/LC_MESSAGES/poedit.mo
 share/locale/tr/LC_MESSAGES/poedit.mo
-share/locale/tt/
-share/locale/tt/LC_MESSAGES/
-share/locale/tt/LC_MESSAGES/poedit.mo
 share/locale/uk/LC_MESSAGES/poedit.mo
-share/locale/ur/
-share/locale/ur/LC_MESSAGES/
-share/locale/ur/LC_MESSAGES/poedit.mo
-share/locale/wa/
-share/locale/wa/LC_MESSAGES/
-share/locale/wa/LC_MESSAGES/poedit.mo
+share/locale/uz/LC_MESSAGES/poedit.mo
+share/locale/vi/LC_MESSAGES/poedit.mo
 share/locale/zh_CN/LC_MESSAGES/poedit.mo
 share/locale/zh_TW/LC_MESSAGES/poedit.mo
-share/pixmaps/
-share/pixmaps/poedit.png
+share/metainfo/
+share/metainfo/net.poedit.Poedit.appdata.xml
 share/poedit/
-share/poedit/help/
-share/poedit/help/common/
-share/poedit/help/common/comment.gif
-share/poedit/help/common/fileopen.gif
-share/poedit/help/common/filesave.gif
-share/poedit/help/common/fullscreen.gif
-share/poedit/help/common/fuzzy.gif
-share/poedit/help/common/poedit.css
-share/poedit/help/common/quotes.gif
-share/poedit/help/common/update.gif
-share/poedit/help/en/
-share/poedit/help/en/basics.html
-share/poedit/help/en/gettext/
-share/poedit/help/en/gettext/gettext.hhc
-share/poedit/help/en/gettext/gettext.hhp
-share/poedit/help/en/gettext/gettext_1.html
-share/poedit/help/en/gettext/gettext_10.html
-share/poedit/help/en/gettext/gettext_11.html
-share/poedit/help/en/gettext/gettext_12.html
-share/poedit/help/en/gettext/gettext_2.html
-share/poedit/help/en/gettext/gettext_3.html
-share/poedit/help/en/gettext/gettext_4.html
-share/poedit/help/en/gettext/gettext_5.html
-share/poedit/help/en/gettext/gettext_6.html
-share/poedit/help/en/gettext/gettext_7.html
-share/poedit/help/en/gettext/gettext_8.html
-share/poedit/help/en/gettext/gettext_9.html
-share/poedit/help/en/gettext/gettext_foot.html
-share/poedit/help/en/gettext/gettext_toc.html
-share/poedit/help/en/gettext/index.html
-share/poedit/help/en/index.html
-share/poedit/help/en/manager.html
-share/poedit/help/en/menu.html
-share/poedit/help/en/poedit.hhc
-share/poedit/help/en/poedit.hhp
-share/poedit/help/en/settings.html
-share/poedit/help/en/tm.html
-share/poedit/help/en/ui.html
-share/poedit/help/en/update.html
-share/poedit/help/hr/
-share/poedit/help/hr/basics.html
-share/poedit/help/hr/index.html
-share/poedit/help/hr/manager.html
-share/poedit/help/hr/menu.html
-share/poedit/help/hr/poedit.hhc
-share/poedit/help/hr/poedit.hhp
-share/poedit/help/hr/settings.html
-share/poedit/help/hr/tm.html
-share/poedit/help/hr/ui.html
-share/poedit/help/hr/update.html
 share/poedit/icons/
-share/poedit/icons/README
+share/poedit/icons/CrowdinLogoTemplate.png
+share/poedit/icons/DownvoteTemplate.png
+share/poedit/icons/ExtractorsGNUgettext.png
+share/poedit/icons/ItemBookmarkTemplate.png
+share/poedit/icons/ItemCommentTemplate.png
+share/poedit/icons/PoeditWelcome.png
+share/poedit/icons/StatusError.png
+share/poedit/icons/StatusErrorBlack.png
+share/poedit/icons/StatusWarning.png
+share/poedit/icons/StatusWarningBlack.png
+share/poedit/icons/SuggestionErrorTemplate.png
+share/poedit/icons/SuggestionPerfectMatch.png
+share/poedit/icons/SuggestionTMTemplate.png
 share/poedit/icons/document-new.png
 share/poedit/icons/document-open.png
 share/poedit/icons/document-properties.png
 share/poedit/icons/document-save.png
 share/poedit/icons/edit-delete.png
-share/poedit/icons/help-browser.png
-share/poedit/icons/poedit-comment.png
-share/poedit/icons/poedit-fuzzy.png
-share/poedit/icons/poedit-status-automatic.png
+share/poedit/icons/hicolor/
+share/poedit/icons/hicolor/scalable/
+share/poedit/icons/hicolor/scalable/actions/
+share/poedit/icons/hicolor/scalable/actions/poedit-sync-symbolic.svg
+share/poedit/icons/hicolor/scalable/actions/poedit-update-symbolic.svg
+share/poedit/icons/hicolor/scalable/actions/poedit-validate-symbolic.svg
+share/poedit/icons/hicolor/scalable/actions/sidebar-symbolic.svg
 share/poedit/icons/poedit-status-cat-mid.png
 share/poedit/icons/poedit-status-cat-no.png
 share/poedit/icons/poedit-status-cat-ok.png
-share/poedit/icons/poedit-status-comment-modif.png
-share/poedit/icons/poedit-status-comment.png
-share/poedit/icons/poedit-status-modified.png
-share/poedit/icons/poedit-status-nothing.png
+share/poedit/icons/poedit-sync.png
 share/poedit/icons/poedit-update.png
-share/poedit/icons/view-fullscreen.png
-@tag update-desktop-database
+share/poedit/icons/poedit-validate.png
+share/poedit/icons/sidebar.png
+share/poedit/icons/window-close.png
 @tag gtk-update-icon-cache %D/share/icons/hicolor
+@tag update-desktop-database

Reply via email to