tea: Update to 48.0.1

Now uses Qt5 and cmake. There's another branch using GTK3 which I might
import later.

10 files changed, 41 insertions, 383 deletions

diff --git a/editors/tea/DESCR b/editors/tea/DESCR
index 2181f570274..8d6ee68ad5c 100644
--- a/editors/tea/DESCR
+++ b/editors/tea/DESCR
@@ -1,6 +1,8 @@
-TEA is a powerful and simple-in-use GTK-based text editor that
-provides hundreds of functions.
+TEA is a powerful and simple-in-use text editor that provides hundreds
+of functions.
 
 It has many features including syntax highlighting, string handling
 functions, open various formats, hotkeys, built-in file manager,
 localizations and encodings, built-in image viewer, and a lot more.
+
+This is the Qt version.
diff --git a/editors/tea/Makefile b/editors/tea/Makefile
index d2ac82b6c09..3a5143aaf18 100644
--- a/editors/tea/Makefile
+++ b/editors/tea/Makefile
@@ -1,24 +1,31 @@
-# $NetBSD: Makefile,v 1.51 2019/07/21 22:24:44 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2019/10/06 15:54:38 nia Exp $
 
-DISTNAME=		tea-16.0.5
-PKGREVISION=		43
-CATEGORIES=		editors
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=tea-editor/}
-#https://github.com/psemiletov/tea-qt
-EXTRACT_SUFX=		.tar.bz2
+DISTNAME=	tea-48.0.1
+CATEGORIES=	editors
+MASTER_SITES=	${MASTER_SITE_GITHUB:=psemiletov/}
+GITHUB_PROJECT=	tea-qt
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://semiletov.org/tea/
-COMMENT=		Powerful, easy-to-use text editor for Gtk2
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://semiletov.org/tea/
+COMMENT=	Powerful, easy-to-use text editor
+LICENSE=	gnu-gpl-v3
 
-USE_PKGLOCALEDIR=	yes
-GNU_CONFIGURE=		yes
-USE_TOOLS+=		pkg-config msgfmt
-LDFLAGS.DragonFly=	-lX11 -lm
-LDFLAGS.SunOS=		-lX11 -lm
+WRKSRC=		${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}
+USE_CMAKE=	yes
+USE_TOOLS+=	pkg-config
+USE_LANGUAGES=	c c++
 
-.include "options.mk"
-
-.include "../../x11/gtk2/buildlink3.mk"
+# XXX should not be needed but we have weird paths with spaces
+# which break bmake
+USE_TOOLS+=	gmake
 
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/djvulibre-lib/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../print/poppler-qt5/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../textproc/aspell/buildlink3.mk"
+.include "../../textproc/hunspell/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qtdeclarative/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/tea/PLIST b/editors/tea/PLIST
index 3573caf13d4..31ae8a8e339 100644
--- a/editors/tea/PLIST
+++ b/editors/tea/PLIST
@@ -1,187 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:50:26 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2019/10/06 15:54:38 nia Exp $
 bin/tea
-share/doc/tea/AUTHORS
-share/doc/tea/COPYING
-share/doc/tea/ChangeLog
-share/doc/tea/NEWS
-share/doc/tea/README
-share/doc/tea/TODO
-share/doc/tea/cs/index.html
-share/doc/tea/en/a1003.html
-share/doc/tea/en/c109.html
-share/doc/tea/en/c120.html
-share/doc/tea/en/c14.html
-share/doc/tea/en/c224.html
-share/doc/tea/en/c241.html
-share/doc/tea/en/c30.html
-share/doc/tea/en/c316.html
-share/doc/tea/en/c382.html
-share/doc/tea/en/c77.html
-share/doc/tea/en/c782.html
-share/doc/tea/en/c788.html
-share/doc/tea/en/c824.html
-share/doc/tea/en/c852.html
-share/doc/tea/en/c934.html
-share/doc/tea/en/c959.html
-share/doc/tea/en/c967.html
-share/doc/tea/en/index.html
-share/doc/tea/en/x283.html
-share/doc/tea/en/x326.html
-share/doc/tea/en/x345.html
-share/doc/tea/en/x362.html
-share/doc/tea/en/x391.html
-share/doc/tea/en/x417.html
-share/doc/tea/en/x451.html
-share/doc/tea/en/x462.html
-share/doc/tea/en/x476.html
-share/doc/tea/en/x486.html
-share/doc/tea/en/x493.html
-share/doc/tea/en/x508.html
-share/doc/tea/en/x529.html
-share/doc/tea/en/x540.html
-share/doc/tea/en/x551.html
-share/doc/tea/en/x563.html
-share/doc/tea/en/x59.html
-share/doc/tea/en/x662.html
-share/doc/tea/en/x668.html
-share/doc/tea/en/x684.html
-share/doc/tea/en/x71.html
-share/doc/tea/en/x737.html
-share/doc/tea/en/x746.html
-share/doc/tea/en/x772.html
-share/doc/tea/en/x865.html
-share/doc/tea/en/x891.html
-share/doc/tea/en/x895.html
-share/doc/tea/en/x902.html
-share/doc/tea/en/x908.html
-share/doc/tea/en/x917.html
-share/doc/tea/en/x923.html
-share/doc/tea/en/x930.html
-share/doc/tea/en/x951.html
-share/doc/tea/es/a799.html
-share/doc/tea/es/c105.html
-share/doc/tea/es/c18.html
-share/doc/tea/es/c197.html
-share/doc/tea/es/c210.html
-share/doc/tea/es/c231.html
-share/doc/tea/es/c298.html
-share/doc/tea/es/c34.html
-share/doc/tea/es/c590.html
-share/doc/tea/es/c616.html
-share/doc/tea/es/c623.html
-share/doc/tea/es/c63.html
-share/doc/tea/es/c651.html
-share/doc/tea/es/c675.html
-share/doc/tea/es/c742.html
-share/doc/tea/es/c771.html
-share/doc/tea/es/c792.html
-share/doc/tea/es/c94.html
-share/doc/tea/es/favicon.ico
-share/doc/tea/es/img/caution.gif
-share/doc/tea/es/img/cross.png
-share/doc/tea/es/img/home.gif
-share/doc/tea/es/img/important.gif
-share/doc/tea/es/img/leftbuttons.png
-share/doc/tea/es/img/logo.gif
-share/doc/tea/es/img/next.gif
-share/doc/tea/es/img/note.gif
-share/doc/tea/es/img/prev.gif
-share/doc/tea/es/img/resize.png
-share/doc/tea/es/img/rightbuttons.png
-share/doc/tea/es/img/runbutton.png
-share/doc/tea/es/img/runbutton1.png
-share/doc/tea/es/img/tip.gif
-share/doc/tea/es/img/toolbar.gif
-share/doc/tea/es/img/up.gif
-share/doc/tea/es/img/warning.gif
-share/doc/tea/es/index.html
-share/doc/tea/es/style.css
-share/doc/tea/es/x242.html
-share/doc/tea/es/x261.html
-share/doc/tea/es/x278.html
-share/doc/tea/es/x305.html
-share/doc/tea/es/x332.html
-share/doc/tea/es/x341.html
-share/doc/tea/es/x350.html
-share/doc/tea/es/x366.html
-share/doc/tea/es/x373.html
-share/doc/tea/es/x388.html
-share/doc/tea/es/x398.html
-share/doc/tea/es/x497.html
-share/doc/tea/es/x503.html
-share/doc/tea/es/x515.html
-share/doc/tea/es/x558.html
-share/doc/tea/es/x567.html
-share/doc/tea/es/x579.html
-share/doc/tea/es/x687.html
-share/doc/tea/es/x704.html
-share/doc/tea/es/x708.html
-share/doc/tea/es/x715.html
-share/doc/tea/es/x719.html
-share/doc/tea/es/x722.html
-share/doc/tea/es/x726.html
-share/doc/tea/es/x733.html
-share/doc/tea/es/x738.html
-share/doc/tea/es/x763.html
-share/doc/tea/ru/a794.html
-share/doc/tea/ru/c107.html
-share/doc/tea/ru/c13.html
-share/doc/tea/ru/c191.html
-share/doc/tea/ru/c206.html
-share/doc/tea/ru/c254.html
-share/doc/tea/ru/c31.html
-share/doc/tea/ru/c318.html
-share/doc/tea/ru/c641.html
-share/doc/tea/ru/c648.html
-share/doc/tea/ru/c680.html
-share/doc/tea/ru/c704.html
-share/doc/tea/ru/c758.html
-share/doc/tea/ru/c77.html
-share/doc/tea/ru/c780.html
-share/doc/tea/ru/c790.html
-share/doc/tea/ru/c99.html
-share/doc/tea/ru/index.html
-share/doc/tea/ru/x237.html
-share/doc/tea/ru/x264.html
-share/doc/tea/ru/x283.html
-share/doc/tea/ru/x298.html
-share/doc/tea/ru/x325.html
-share/doc/tea/ru/x332.html
-share/doc/tea/ru/x354.html
-share/doc/tea/ru/x367.html
-share/doc/tea/ru/x392.html
-share/doc/tea/ru/x398.html
-share/doc/tea/ru/x418.html
-share/doc/tea/ru/x429.html
-share/doc/tea/ru/x441.html
-share/doc/tea/ru/x454.html
-share/doc/tea/ru/x464.html
-share/doc/tea/ru/x537.html
-share/doc/tea/ru/x541.html
-share/doc/tea/ru/x55.html
-share/doc/tea/ru/x558.html
-share/doc/tea/ru/x597.html
-share/doc/tea/ru/x60.html
-share/doc/tea/ru/x606.html
-share/doc/tea/ru/x631.html
-share/doc/tea/ru/x699.html
-share/doc/tea/ru/x715.html
-share/doc/tea/ru/x725.html
-share/doc/tea/ru/x732.html
-share/doc/tea/ru/x736.html
-share/doc/tea/ru/x739.html
-share/doc/tea/ru/x755.html
-share/doc/tea/ru/x776.html
-share/doc/tea/tea_doc.css
-share/locale/cs/LC_MESSAGES/tea.mo
-share/locale/de/LC_MESSAGES/tea.mo
-share/locale/es/LC_MESSAGES/tea.mo
-share/locale/fr/LC_MESSAGES/tea.mo
-share/locale/ja/LC_MESSAGES/tea.mo
-share/locale/lv/LC_MESSAGES/tea.mo
-share/locale/pl/LC_MESSAGES/tea.mo
-share/locale/ru/LC_MESSAGES/tea.mo
-share/locale/sr/LC_MESSAGES/tea.mo
-share/locale/uk/LC_MESSAGES/tea.mo
-share/tea/pixmaps/tea_icon_v2.png
-share/tea/pixmaps/tea_logo.jpg
+share/applications/tea.desktop
+share/icons/hicolor/128x128/apps/tea.png
+share/icons/hicolor/32x32/apps/tea.png
+share/icons/hicolor/48x48/apps/tea.png
+share/icons/hicolor/64x64/apps/tea.png
+share/icons/hicolor/scalable/apps/tea.svg
diff --git a/editors/tea/distinfo b/editors/tea/distinfo
index 562e56c6e61..bb978803896 100644
--- a/editors/tea/distinfo
+++ b/editors/tea/distinfo
@@ -1,11 +1,6 @@
-$NetBSD: distinfo,v 1.3 2015/11/03 03:32:21 agc Exp $
+$NetBSD: distinfo,v 1.4 2019/10/06 15:54:38 nia Exp $
 
-SHA1 (tea-16.0.5.tar.bz2) = d1c38a7dec406a5a935373fea35b650f04a0331c
-RMD160 (tea-16.0.5.tar.bz2) = 16ee63c77486b000d322704607af1e8354bc5015
-SHA512 (tea-16.0.5.tar.bz2) = 18cae1e8d85fde356645aa760e3a4c8c295f7930ffbf3c1117c59ee542c10330e0507221e8d2be5b1771a522a494d758ac670feca255dd8cd676aba0846086f7
-Size (tea-16.0.5.tar.bz2) = 443526 bytes
-SHA1 (patch-aa) = 6d92c32956d46304703d0267c99b97075b1a349c
-SHA1 (patch-ab) = d9643f3fc1469744406a4c6de6aeb96f4709cbbb
-SHA1 (patch-src_image__browser.c) = a31f4e1d9cfaa691c5c1f7a86c81cc8b8cef4e84
-SHA1 (patch-src_rox__strings.c) = 7f50cf35d66b2529a2a19ca9628824f70c9c0ffa
-SHA1 (patch-src_tea__text__document.c) = 8c4cf064f10a1fa87ac2b0fb1ac9dbf0a609b410
+SHA1 (tea-48.0.1.tar.gz) = d30e1a742ad3de5c6184d81ada6a53a6e1fdb550
+RMD160 (tea-48.0.1.tar.gz) = 3a3b5f009b9d9e3e63da4faecef69ca5e410f9f2
+SHA512 (tea-48.0.1.tar.gz) = e6cf67214f075b4a6c6e91ce4ae07779be75752f58c1b88603f1e23748b15c6c20c48dcecdba6115ef4a891a3094008e4de110f2d925514e0537dbbd63ea94d3
+Size (tea-48.0.1.tar.gz) = 502561 bytes
diff --git a/editors/tea/options.mk b/editors/tea/options.mk
deleted file mode 100644
index d81232ae0cf..00000000000
--- a/editors/tea/options.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: options.mk,v 1.2 2007/09/25 10:23:22 hira Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.tea
-PKG_SUPPORTED_OPTIONS=	aspell gtksourceview # enchant antiword
-PKG_SUGGESTED_OPTIONS=	# none enabled by default
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Maspell)
-.include "../../textproc/aspell/buildlink3.mk"
-.endif
-
-# --enable-enchant disabled aspell so choose one or the other
-
-.if !empty(PKG_OPTIONS:Mgtksourceview)
-.include "../../devel/GConf/buildlink3.mk"
-.include "../../sysutils/gnome-vfs/buildlink3.mk"
-.include "../../x11/gtksourceview/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--enable-legacy
-.endif
diff --git a/editors/tea/patches/patch-aa b/editors/tea/patches/patch-aa
deleted file mode 100644
index 92d6dd2715e..00000000000
--- a/editors/tea/patches/patch-aa
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/04/14 04:49:08 reed Exp $
-
---- Makefile.in.orig	2007-03-03 15:09:14.000000000 -0600
-+++ Makefile.in	2007-04-13 21:57:47.000000000 -0500
-@@ -615,7 +615,7 @@
- 
- @DEB_TRUE@install-data-local:
- @DEB_TRUE@	@$(NORMAL_INSTALL)
--@DEB_TRUE@	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/doc; 
-+@DEB_TRUE@	$(mkinstalldirs) $(DESTDIR)$(datadir)/doc/tea; 
- @DEB_FALSE@@FINK_TRUE@install-data-local:
- @DEB_FALSE@@FINK_TRUE@	@$(NORMAL_INSTALL)
- @DEB_FALSE@@FINK_TRUE@	$(mkinstalldirs) $(DESTDIR)$(pkgdocdir); \
-@@ -636,14 +636,14 @@
- @DEB_FALSE@@FINK_TRUE@	fi 
- @DEB_FALSE@@FINK_FALSE@install-data-local:
- @DEB_FALSE@@FINK_FALSE@	@$(NORMAL_INSTALL)
--@DEB_FALSE@@FINK_FALSE@	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/doc; \
--@DEB_FALSE@@FINK_FALSE@	cp -r $(srcdir)/doc $(DESTDIR)$(pkgdatadir); \
--@DEB_FALSE@@FINK_FALSE@	cp $(srcdir)/AUTHORS $(DESTDIR)$(pkgdatadir)/doc; \
--@DEB_FALSE@@FINK_FALSE@	cp $(srcdir)/ChangeLog $(DESTDIR)$(pkgdatadir)/doc; \
--@DEB_FALSE@@FINK_FALSE@	cp $(srcdir)/README $(DESTDIR)$(pkgdatadir)/doc; \
--@DEB_FALSE@@FINK_FALSE@	cp $(srcdir)/NEWS $(DESTDIR)$(pkgdatadir)/doc; \
--@DEB_FALSE@@FINK_FALSE@	cp $(srcdir)/COPYING $(DESTDIR)$(pkgdatadir)/doc; \
--@DEB_FALSE@@FINK_FALSE@	cp $(srcdir)/TODO $(DESTDIR)$(pkgdatadir)/doc; \
-+@DEB_FALSE@@FINK_FALSE@	$(mkinstalldirs) $(DESTDIR)$(datadir)/doc/tea; \
-+@DEB_FALSE@@FINK_FALSE@	cp -r $(srcdir)/doc/* $(DESTDIR)$(datadir)/doc/tea; \
-+@DEB_FALSE@@FINK_FALSE@	cp $(srcdir)/AUTHORS $(DESTDIR)$(datadir)/doc/tea; \
-+@DEB_FALSE@@FINK_FALSE@	cp $(srcdir)/ChangeLog $(DESTDIR)$(datadir)/doc/tea; \
-+@DEB_FALSE@@FINK_FALSE@	cp $(srcdir)/README $(DESTDIR)$(datadir)/doc/tea; \
-+@DEB_FALSE@@FINK_FALSE@	cp $(srcdir)/NEWS $(DESTDIR)$(datadir)/doc/tea; \
-+@DEB_FALSE@@FINK_FALSE@	cp $(srcdir)/COPYING $(DESTDIR)$(datadir)/doc/tea; \
-+@DEB_FALSE@@FINK_FALSE@	cp $(srcdir)/TODO $(DESTDIR)$(datadir)/doc/tea; \
- @DEB_FALSE@@FINK_FALSE@	if test -d $(srcdir)/pixmaps; then \
- @DEB_FALSE@@FINK_FALSE@	  $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/pixmaps; \
- @DEB_FALSE@@FINK_FALSE@	  for pixmap in $(srcdir)/pixmaps/*; do \
diff --git a/editors/tea/patches/patch-ab b/editors/tea/patches/patch-ab
deleted file mode 100644
index d30131d6b94..00000000000
--- a/editors/tea/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2007/04/14 04:49:08 reed Exp $
-
---- src/tea_defs..orig	2007-04-13 22:00:03.000000000 -0500
-+++ src/tea_defs.h	2007-04-13 22:02:15.000000000 -0500
-@@ -122,7 +122,7 @@
- 
- #else
- 
--#define TEA_DOC_DIR PACKAGE_DATA_DIR"/tea/doc/"
-+#define TEA_DOC_DIR PACKAGE_DATA_DIR"/doc/tea/"
- 
- #endif
- 
diff --git a/editors/tea/patches/patch-src_image__browser.c b/editors/tea/patches/patch-src_image__browser.c
deleted file mode 100644
index b3b5df4397e..00000000000
--- a/editors/tea/patches/patch-src_image__browser.c
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-src_image__browser.c,v 1.1 2013/03/02 18:13:49 joerg Exp $
-
---- src/image_browser.c.orig	2013-03-01 14:29:19.000000000 +0000
-+++ src/image_browser.c
-@@ -654,7 +654,7 @@ static void on_mni_copy_pixbuf (GtkMenuI
- {
-   GtkClipboard *c = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
-   if (! c)
--     return NULL;
-+     return;
- 
-   t_image_viewer *instance = user_data;
-   gtk_clipboard_set_image (c, gtk_image_get_pixbuf (instance->image));
-@@ -1005,7 +1005,7 @@ GtkWidget* create_image_browser (t_image
- void image_browser_update (t_image_plane *instance)
- {
-   if (! instance)
--     return NULL;
-+     return;
- 
-   gchar *filename;
-   gchar *utf;
diff --git a/editors/tea/patches/patch-src_rox__strings.c b/editors/tea/patches/patch-src_rox__strings.c
deleted file mode 100644
index 8b6587d91b3..00000000000
--- a/editors/tea/patches/patch-src_rox__strings.c
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-src_rox__strings.c,v 1.1 2013/03/02 18:13:49 joerg Exp $
-
---- src/rox_strings.c.orig	2013-03-01 14:28:06.000000000 +0000
-+++ src/rox_strings.c
-@@ -2222,7 +2222,7 @@ gchar* copied_from_browser_to_ftext (con
- gchar* get_charset_from_meta (const gchar *text)
- {
-   if (! text)
--     return;
-+     return NULL;
- 
-   gchar *s1 = strstr (text, "<meta");
-   if (! s1)
-@@ -2507,7 +2507,7 @@ gchar* str_before_sep (const gchar *str,
- gchar* str_after_sep (const gchar *str, const gchar *sep)
- {
-    if ((str == NULL) || (sep == NULL))
--      return;
-+      return NULL;
- 
-    gchar *t = strstr (str, sep);
-    if (t)
diff --git a/editors/tea/patches/patch-src_tea__text__document.c b/editors/tea/patches/patch-src_tea__text__document.c
deleted file mode 100644
index be492c607b5..00000000000
--- a/editors/tea/patches/patch-src_tea__text__document.c
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-src_tea__text__document.c,v 1.1 2013/03/02 18:13:49 joerg Exp $
-
---- src/tea_text_document.c.orig	2013-03-01 14:27:14.000000000 +0000
-+++ src/tea_text_document.c
-@@ -2238,7 +2238,7 @@ gchar* doc_get_sel (t_note_page *doc)
- void doc_select_line (t_note_page *doc, gint line)
- {
-   if (! doc)
--     return NULL;
-+     return;
- 
-   GtkTextIter itstart, itend;
-   gtk_text_buffer_get_iter_at_line (doc->text_buffer, &itstart, line - 1);
-@@ -3190,7 +3190,7 @@ void doc_rep_sel (t_note_page *page, con
- gchar* get_c_url (t_note_page *doc)
- {
-   if (! doc)
--     return;
-+     return NULL;
- 
-   gchar *dir;
-   gchar *filename;
-@@ -3282,7 +3282,7 @@ gboolean doc_search_f (t_note_page *doc,
- gboolean doc_search_f_next (t_note_page *doc)
- {
-   if (! doc)
--     return;
-+     return FALSE;
- 
-   gboolean result = FALSE;
-   if (! doc->last_searched_text)
-@@ -4812,18 +4812,18 @@ gboolean text_doc_save_silent (t_note_pa
- t_note_page* doc_is_already_opened (const gchar *filename)
- {
-   if (! filename)
--     return;
-+     return NULL;
- 
-   gint i = get_n_page_by_filename (filename);
- 
-   if (i != -1)
-      {
-       gtk_notebook_set_current_page (notebook1, i);
--      return;
-+      return NULL;
-      }
- 
-   if (! g_file_test (filename, G_FILE_TEST_EXISTS))
--     return;
-+     return NULL;
- 
-   t_note_page *t = open_file_std (filename);
-   cur_text_doc = t;