4 files changed, 66 insertions, 91 deletions

diff --git a/editors/tea/Makefile b/editors/tea/Makefile
index c23af49d860e..5b585c4015a9 100644
--- a/editors/tea/Makefile
+++ b/editors/tea/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	tea
-DISTVERSION=	13.3
+DISTVERSION=	14.2.4
 CATEGORIES=	editors
-MASTER_SITES=	http://tea.linux.kiev.ua/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	tea-editor
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	A simple and powerful GTK+ text editor
@@ -22,8 +23,8 @@ USE_GNOME=	gtk20
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-OPTIONS=	TEA_ONLY	"Build original GTK-only version" on \
-		ASPELL		"Build with GNU aspell support" on
+OPTIONS=	TEA_ONLY	"Build original GTK-only version"	on \
+		ASPELL		"Build with GNU aspell support"		on
 
 .include <bsd.port.pre.mk>
 
@@ -40,5 +41,7 @@ LIB_DEPENDS+=	aspell:${PORTSDIR}/textproc/aspell
 post-patch:
 	@${REINPLACE_CMD} -e 's|/tea/doc/|/doc/tea/|' \
 		${WRKSRC}/src/tea_defs.h
+	@${REINPLACE_CMD} -e '4373d; 4376,4379d' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e '568d' ${WRKSRC}/Makefile.in
 
 .include <bsd.port.post.mk>
diff --git a/editors/tea/distinfo b/editors/tea/distinfo
index b4f4ae5a8889..3ced810a23ca 100644
--- a/editors/tea/distinfo
+++ b/editors/tea/distinfo
@@ -1,3 +1,3 @@
-MD5 (tea-13.3.tar.bz2) = f93e3d27b6177aac095fa50aa5fb1e64
-SHA256 (tea-13.3.tar.bz2) = 7ef194ef6bb66bfd51ce525ad74bd946c953af5ac6f6072f304b805ff1875699
-SIZE (tea-13.3.tar.bz2) = 408215
+MD5 (tea-14.2.4.tar.bz2) = d6a408d9d9c6f58c91e5640cfcdf64b9
+SHA256 (tea-14.2.4.tar.bz2) = 42b1fd9b3835f7def8da57ce67e1d40f038362d44c05df201e186c62c855afa2
+SIZE (tea-14.2.4.tar.bz2) = 411690
diff --git a/editors/tea/files/patch-Makefile.in b/editors/tea/files/patch-Makefile.in
deleted file mode 100644
index d6b8f27f026a..000000000000
--- a/editors/tea/files/patch-Makefile.in
+++ /dev/null
@@ -1,31 +0,0 @@
---- Makefile.in.orig	Sun Feb 13 10:59:41 2005
-+++ Makefile.in	Sun Feb 13 11:04:08 2005
-@@ -18,6 +18,7 @@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
-+pkgdocsdir = $(datadir)/doc/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = .
-@@ -545,14 +546,12 @@
- @DEB_TRUE@	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/doc; 
- @DEB_FALSE@install-data-local:
- @DEB_FALSE@	@$(NORMAL_INSTALL)
--@DEB_FALSE@	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/doc; \
--@DEB_FALSE@	cp -r $(srcdir)/doc $(DESTDIR)$(pkgdatadir); \
--@DEB_FALSE@	cp $(srcdir)/AUTHORS $(DESTDIR)$(pkgdatadir)/doc; \
--@DEB_FALSE@	cp $(srcdir)/ChangeLog $(DESTDIR)$(pkgdatadir)/doc; \
--@DEB_FALSE@	cp $(srcdir)/README $(DESTDIR)$(pkgdatadir)/doc; \
--@DEB_FALSE@	cp $(srcdir)/NEWS $(DESTDIR)$(pkgdatadir)/doc; \
--@DEB_FALSE@	cp $(srcdir)/COPYING $(DESTDIR)$(pkgdatadir)/doc; \
--@DEB_FALSE@	cp $(srcdir)/TODO $(DESTDIR)$(pkgdatadir)/doc; \
-+@DEB_FALSE@	$(mkinstalldirs) $(DESTDIR)$(pkgdocsdir); \
-+@DEB_FALSE@	cp -r $(srcdir)/doc/ $(DESTDIR)$(pkgdocsdir); \
-+@DEB_FALSE@	cp $(srcdir)/AUTHORS $(DESTDIR)$(pkgdocsdir); \
-+@DEB_FALSE@	cp $(srcdir)/ChangeLog $(DESTDIR)$(pkgdocsdir); \
-+@DEB_FALSE@	cp $(srcdir)/NEWS $(DESTDIR)$(pkgdocsdir); \
-+@DEB_FALSE@	cp $(srcdir)/TODO $(DESTDIR)$(pkgdocsdir); \
- @DEB_FALSE@	if test -d $(srcdir)/pixmaps; then \
- @DEB_FALSE@	  $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/pixmaps; \
- @DEB_FALSE@	  for pixmap in $(srcdir)/pixmaps/*; do \
diff --git a/editors/tea/pkg-plist b/editors/tea/pkg-plist
index eb0611ea41c6..c40aab906b65 100644
--- a/editors/tea/pkg-plist
+++ b/editors/tea/pkg-plist
@@ -13,8 +13,7 @@ share/locale/uk/LC_MESSAGES/tea.mo
 %%DATADIR%%/pixmaps/tea_logo.jpg
 @dirrm %%DATADIR%%/pixmaps
 @dirrm %%DATADIR%%
-%%DOCSDIR%%/cs/index.html
-%%DOCSDIR%%/ru/x721.html
+%%DOCSDIR%%/ru/x745.html
 %%DOCSDIR%%/ru/c105.html
 %%DOCSDIR%%/ru/c13.html
 %%DOCSDIR%%/ru/c189.html
@@ -22,14 +21,14 @@ share/locale/uk/LC_MESSAGES/tea.mo
 %%DOCSDIR%%/ru/c252.html
 %%DOCSDIR%%/ru/c31.html
 %%DOCSDIR%%/ru/c316.html
-%%DOCSDIR%%/ru/c588.html
-%%DOCSDIR%%/ru/c595.html
-%%DOCSDIR%%/ru/c626.html
+%%DOCSDIR%%/ru/c611.html
+%%DOCSDIR%%/ru/c618.html
 %%DOCSDIR%%/ru/c650.html
-%%DOCSDIR%%/ru/c704.html
-%%DOCSDIR%%/ru/c725.html
-%%DOCSDIR%%/ru/c735.html
+%%DOCSDIR%%/ru/c674.html
+%%DOCSDIR%%/ru/c728.html
+%%DOCSDIR%%/ru/c749.html
 %%DOCSDIR%%/ru/c75.html
+%%DOCSDIR%%/ru/c759.html
 %%DOCSDIR%%/ru/c97.html
 %%DOCSDIR%%/ru/index.html
 %%DOCSDIR%%/ru/x235.html
@@ -42,24 +41,25 @@ share/locale/uk/LC_MESSAGES/tea.mo
 %%DOCSDIR%%/ru/x361.html
 %%DOCSDIR%%/ru/x386.html
 %%DOCSDIR%%/ru/x392.html
-%%DOCSDIR%%/ru/x404.html
-%%DOCSDIR%%/ru/x414.html
-%%DOCSDIR%%/ru/x487.html
-%%DOCSDIR%%/ru/x491.html
-%%DOCSDIR%%/ru/x505.html
-%%DOCSDIR%%/ru/x544.html
+%%DOCSDIR%%/ru/x412.html
+%%DOCSDIR%%/ru/x424.html
+%%DOCSDIR%%/ru/x434.html
+%%DOCSDIR%%/ru/x507.html
+%%DOCSDIR%%/ru/x511.html
+%%DOCSDIR%%/ru/x528.html
 %%DOCSDIR%%/ru/x55.html
-%%DOCSDIR%%/ru/x553.html
-%%DOCSDIR%%/ru/x578.html
+%%DOCSDIR%%/ru/x567.html
+%%DOCSDIR%%/ru/x576.html
 %%DOCSDIR%%/ru/x60.html
-%%DOCSDIR%%/ru/x645.html
-%%DOCSDIR%%/ru/x661.html
-%%DOCSDIR%%/ru/x671.html
-%%DOCSDIR%%/ru/x678.html
-%%DOCSDIR%%/ru/x682.html
+%%DOCSDIR%%/ru/x601.html
+%%DOCSDIR%%/ru/x669.html
 %%DOCSDIR%%/ru/x685.html
-%%DOCSDIR%%/ru/x701.html
-%%DOCSDIR%%/ru/a739.html
+%%DOCSDIR%%/ru/x695.html
+%%DOCSDIR%%/ru/x702.html
+%%DOCSDIR%%/ru/x706.html
+%%DOCSDIR%%/ru/x709.html
+%%DOCSDIR%%/ru/x725.html
+%%DOCSDIR%%/ru/a763.html
 %%DOCSDIR%%/es/img/leftbuttons.png
 %%DOCSDIR%%/es/img/runbutton1.png
 %%DOCSDIR%%/es/img/rightbuttons.png
@@ -125,7 +125,7 @@ share/locale/uk/LC_MESSAGES/tea.mo
 %%DOCSDIR%%/es/x733.html
 %%DOCSDIR%%/es/x738.html
 %%DOCSDIR%%/es/x763.html
-%%DOCSDIR%%/en/x889.html
+%%DOCSDIR%%/en/x917.html
 %%DOCSDIR%%/en/c107.html
 %%DOCSDIR%%/en/c118.html
 %%DOCSDIR%%/en/c14.html
@@ -134,50 +134,53 @@ share/locale/uk/LC_MESSAGES/tea.mo
 %%DOCSDIR%%/en/c30.html
 %%DOCSDIR%%/en/c308.html
 %%DOCSDIR%%/en/c371.html
-%%DOCSDIR%%/en/c723.html
-%%DOCSDIR%%/en/c729.html
-%%DOCSDIR%%/en/c764.html
+%%DOCSDIR%%/en/c750.html
+%%DOCSDIR%%/en/c756.html
 %%DOCSDIR%%/en/c77.html
-%%DOCSDIR%%/en/c790.html
-%%DOCSDIR%%/en/c872.html
-%%DOCSDIR%%/en/c897.html
-%%DOCSDIR%%/en/c905.html
+%%DOCSDIR%%/en/c792.html
+%%DOCSDIR%%/en/c818.html
+%%DOCSDIR%%/en/c900.html
+%%DOCSDIR%%/en/c925.html
+%%DOCSDIR%%/en/c933.html
 %%DOCSDIR%%/en/index.html
 %%DOCSDIR%%/en/x275.html
 %%DOCSDIR%%/en/x315.html
 %%DOCSDIR%%/en/x334.html
 %%DOCSDIR%%/en/x351.html
-%%DOCSDIR%%/en/x378.html
-%%DOCSDIR%%/en/x404.html
-%%DOCSDIR%%/en/x438.html
-%%DOCSDIR%%/en/x449.html
-%%DOCSDIR%%/en/x463.html
-%%DOCSDIR%%/en/x473.html
-%%DOCSDIR%%/en/x480.html
-%%DOCSDIR%%/en/x491.html
+%%DOCSDIR%%/en/x380.html
+%%DOCSDIR%%/en/x406.html
+%%DOCSDIR%%/en/x440.html
+%%DOCSDIR%%/en/x451.html
+%%DOCSDIR%%/en/x465.html
+%%DOCSDIR%%/en/x475.html
+%%DOCSDIR%%/en/x482.html
 %%DOCSDIR%%/en/x503.html
+%%DOCSDIR%%/en/x514.html
+%%DOCSDIR%%/en/x526.html
 %%DOCSDIR%%/en/x59.html
-%%DOCSDIR%%/en/x602.html
-%%DOCSDIR%%/en/x608.html
-%%DOCSDIR%%/en/x620.html
-%%DOCSDIR%%/en/x673.html
-%%DOCSDIR%%/en/x682.html
-%%DOCSDIR%%/en/x708.html
+%%DOCSDIR%%/en/x625.html
+%%DOCSDIR%%/en/x631.html
+%%DOCSDIR%%/en/x647.html
+%%DOCSDIR%%/en/x700.html
+%%DOCSDIR%%/en/x709.html
 %%DOCSDIR%%/en/x71.html
-%%DOCSDIR%%/en/x718.html
-%%DOCSDIR%%/en/x803.html
-%%DOCSDIR%%/en/x829.html
-%%DOCSDIR%%/en/x833.html
-%%DOCSDIR%%/en/x840.html
-%%DOCSDIR%%/en/x846.html
-%%DOCSDIR%%/en/x855.html
+%%DOCSDIR%%/en/x735.html
+%%DOCSDIR%%/en/x745.html
+%%DOCSDIR%%/en/x831.html
+%%DOCSDIR%%/en/x857.html
 %%DOCSDIR%%/en/x861.html
 %%DOCSDIR%%/en/x868.html
-%%DOCSDIR%%/en/a941.html
+%%DOCSDIR%%/en/x874.html
+%%DOCSDIR%%/en/x883.html
+%%DOCSDIR%%/en/x889.html
+%%DOCSDIR%%/en/x896.html
+%%DOCSDIR%%/en/a970.html
+%%DOCSDIR%%/cs/index.html
 %%DOCSDIR%%/tea_doc.css
 %%DOCSDIR%%/AUTHORS
 %%DOCSDIR%%/ChangeLog
 %%DOCSDIR%%/NEWS
+%%DOCSDIR%%/README
 %%DOCSDIR%%/TODO
 @dirrm %%DOCSDIR%%/cs
 @dirrm %%DOCSDIR%%/en