4 files changed, 119 insertions, 70 deletions

diff --git a/editors/tea/Makefile b/editors/tea/Makefile
index a6e92de7d9f5..1eb265688894 100644
--- a/editors/tea/Makefile
+++ b/editors/tea/Makefile
@@ -6,15 +6,16 @@
 #
 
 PORTNAME=		tea
-PORTVERSION=		8.2
+DISTVERSION=		9.0-pre4
 CATEGORIES=		editors
-MASTER_SITES=		http://tea.linux.kiev.ua/
-DISTNAME=		${PORTNAME}
+MASTER_SITES=		${MASTER_SITE_LOCAL} \
+			http://freebsd.nsu.ru/distfiles/
+MASTER_SITE_SUBDIR=	danfe
 
 MAINTAINER=		danfe@FreeBSD.org
 COMMENT=		A simple and powerful GTK+ text editor
 
-WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC=			${WRKDIR}/${PORTNAME}-${DISTVERSION:S/-pre4//}
 
 USE_X_PREFIX=		yes
 USE_BZIP2=		yes
diff --git a/editors/tea/distinfo b/editors/tea/distinfo
index f3a9c9254f6e..7d93fcbc8335 100644
--- a/editors/tea/distinfo
+++ b/editors/tea/distinfo
@@ -1,2 +1,2 @@
-MD5 (tea.tar.bz2) = 8f3e2fc82233c505375d092f32a96f56
-SIZE (tea.tar.bz2) = 336272
+MD5 (tea-9.0-pre4.tar.bz2) = abf79d3bfc60d913ae79deb90824a9c1
+SIZE (tea-9.0-pre4.tar.bz2) = 333111
diff --git a/editors/tea/files/patch-Makefile.in b/editors/tea/files/patch-Makefile.in
index 596805726711..cdf6aa9215e9 100644
--- a/editors/tea/files/patch-Makefile.in
+++ b/editors/tea/files/patch-Makefile.in
@@ -8,26 +8,25 @@
  pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
  top_builddir = .
-@@ -542,16 +543,12 @@
- 
- install-data-local:
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/doc; \
--	cp -r $(srcdir)/doc $(DESTDIR)$(pkgdatadir); \
--	cp $(srcdir)/FAQ $(DESTDIR)$(pkgdatadir)/doc; \
--	cp $(srcdir)/AUTHORS $(DESTDIR)$(pkgdatadir)/doc; \
--	cp $(srcdir)/ChangeLog $(DESTDIR)$(pkgdatadir)/doc; \
--	cp $(srcdir)/README $(DESTDIR)$(pkgdatadir)/doc; \
--	cp $(srcdir)/NEWS $(DESTDIR)$(pkgdatadir)/doc; \
--	cp $(srcdir)/COPYING $(DESTDIR)$(pkgdatadir)/doc; \
--	cp $(srcdir)/TODO $(DESTDIR)$(pkgdatadir)/doc; \
--	cp $(srcdir)/BUGS $(DESTDIR)$(pkgdatadir)/doc; \
-+	$(mkinstalldirs) $(DESTDIR)$(pkgdocsdir); \
-+	cp -r $(srcdir)/doc/ $(DESTDIR)$(pkgdocsdir); \
-+	cp $(srcdir)/AUTHORS $(DESTDIR)$(pkgdocsdir); \
-+	cp $(srcdir)/ChangeLog $(DESTDIR)$(pkgdocsdir); \
-+	cp $(srcdir)/NEWS $(DESTDIR)$(pkgdocsdir); \
-+	cp $(srcdir)/TODO $(DESTDIR)$(pkgdocsdir); \
- 	if test -d $(srcdir)/pixmaps; then \
- 	  $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/pixmaps; \
- 	  for pixmap in $(srcdir)/pixmaps/*; do \
+@@ -562,15 +563,12 @@
+ @DEB_TRUE@	fi 
+ @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@	cp $(srcdir)/BUGS $(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 fe320220316a..e0dcd45ecd25 100644
--- a/editors/tea/pkg-plist
+++ b/editors/tea/pkg-plist
@@ -1,64 +1,112 @@
 bin/tea
 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
-%%DATADIR%%/pixmaps/lgm.png
 %%DATADIR%%/pixmaps/tea_icon_v2.png
 %%DATADIR%%/pixmaps/tea_logo.jpg
 @dirrm %%DATADIR%%/pixmaps
 @dirrm %%DATADIR%%
 %%DOCSDIR%%/cs/index.html
-%%DOCSDIR%%/en/a747.html
+%%DOCSDIR%%/ru/index.html
+%%DOCSDIR%%/es/x763.html
+%%DOCSDIR%%/es/c105.html
+%%DOCSDIR%%/es/c18.html
+%%DOCSDIR%%/es/c197.html
+%%DOCSDIR%%/es/c210.html
+%%DOCSDIR%%/es/c231.html
+%%DOCSDIR%%/es/c298.html
+%%DOCSDIR%%/es/c34.html
+%%DOCSDIR%%/es/c590.html
+%%DOCSDIR%%/es/c616.html
+%%DOCSDIR%%/es/c623.html
+%%DOCSDIR%%/es/c63.html
+%%DOCSDIR%%/es/c651.html
+%%DOCSDIR%%/es/c675.html
+%%DOCSDIR%%/es/c742.html
+%%DOCSDIR%%/es/c771.html
+%%DOCSDIR%%/es/c780.html
+%%DOCSDIR%%/es/c94.html
+%%DOCSDIR%%/es/index.html
+%%DOCSDIR%%/es/x242.html
+%%DOCSDIR%%/es/x261.html
+%%DOCSDIR%%/es/x278.html
+%%DOCSDIR%%/es/x305.html
+%%DOCSDIR%%/es/x332.html
+%%DOCSDIR%%/es/x341.html
+%%DOCSDIR%%/es/x350.html
+%%DOCSDIR%%/es/x366.html
+%%DOCSDIR%%/es/x373.html
+%%DOCSDIR%%/es/x388.html
+%%DOCSDIR%%/es/x398.html
+%%DOCSDIR%%/es/x497.html
+%%DOCSDIR%%/es/x503.html
+%%DOCSDIR%%/es/x515.html
+%%DOCSDIR%%/es/x558.html
+%%DOCSDIR%%/es/x567.html
+%%DOCSDIR%%/es/x579.html
+%%DOCSDIR%%/es/x687.html
+%%DOCSDIR%%/es/x704.html
+%%DOCSDIR%%/es/x708.html
+%%DOCSDIR%%/es/x715.html
+%%DOCSDIR%%/es/x719.html
+%%DOCSDIR%%/es/x722.html
+%%DOCSDIR%%/es/x726.html
+%%DOCSDIR%%/es/x733.html
+%%DOCSDIR%%/es/x738.html
+%%DOCSDIR%%/es/a787.html
+%%DOCSDIR%%/en/x737.html
 %%DOCSDIR%%/en/c101.html
 %%DOCSDIR%%/en/c17.html
-%%DOCSDIR%%/en/c188.html
-%%DOCSDIR%%/en/c201.html
-%%DOCSDIR%%/en/c222.html
-%%DOCSDIR%%/en/c282.html
+%%DOCSDIR%%/en/c192.html
+%%DOCSDIR%%/en/c205.html
+%%DOCSDIR%%/en/c226.html
+%%DOCSDIR%%/en/c290.html
 %%DOCSDIR%%/en/c32.html
-%%DOCSDIR%%/en/c560.html
-%%DOCSDIR%%/en/c586.html
-%%DOCSDIR%%/en/c592.html
+%%DOCSDIR%%/en/c568.html
+%%DOCSDIR%%/en/c594.html
 %%DOCSDIR%%/en/c60.html
-%%DOCSDIR%%/en/c619.html
-%%DOCSDIR%%/en/c640.html
-%%DOCSDIR%%/en/c707.html
-%%DOCSDIR%%/en/c735.html
-%%DOCSDIR%%/en/c743.html
+%%DOCSDIR%%/en/c600.html
+%%DOCSDIR%%/en/c627.html
+%%DOCSDIR%%/en/c650.html
+%%DOCSDIR%%/en/c717.html
+%%DOCSDIR%%/en/c745.html
+%%DOCSDIR%%/en/c753.html
 %%DOCSDIR%%/en/c90.html
 %%DOCSDIR%%/en/index.html
-%%DOCSDIR%%/en/x230.html
-%%DOCSDIR%%/en/x248.html
-%%DOCSDIR%%/en/x262.html
-%%DOCSDIR%%/en/x289.html
-%%DOCSDIR%%/en/x313.html
-%%DOCSDIR%%/en/x322.html
-%%DOCSDIR%%/en/x331.html
-%%DOCSDIR%%/en/x341.html
-%%DOCSDIR%%/en/x348.html
-%%DOCSDIR%%/en/x359.html
-%%DOCSDIR%%/en/x369.html
-%%DOCSDIR%%/en/x468.html
-%%DOCSDIR%%/en/x474.html
-%%DOCSDIR%%/en/x486.html
-%%DOCSDIR%%/en/x529.html
-%%DOCSDIR%%/en/x538.html
-%%DOCSDIR%%/en/x550.html
-%%DOCSDIR%%/en/x653.html
-%%DOCSDIR%%/en/x670.html
-%%DOCSDIR%%/en/x674.html
-%%DOCSDIR%%/en/x681.html
-%%DOCSDIR%%/en/x685.html
-%%DOCSDIR%%/en/x688.html
-%%DOCSDIR%%/en/x692.html
+%%DOCSDIR%%/en/x234.html
+%%DOCSDIR%%/en/x253.html
+%%DOCSDIR%%/en/x270.html
+%%DOCSDIR%%/en/x297.html
+%%DOCSDIR%%/en/x321.html
+%%DOCSDIR%%/en/x330.html
+%%DOCSDIR%%/en/x339.html
+%%DOCSDIR%%/en/x349.html
+%%DOCSDIR%%/en/x356.html
+%%DOCSDIR%%/en/x367.html
+%%DOCSDIR%%/en/x377.html
+%%DOCSDIR%%/en/x476.html
+%%DOCSDIR%%/en/x482.html
+%%DOCSDIR%%/en/x494.html
+%%DOCSDIR%%/en/x537.html
+%%DOCSDIR%%/en/x546.html
+%%DOCSDIR%%/en/x558.html
+%%DOCSDIR%%/en/x663.html
+%%DOCSDIR%%/en/x680.html
+%%DOCSDIR%%/en/x684.html
+%%DOCSDIR%%/en/x691.html
+%%DOCSDIR%%/en/x695.html
 %%DOCSDIR%%/en/x698.html
-%%DOCSDIR%%/en/x703.html
-%%DOCSDIR%%/en/x727.html
-%%DOCSDIR%%/ru/index.html
+%%DOCSDIR%%/en/x702.html
+%%DOCSDIR%%/en/x708.html
+%%DOCSDIR%%/en/x713.html
+%%DOCSDIR%%/en/a757.html
 %%DOCSDIR%%/tea_doc.css
 %%DOCSDIR%%/AUTHORS
 %%DOCSDIR%%/ChangeLog
@@ -66,5 +114,6 @@ share/locale/uk/LC_MESSAGES/tea.mo
 %%DOCSDIR%%/TODO
 @dirrm %%DOCSDIR%%/cs
 @dirrm %%DOCSDIR%%/en
+@dirrm %%DOCSDIR%%/es
 @dirrm %%DOCSDIR%%/ru
 @dirrm %%DOCSDIR%%