- Update to 9.0

- Add original mastersite back, distfile named coherently this time

4 files changed, 134 insertions, 67 deletions

diff --git a/editors/tea/Makefile b/editors/tea/Makefile
index 1eb265688894..71b54e7b1f3c 100644
--- a/editors/tea/Makefile
+++ b/editors/tea/Makefile
@@ -6,17 +6,16 @@
 #
 
 PORTNAME=		tea
-DISTVERSION=		9.0-pre4
+DISTVERSION=		9.0
 CATEGORIES=		editors
 MASTER_SITES=		${MASTER_SITE_LOCAL} \
+			http://tea.linux.kiev.ua/ \
 			http://freebsd.nsu.ru/distfiles/
 MASTER_SITE_SUBDIR=	danfe
 
 MAINTAINER=		danfe@FreeBSD.org
 COMMENT=		A simple and powerful GTK+ text editor
 
-WRKSRC=			${WRKDIR}/${PORTNAME}-${DISTVERSION:S/-pre4//}
-
 USE_X_PREFIX=		yes
 USE_BZIP2=		yes
 USE_REINPLACE=		yes
diff --git a/editors/tea/distinfo b/editors/tea/distinfo
index 7d93fcbc8335..40d8279471f6 100644
--- a/editors/tea/distinfo
+++ b/editors/tea/distinfo
@@ -1,2 +1,2 @@
-MD5 (tea-9.0-pre4.tar.bz2) = abf79d3bfc60d913ae79deb90824a9c1
-SIZE (tea-9.0-pre4.tar.bz2) = 333111
+MD5 (tea-9.0.tar.bz2) = 48f7de30841fe2440eedbe65dfc7ff6e
+SIZE (tea-9.0.tar.bz2) = 337459
diff --git a/editors/tea/files/patch-Makefile.in b/editors/tea/files/patch-Makefile.in
index cdf6aa9215e9..ca95e9add247 100644
--- a/editors/tea/files/patch-Makefile.in
+++ b/editors/tea/files/patch-Makefile.in
@@ -8,25 +8,49 @@
  pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
  top_builddir = .
-@@ -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 \
+@@ -541,29 +542,22 @@
+ 	uninstall-recursive
+ 
+ 
+-@DEB_TRUE@install-data-local:
+-@DEB_TRUE@	@$(NORMAL_INSTALL)
+-@DEB_TRUE@	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/doc; \
+-@DEB_TRUE@else
+-@DEB_TRUE@install-data-local:
+-@DEB_TRUE@	@$(NORMAL_INSTALL)
+-@DEB_TRUE@	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/doc; \
+-@DEB_TRUE@	cp -r $(srcdir)/doc $(DESTDIR)$(pkgdatadir); \
+-@DEB_TRUE@	cp $(srcdir)/AUTHORS $(DESTDIR)$(pkgdatadir)/doc; \
+-@DEB_TRUE@	cp $(srcdir)/ChangeLog $(DESTDIR)$(pkgdatadir)/doc; \
+-@DEB_TRUE@	cp $(srcdir)/README $(DESTDIR)$(pkgdatadir)/doc; \
+-@DEB_TRUE@	cp $(srcdir)/NEWS $(DESTDIR)$(pkgdatadir)/doc; \
+-@DEB_TRUE@	cp $(srcdir)/COPYING $(DESTDIR)$(pkgdatadir)/doc; \
+-@DEB_TRUE@	cp $(srcdir)/TODO $(DESTDIR)$(pkgdatadir)/doc; \
+-@DEB_TRUE@	cp $(srcdir)/BUGS $(DESTDIR)$(pkgdatadir)/doc; \
+-@DEB_TRUE@	if test -d $(srcdir)/pixmaps; then \
+-@DEB_TRUE@	  $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/pixmaps; \
+-@DEB_TRUE@	  for pixmap in $(srcdir)/pixmaps/*; do \
+-@DEB_TRUE@	    if test -f $$pixmap; then \
+-@DEB_TRUE@	      $(INSTALL_DATA) $$pixmap $(DESTDIR)$(pkgdatadir)/pixmaps; \
+-@DEB_TRUE@	    fi \
+-@DEB_TRUE@	  done \
+-@DEB_TRUE@	fi 
++install-data-local:
++	@$(NORMAL_INSTALL)
++	$(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 \
++			if test -f $$pixmap; then \
++				$(INSTALL_DATA) $$pixmap $(DESTDIR)$(pkgdatadir)/pixmaps; \
++			fi \
++		done \
++	fi 
+ 
+ dist-hook:
+ 	if test -d $(srcdir)/pixmaps; then \
diff --git a/editors/tea/pkg-plist b/editors/tea/pkg-plist
index e0dcd45ecd25..480b888623ac 100644
--- a/editors/tea/pkg-plist
+++ b/editors/tea/pkg-plist
@@ -14,7 +14,51 @@ share/locale/uk/LC_MESSAGES/tea.mo
 @dirrm %%DATADIR%%/pixmaps
 @dirrm %%DATADIR%%
 %%DOCSDIR%%/cs/index.html
+%%DOCSDIR%%/ru/x671.html
+%%DOCSDIR%%/ru/c16.html
+%%DOCSDIR%%/ru/c174.html
+%%DOCSDIR%%/ru/c189.html
+%%DOCSDIR%%/ru/c214.html
+%%DOCSDIR%%/ru/c282.html
+%%DOCSDIR%%/ru/c29.html
+%%DOCSDIR%%/ru/c524.html
+%%DOCSDIR%%/ru/c550.html
+%%DOCSDIR%%/ru/c556.html
+%%DOCSDIR%%/ru/c56.html
+%%DOCSDIR%%/ru/c579.html
+%%DOCSDIR%%/ru/c598.html
+%%DOCSDIR%%/ru/c649.html
+%%DOCSDIR%%/ru/c675.html
+%%DOCSDIR%%/ru/c683.html
+%%DOCSDIR%%/ru/c77.html
+%%DOCSDIR%%/ru/c85.html
 %%DOCSDIR%%/ru/index.html
+%%DOCSDIR%%/ru/x228.html
+%%DOCSDIR%%/ru/x247.html
+%%DOCSDIR%%/ru/x262.html
+%%DOCSDIR%%/ru/x289.html
+%%DOCSDIR%%/ru/x298.html
+%%DOCSDIR%%/ru/x315.html
+%%DOCSDIR%%/ru/x324.html
+%%DOCSDIR%%/ru/x330.html
+%%DOCSDIR%%/ru/x338.html
+%%DOCSDIR%%/ru/x350.html
+%%DOCSDIR%%/ru/x360.html
+%%DOCSDIR%%/ru/x436.html
+%%DOCSDIR%%/ru/x440.html
+%%DOCSDIR%%/ru/x454.html
+%%DOCSDIR%%/ru/x495.html
+%%DOCSDIR%%/ru/x504.html
+%%DOCSDIR%%/ru/x514.html
+%%DOCSDIR%%/ru/x593.html
+%%DOCSDIR%%/ru/x609.html
+%%DOCSDIR%%/ru/x621.html
+%%DOCSDIR%%/ru/x628.html
+%%DOCSDIR%%/ru/x632.html
+%%DOCSDIR%%/ru/x635.html
+%%DOCSDIR%%/ru/x641.html
+%%DOCSDIR%%/ru/x646.html
+%%DOCSDIR%%/ru/a687.html
 %%DOCSDIR%%/es/x763.html
 %%DOCSDIR%%/es/c105.html
 %%DOCSDIR%%/es/c18.html
@@ -61,52 +105,52 @@ share/locale/uk/LC_MESSAGES/tea.mo
 %%DOCSDIR%%/es/x733.html
 %%DOCSDIR%%/es/x738.html
 %%DOCSDIR%%/es/a787.html
-%%DOCSDIR%%/en/x737.html
-%%DOCSDIR%%/en/c101.html
+%%DOCSDIR%%/en/x752.html
+%%DOCSDIR%%/en/c105.html
 %%DOCSDIR%%/en/c17.html
-%%DOCSDIR%%/en/c192.html
-%%DOCSDIR%%/en/c205.html
-%%DOCSDIR%%/en/c226.html
-%%DOCSDIR%%/en/c290.html
+%%DOCSDIR%%/en/c199.html
+%%DOCSDIR%%/en/c212.html
+%%DOCSDIR%%/en/c233.html
+%%DOCSDIR%%/en/c297.html
 %%DOCSDIR%%/en/c32.html
-%%DOCSDIR%%/en/c568.html
-%%DOCSDIR%%/en/c594.html
-%%DOCSDIR%%/en/c60.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/c583.html
+%%DOCSDIR%%/en/c609.html
+%%DOCSDIR%%/en/c615.html
+%%DOCSDIR%%/en/c64.html
+%%DOCSDIR%%/en/c642.html
+%%DOCSDIR%%/en/c665.html
+%%DOCSDIR%%/en/c732.html
+%%DOCSDIR%%/en/c760.html
+%%DOCSDIR%%/en/c768.html
+%%DOCSDIR%%/en/c94.html
 %%DOCSDIR%%/en/index.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/x241.html
+%%DOCSDIR%%/en/x260.html
+%%DOCSDIR%%/en/x277.html
+%%DOCSDIR%%/en/x304.html
+%%DOCSDIR%%/en/x328.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/x348.html
+%%DOCSDIR%%/en/x358.html
+%%DOCSDIR%%/en/x365.html
+%%DOCSDIR%%/en/x376.html
+%%DOCSDIR%%/en/x386.html
+%%DOCSDIR%%/en/x485.html
+%%DOCSDIR%%/en/x491.html
+%%DOCSDIR%%/en/x503.html
+%%DOCSDIR%%/en/x552.html
+%%DOCSDIR%%/en/x561.html
+%%DOCSDIR%%/en/x573.html
+%%DOCSDIR%%/en/x678.html
 %%DOCSDIR%%/en/x695.html
-%%DOCSDIR%%/en/x698.html
-%%DOCSDIR%%/en/x702.html
-%%DOCSDIR%%/en/x708.html
+%%DOCSDIR%%/en/x699.html
+%%DOCSDIR%%/en/x706.html
+%%DOCSDIR%%/en/x710.html
 %%DOCSDIR%%/en/x713.html
-%%DOCSDIR%%/en/a757.html
+%%DOCSDIR%%/en/x717.html
+%%DOCSDIR%%/en/x723.html
+%%DOCSDIR%%/en/x728.html
+%%DOCSDIR%%/en/a796.html
 %%DOCSDIR%%/tea_doc.css
 %%DOCSDIR%%/AUTHORS
 %%DOCSDIR%%/ChangeLog