Hi ports --
Attached is a diff to update editors/focuswriter to its latest version.
There is some WANTLIB churn here. I'm less sure if gettext can really be
removed, so a glance at that would be appreciated.
Take maintainer.
~Brian
Index: Makefile
===================================================================
RCS file: /cvs/ports/editors/focuswriter/Makefile,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 Makefile
--- Makefile 12 Apr 2017 18:12:33 -0000 1.12
+++ Makefile 9 Jun 2017 19:05:36 -0000
@@ -2,27 +2,29 @@
COMMENT = simple, distraction-free writing environment
-DISTNAME = focuswriter-1.5.5-src
+DISTNAME = focuswriter-1.6.5-src
PKGNAME = ${DISTNAME:S/-src//}
CATEGORIES = editors
EXTRACT_SUFX = .tar.bz2
WRKDIST = ${WRKDIR}/${DISTNAME:S/-src//}
-REVISION = 0
-HOMEPAGE = http://gottcode.org/focuswriter/
+HOMEPAGE = https://gottcode.org/focuswriter/
MASTER_SITES = ${HOMEPAGE}
+MAINTAINER = Brian Callahan <[email protected]>
# GPLv3
PERMIT_PACKAGE_CDROM = Yes
-MODULES += devel/gettext \
- devel/qmake \
- x11/qt4
+WANTLIB += GL Qt5Concurrent Qt5Core Qt5Gui Qt5Multimedia Qt5Network
+WANTLIB += Qt5PrintSupport Qt5Widgets c hunspell-1.6 m pthread
+WANTLIB += z ${LIBCXX}
+
+MODULES += devel/qmake \
+ x11/qt5
RUN_DEPENDS += devel/desktop-file-utils \
x11/gtk+3,-guic
-LIB_DEPENDS += textproc/hunspell
-WANTLIB += ICE SM X11 Xext Xi Xinerama Xrender fontconfig freetype
-WANTLIB += QtNetwork z QtGui c m pthread ${LIBCXX} hunspell-1.6
+LIB_DEPENDS += textproc/hunspell \
+ x11/qt5/qtmultimedia
NO_TEST = Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/editors/focuswriter/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- distinfo 19 Sep 2015 10:56:11 -0000 1.5
+++ distinfo 9 Jun 2017 19:05:36 -0000
@@ -1,2 +1,2 @@
-SHA256 (focuswriter-1.5.5-src.tar.bz2) = tqIIVYeGSyaFUW0ghw2TdYA8zfNHLma/RXOC0CjB2g4=
-SIZE (focuswriter-1.5.5-src.tar.bz2) = 5249014
+SHA256 (focuswriter-1.6.5-src.tar.bz2) = SOlJmGplvFH0bxDAdd4pBLLh/rDhx0wKjv6ZzYwt4M4=
+SIZE (focuswriter-1.6.5-src.tar.bz2) = 10194695
Index: patches/patch-src_fileformats_rtf_writer_cpp
===================================================================
RCS file: /cvs/ports/editors/focuswriter/patches/patch-src_fileformats_rtf_writer_cpp,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_fileformats_rtf_writer_cpp
--- patches/patch-src_fileformats_rtf_writer_cpp 2 May 2017 18:04:58 -0000 1.1
+++ patches/patch-src_fileformats_rtf_writer_cpp 9 Jun 2017 19:05:36 -0000
@@ -3,8 +3,8 @@ $OpenBSD: patch-src_fileformats_rtf_writ
Index: src/fileformats/rtf_writer.cpp
--- src/fileformats/rtf_writer.cpp.orig
+++ src/fileformats/rtf_writer.cpp
-@@ -30,6 +30,7 @@
- #include <windows.h>
+@@ -32,6 +32,7 @@
+ #include <clocale>
#endif
+#include <locale.h>
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/editors/focuswriter/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 PLIST
--- pkg/PLIST 27 Jun 2015 13:37:27 -0000 1.4
+++ pkg/PLIST 9 Jun 2017 19:05:36 -0000
@@ -1,8 +1,6 @@
@comment $OpenBSD: PLIST,v 1.4 2015/06/27 13:37:27 jasper Exp $
@bin bin/focuswriter
@man man/man1/focuswriter.1
-share/appdata/
-share/appdata/focuswriter.appdata.xml
share/applications/focuswriter.desktop
share/focuswriter/
share/focuswriter/icons/
@@ -16,6 +14,7 @@ share/focuswriter/icons/hicolor/16/arrow
share/focuswriter/icons/hicolor/16/arrow-up.png
share/focuswriter/icons/hicolor/16/character-set.png
share/focuswriter/icons/hicolor/16/chronometer.png
+share/focuswriter/icons/hicolor/16/dialog-close.png
share/focuswriter/icons/hicolor/16/document-new.png
share/focuswriter/icons/hicolor/16/document-open.png
share/focuswriter/icons/hicolor/16/document-print.png
@@ -51,6 +50,7 @@ share/focuswriter/icons/hicolor/16/go-do
share/focuswriter/icons/hicolor/16/go-up.png
share/focuswriter/icons/hicolor/16/help-about.png
share/focuswriter/icons/hicolor/16/preferences-desktop-locale.png
+share/focuswriter/icons/hicolor/16/preferences-desktop-printer.png
share/focuswriter/icons/hicolor/16/preferences-system.png
share/focuswriter/icons/hicolor/16/tools-check-spelling.png
share/focuswriter/icons/hicolor/16/view-calendar.png
@@ -64,8 +64,11 @@ share/focuswriter/icons/hicolor/22/acces
share/focuswriter/icons/hicolor/22/application-exit.png
share/focuswriter/icons/hicolor/22/applications-graphics.png
share/focuswriter/icons/hicolor/22/arrow-down.png
+share/focuswriter/icons/hicolor/22/arrow-right.png
+share/focuswriter/icons/hicolor/22/arrow-up.png
share/focuswriter/icons/hicolor/22/character-set.png
share/focuswriter/icons/hicolor/22/chronometer.png
+share/focuswriter/icons/hicolor/22/dialog-close.png
share/focuswriter/icons/hicolor/22/document-new.png
share/focuswriter/icons/hicolor/22/document-open.png
share/focuswriter/icons/hicolor/22/document-print.png
@@ -81,6 +84,8 @@ share/focuswriter/icons/hicolor/22/edit-
share/focuswriter/icons/hicolor/22/edit-rename.png
share/focuswriter/icons/hicolor/22/edit-select-all.png
share/focuswriter/icons/hicolor/22/edit-undo.png
+share/focuswriter/icons/hicolor/22/folder-open.png
+share/focuswriter/icons/hicolor/22/folder.png
share/focuswriter/icons/hicolor/22/format-indent-less.png
share/focuswriter/icons/hicolor/22/format-indent-more.png
share/focuswriter/icons/hicolor/22/format-justify-center.png
@@ -99,6 +104,7 @@ share/focuswriter/icons/hicolor/22/go-do
share/focuswriter/icons/hicolor/22/go-up.png
share/focuswriter/icons/hicolor/22/help-about.png
share/focuswriter/icons/hicolor/22/preferences-desktop-locale.png
+share/focuswriter/icons/hicolor/22/preferences-desktop-printer.png
share/focuswriter/icons/hicolor/22/preferences-system.png
share/focuswriter/icons/hicolor/22/tools-check-spelling.png
share/focuswriter/icons/hicolor/22/view-calendar.png
@@ -107,20 +113,191 @@ share/focuswriter/icons/hicolor/22/view-
share/focuswriter/icons/hicolor/22/view-refresh.png
share/focuswriter/icons/hicolor/22/window-close.png
share/focuswriter/icons/hicolor/22/window-new.png
+share/focuswriter/icons/hicolor/32/
+share/focuswriter/icons/hicolor/32/accessories-dictionary.png
+share/focuswriter/icons/hicolor/32/application-exit.png
+share/focuswriter/icons/hicolor/32/applications-graphics.png
+share/focuswriter/icons/hicolor/32/arrow-down.png
+share/focuswriter/icons/hicolor/32/arrow-right.png
+share/focuswriter/icons/hicolor/32/arrow-up.png
+share/focuswriter/icons/hicolor/32/character-set.png
+share/focuswriter/icons/hicolor/32/chronometer.png
+share/focuswriter/icons/hicolor/32/dialog-close.png
+share/focuswriter/icons/hicolor/32/document-new.png
+share/focuswriter/icons/hicolor/32/document-open.png
+share/focuswriter/icons/hicolor/32/document-print.png
+share/focuswriter/icons/hicolor/32/document-save-all.png
+share/focuswriter/icons/hicolor/32/document-save-as.png
+share/focuswriter/icons/hicolor/32/document-save.png
+share/focuswriter/icons/hicolor/32/edit-copy.png
+share/focuswriter/icons/hicolor/32/edit-cut.png
+share/focuswriter/icons/hicolor/32/edit-find-replace.png
+share/focuswriter/icons/hicolor/32/edit-find.png
+share/focuswriter/icons/hicolor/32/edit-paste.png
+share/focuswriter/icons/hicolor/32/edit-redo.png
+share/focuswriter/icons/hicolor/32/edit-rename.png
+share/focuswriter/icons/hicolor/32/edit-select-all.png
+share/focuswriter/icons/hicolor/32/edit-undo.png
+share/focuswriter/icons/hicolor/32/folder-open.png
+share/focuswriter/icons/hicolor/32/folder.png
+share/focuswriter/icons/hicolor/32/format-indent-less.png
+share/focuswriter/icons/hicolor/32/format-indent-more.png
+share/focuswriter/icons/hicolor/32/format-justify-center.png
+share/focuswriter/icons/hicolor/32/format-justify-fill.png
+share/focuswriter/icons/hicolor/32/format-justify-left.png
+share/focuswriter/icons/hicolor/32/format-justify-right.png
+share/focuswriter/icons/hicolor/32/format-text-bold.png
+share/focuswriter/icons/hicolor/32/format-text-direction-ltr.png
+share/focuswriter/icons/hicolor/32/format-text-direction-rtl.png
+share/focuswriter/icons/hicolor/32/format-text-italic.png
+share/focuswriter/icons/hicolor/32/format-text-strikethrough.png
+share/focuswriter/icons/hicolor/32/format-text-subscript.png
+share/focuswriter/icons/hicolor/32/format-text-superscript.png
+share/focuswriter/icons/hicolor/32/format-text-underline.png
+share/focuswriter/icons/hicolor/32/go-down.png
+share/focuswriter/icons/hicolor/32/go-up.png
+share/focuswriter/icons/hicolor/32/help-about.png
+share/focuswriter/icons/hicolor/32/preferences-desktop-locale.png
+share/focuswriter/icons/hicolor/32/preferences-desktop-printer.png
+share/focuswriter/icons/hicolor/32/preferences-system.png
+share/focuswriter/icons/hicolor/32/tools-check-spelling.png
+share/focuswriter/icons/hicolor/32/view-calendar.png
+share/focuswriter/icons/hicolor/32/view-choose.png
+share/focuswriter/icons/hicolor/32/view-fullscreen.png
+share/focuswriter/icons/hicolor/32/view-refresh.png
+share/focuswriter/icons/hicolor/32/window-close.png
+share/focuswriter/icons/hicolor/32/window-new.png
+share/focuswriter/icons/hicolor/48/
+share/focuswriter/icons/hicolor/48/accessories-dictionary.png
+share/focuswriter/icons/hicolor/48/application-exit.png
+share/focuswriter/icons/hicolor/48/applications-graphics.png
+share/focuswriter/icons/hicolor/48/arrow-down.png
+share/focuswriter/icons/hicolor/48/arrow-right.png
+share/focuswriter/icons/hicolor/48/arrow-up.png
+share/focuswriter/icons/hicolor/48/character-set.png
+share/focuswriter/icons/hicolor/48/chronometer.png
+share/focuswriter/icons/hicolor/48/dialog-close.png
+share/focuswriter/icons/hicolor/48/document-new.png
+share/focuswriter/icons/hicolor/48/document-open.png
+share/focuswriter/icons/hicolor/48/document-print.png
+share/focuswriter/icons/hicolor/48/document-save-all.png
+share/focuswriter/icons/hicolor/48/document-save-as.png
+share/focuswriter/icons/hicolor/48/document-save.png
+share/focuswriter/icons/hicolor/48/edit-copy.png
+share/focuswriter/icons/hicolor/48/edit-cut.png
+share/focuswriter/icons/hicolor/48/edit-find-replace.png
+share/focuswriter/icons/hicolor/48/edit-find.png
+share/focuswriter/icons/hicolor/48/edit-paste.png
+share/focuswriter/icons/hicolor/48/edit-redo.png
+share/focuswriter/icons/hicolor/48/edit-rename.png
+share/focuswriter/icons/hicolor/48/edit-select-all.png
+share/focuswriter/icons/hicolor/48/edit-undo.png
+share/focuswriter/icons/hicolor/48/folder-open.png
+share/focuswriter/icons/hicolor/48/folder.png
+share/focuswriter/icons/hicolor/48/format-indent-less.png
+share/focuswriter/icons/hicolor/48/format-indent-more.png
+share/focuswriter/icons/hicolor/48/format-justify-center.png
+share/focuswriter/icons/hicolor/48/format-justify-fill.png
+share/focuswriter/icons/hicolor/48/format-justify-left.png
+share/focuswriter/icons/hicolor/48/format-justify-right.png
+share/focuswriter/icons/hicolor/48/format-text-bold.png
+share/focuswriter/icons/hicolor/48/format-text-direction-ltr.png
+share/focuswriter/icons/hicolor/48/format-text-direction-rtl.png
+share/focuswriter/icons/hicolor/48/format-text-italic.png
+share/focuswriter/icons/hicolor/48/format-text-strikethrough.png
+share/focuswriter/icons/hicolor/48/format-text-subscript.png
+share/focuswriter/icons/hicolor/48/format-text-superscript.png
+share/focuswriter/icons/hicolor/48/format-text-underline.png
+share/focuswriter/icons/hicolor/48/go-down.png
+share/focuswriter/icons/hicolor/48/go-up.png
+share/focuswriter/icons/hicolor/48/help-about.png
+share/focuswriter/icons/hicolor/48/preferences-desktop-locale.png
+share/focuswriter/icons/hicolor/48/preferences-desktop-printer.png
+share/focuswriter/icons/hicolor/48/preferences-system.png
+share/focuswriter/icons/hicolor/48/tools-check-spelling.png
+share/focuswriter/icons/hicolor/48/view-calendar.png
+share/focuswriter/icons/hicolor/48/view-choose.png
+share/focuswriter/icons/hicolor/48/view-fullscreen.png
+share/focuswriter/icons/hicolor/48/view-refresh.png
+share/focuswriter/icons/hicolor/48/window-close.png
+share/focuswriter/icons/hicolor/48/window-new.png
+share/focuswriter/icons/hicolor/64/
+share/focuswriter/icons/hicolor/64/accessories-dictionary.png
+share/focuswriter/icons/hicolor/64/application-exit.png
+share/focuswriter/icons/hicolor/64/applications-graphics.png
+share/focuswriter/icons/hicolor/64/arrow-down.png
+share/focuswriter/icons/hicolor/64/arrow-left.png
+share/focuswriter/icons/hicolor/64/arrow-up.png
+share/focuswriter/icons/hicolor/64/character-set.png
+share/focuswriter/icons/hicolor/64/chronometer.png
+share/focuswriter/icons/hicolor/64/dialog-close.png
+share/focuswriter/icons/hicolor/64/document-new.png
+share/focuswriter/icons/hicolor/64/document-open.png
+share/focuswriter/icons/hicolor/64/document-print.png
+share/focuswriter/icons/hicolor/64/document-save-all.png
+share/focuswriter/icons/hicolor/64/document-save-as.png
+share/focuswriter/icons/hicolor/64/document-save.png
+share/focuswriter/icons/hicolor/64/edit-copy.png
+share/focuswriter/icons/hicolor/64/edit-cut.png
+share/focuswriter/icons/hicolor/64/edit-find-replace.png
+share/focuswriter/icons/hicolor/64/edit-find.png
+share/focuswriter/icons/hicolor/64/edit-paste.png
+share/focuswriter/icons/hicolor/64/edit-redo.png
+share/focuswriter/icons/hicolor/64/edit-rename.png
+share/focuswriter/icons/hicolor/64/edit-select-all.png
+share/focuswriter/icons/hicolor/64/edit-undo.png
+share/focuswriter/icons/hicolor/64/folder-open.png
+share/focuswriter/icons/hicolor/64/folder.png
+share/focuswriter/icons/hicolor/64/format-indent-less.png
+share/focuswriter/icons/hicolor/64/format-justify-center.png
+share/focuswriter/icons/hicolor/64/format-justify-fill.png
+share/focuswriter/icons/hicolor/64/format-justify-left.png
+share/focuswriter/icons/hicolor/64/format-justify-more.png
+share/focuswriter/icons/hicolor/64/format-justify-right.png
+share/focuswriter/icons/hicolor/64/format-text-bold.png
+share/focuswriter/icons/hicolor/64/format-text-direction-ltr.png
+share/focuswriter/icons/hicolor/64/format-text-direction-rtl.png
+share/focuswriter/icons/hicolor/64/format-text-italic.png
+share/focuswriter/icons/hicolor/64/format-text-strikethrough.png
+share/focuswriter/icons/hicolor/64/format-text-subscript.png
+share/focuswriter/icons/hicolor/64/format-text-superscript.png
+share/focuswriter/icons/hicolor/64/format-text-underline.png
+share/focuswriter/icons/hicolor/64/go-down.png
+share/focuswriter/icons/hicolor/64/go-up.png
+share/focuswriter/icons/hicolor/64/help-about.png
+share/focuswriter/icons/hicolor/64/preferences-desktop-locale.png
+share/focuswriter/icons/hicolor/64/preferences-desktop-printer.png
+share/focuswriter/icons/hicolor/64/preferences-system.png
+share/focuswriter/icons/hicolor/64/tools-check-spelling.png
+share/focuswriter/icons/hicolor/64/view-calendar.png
+share/focuswriter/icons/hicolor/64/view-choose.png
+share/focuswriter/icons/hicolor/64/view-fullscreen.png
+share/focuswriter/icons/hicolor/64/view-refresh.png
+share/focuswriter/icons/hicolor/64/window-close.png
+share/focuswriter/icons/hicolor/64/window-new.png
share/focuswriter/icons/hicolor/index.theme
share/focuswriter/sounds/
share/focuswriter/sounds/keyany.wav
share/focuswriter/sounds/keyenter.wav
-share/focuswriter/symbols510.dat
+share/focuswriter/symbols900.dat
share/focuswriter/themes/
+share/focuswriter/themes/bitterskies.theme
+share/focuswriter/themes/enchantment.theme
share/focuswriter/themes/gentleblues.theme
share/focuswriter/themes/images/
+share/focuswriter/themes/images/bitterskies.jpg
+share/focuswriter/themes/images/enchantment.jpg
share/focuswriter/themes/images/spacedreams.jpg
+share/focuswriter/themes/images/spygames.jpg
+share/focuswriter/themes/images/tranquility.jpg
share/focuswriter/themes/images/writingdesk.jpg
share/focuswriter/themes/oldschool.theme
share/focuswriter/themes/spacedreams.theme
+share/focuswriter/themes/spygames.theme
+share/focuswriter/themes/tranquility.theme
share/focuswriter/themes/writingdesk.theme
share/focuswriter/translations/
+share/focuswriter/translations/focuswriter_af_ZA.qm
share/focuswriter/translations/focuswriter_ar.qm
share/focuswriter/translations/focuswriter_ca.qm
share/focuswriter/translations/focuswriter_cs.qm
@@ -156,6 +333,9 @@ share/focuswriter/translations/focuswrit
share/focuswriter/translations/focuswriter_vi.qm
share/focuswriter/translations/focuswriter_zh_CN.qm
share/focuswriter/translations/focuswriter_zh_TW.qm
+share/icons/hicolor/1024x1024/
+share/icons/hicolor/1024x1024/apps/
+share/icons/hicolor/1024x1024/apps/focuswriter.png
share/icons/hicolor/128x128/apps/focuswriter.png
share/icons/hicolor/16x16/apps/focuswriter.png
share/icons/hicolor/22x22/apps/focuswriter.png
@@ -163,8 +343,11 @@ share/icons/hicolor/24x24/apps/focuswrit
share/icons/hicolor/256x256/apps/focuswriter.png
share/icons/hicolor/32x32/apps/focuswriter.png
share/icons/hicolor/48x48/apps/focuswriter.png
+share/icons/hicolor/512x512/apps/focuswriter.png
share/icons/hicolor/64x64/apps/focuswriter.png
share/icons/hicolor/scalable/apps/focuswriter.svg
+share/metainfo/
+share/metainfo/focuswriter.appdata.xml
share/pixmaps/
share/pixmaps/focuswriter.xpm
@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
