Update to 0.9.0

8 files changed, 138 insertions, 40 deletions

diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 547c4d784234..3dc42b8c88f5 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gedit
-PORTVERSION=	0.7.9
+PORTVERSION=	0.9.0
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/editors/gedit/distinfo b/editors/gedit/distinfo
index 3bb72bd0326f..4e66af47fe77 100644
--- a/editors/gedit/distinfo
+++ b/editors/gedit/distinfo
@@ -1 +1 @@
-MD5 (gedit-0.7.9.tar.gz) = 76c5627dcc0926f4e4ff0385bd1ca9c5
+MD5 (gedit-0.9.0.tar.gz) = 808088afa1ece2dffc284ed34cd1b4af
diff --git a/editors/gedit/files/patch-ao b/editors/gedit/files/patch-ao
index db937b166381..ee22ad354593 100644
--- a/editors/gedit/files/patch-ao
+++ b/editors/gedit/files/patch-ao
@@ -22,14 +22,14 @@
 -libconvert_la_LDFLAGS = 
 +libconvert_la_LDFLAGS = -avoid-version
  libconvert_la_LIBADD = 
---- plugins/diff/Makefile.in.orig	Sun Jun 11 03:00:15 2000
-+++ plugins/diff/Makefile.in	Sun Jun 11 11:15:29 2000
+--- plugins/diff/Makefile.in.orig	Sun Jul  9 17:12:13 2000
++++ plugins/diff/Makefile.in	Mon Jul 10 09:32:42 2000
 @@ -128,3 +128,3 @@
  
--INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-I$(includedir) 					-I$(top_srcdir) 					-I$(top_srcdir)/src					$(GNOME_INCLUDEDIR)
-+INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-I$(includedir) 					-I$(top_srcdir) 					-I$(top_srcdir)/src					$(GNOME_INCLUDEDIR)
+-INCLUDES =  	-I$(top_srcdir)/src					-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-DGEDIT_GLADEDIR=\""$(gladedir)"\"			-I$(includedir)						$(GNOME_INCLUDEDIR)
++INCLUDES =  	-I$(top_srcdir)/src					-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-DGEDIT_GLADEDIR=\""$(gladedir)"\"			-I$(includedir)						$(GNOME_INCLUDEDIR)
  
-@@ -138,3 +138,3 @@
+@@ -144,3 +144,3 @@
  LIBS = @LIBS@
 -libdiff_la_LDFLAGS = 
 +libdiff_la_LDFLAGS = -avoid-version
@@ -58,24 +58,36 @@
 -libreverse_la_LDFLAGS = 
 +libreverse_la_LDFLAGS = -avoid-version
  libreverse_la_LIBADD = 
---- plugins/sample/Makefile.in.orig	Sun Jun 11 03:00:18 2000
-+++ plugins/sample/Makefile.in	Sun Jun 11 11:15:45 2000
+--- plugins/sample/Makefile.in.orig	Sun Jul  9 17:12:15 2000
++++ plugins/sample/Makefile.in	Mon Jul 10 09:33:18 2000
 @@ -130,3 +130,3 @@
  
--INCLUDES = -I../../src 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-I$(includedir)		$(GNOME_INCLUDEDIR)
-+INCLUDES = -I../../src 	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-I$(includedir)		$(GNOME_INCLUDEDIR)
+-INCLUDES =  	-I$(top_srcdir)/src 					-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-I$(includedir)						$(GNOME_INCLUDEDIR)
++INCLUDES =  	-I$(top_srcdir)/src 					-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-I$(includedir)						$(GNOME_INCLUDEDIR)
  
 @@ -140,3 +140,3 @@
  LIBS = @LIBS@
 -libsample_la_LDFLAGS = 
 +libsample_la_LDFLAGS = -avoid-version
  libsample_la_LIBADD = 
---- plugins/time/Makefile.in.orig	Sun Jun 11 03:00:17 2000
-+++ plugins/time/Makefile.in	Sun Jun 11 11:15:49 2000
+--- plugins/shell_output/Makefile.in.orig	Sun Jul  9 17:12:19 2000
++++ plugins/shell_output/Makefile.in	Mon Jul 10 09:38:40 2000
+@@ -130,3 +130,3 @@
+ 
+-INCLUDES =  	-I$(top_srcdir)/src					-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-DGEDIT_GLADEDIR=\""$(gladedir)"\"			-I$(includedir)						$(GNOME_INCLUDEDIR)
++INCLUDES =  	-I$(top_srcdir)/src					-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-DGEDIT_GLADEDIR=\""$(gladedir)"\"			-I$(includedir)						$(GNOME_INCLUDEDIR)
+ 
+@@ -147,3 +147,3 @@
+ LIBS = @LIBS@
+-libshell_output_la_LDFLAGS = 
++libshell_output_la_LDFLAGS = -avoid-version
+ libshell_output_la_LIBADD = 
+--- plugins/time/Makefile.in.orig	Sun Jul  9 17:12:16 2000
++++ plugins/time/Makefile.in	Mon Jul 10 09:33:38 2000
 @@ -130,3 +130,3 @@
  
--INCLUDES = -I../../src 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-I$(includedir)		$(GNOME_INCLUDEDIR)
-+INCLUDES = -I../../src 	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-I$(includedir)		$(GNOME_INCLUDEDIR)
+-INCLUDES =  	-I$(top_srcdir)/src					-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-I$(includedir)		$(GNOME_INCLUDEDIR)
++INCLUDES =  	-I$(top_srcdir)/src					-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-I$(includedir)		$(GNOME_INCLUDEDIR)
  
 @@ -140,3 +140,3 @@
  LIBS = @LIBS@
diff --git a/editors/gedit/pkg-plist b/editors/gedit/pkg-plist
index 85115edd9bef..055ecc608473 100644
--- a/editors/gedit/pkg-plist
+++ b/editors/gedit/pkg-plist
@@ -5,25 +5,62 @@ lib/gedit/plugins/libdiff.so
 lib/gedit/plugins/libemail.so
 lib/gedit/plugins/libreverse.so
 lib/gedit/plugins/libsample.so
+lib/gedit/plugins/libshell_output.so
 lib/gedit/plugins/libtime.so
 share/gnome/apps/Applications/gedit.desktop
 share/gnome/gedit/glade/about.glade
+share/gnome/gedit/glade/browse.glade
 share/gnome/gedit/glade/convert.glade
+share/gnome/gedit/glade/diff.glade
 share/gnome/gedit/glade/email.glade
 share/gnome/gedit/glade/goto-line.glade
+share/gnome/gedit/glade/plugin-manager.glade
 share/gnome/gedit/glade/prefs.glade
+share/gnome/gedit/glade/program.glade
 share/gnome/gedit/glade/replace.glade
+share/gnome/gedit/glade/shell_output.glade
 share/gnome/help/gedit/C/authors.html
 share/gnome/help/gedit/C/bugs.html
 share/gnome/help/gedit/C/docbook.css
-share/gnome/help/gedit/C/figures/mainwin.png
-share/gnome/help/gedit/C/figures/preferences.png
-share/gnome/help/gedit/C/figures/toolbar.png
+share/gnome/help/gedit/C/faq.html
+share/gnome/help/gedit/C/images/browse.png
+share/gnome/help/gedit/C/images/convert.png
+share/gnome/help/gedit/C/images/diff.png
+share/gnome/help/gedit/C/images/email.png
+share/gnome/help/gedit/C/images/find.png
+share/gnome/help/gedit/C/images/gedit.png
+share/gnome/help/gedit/C/images/goto-line.png
+share/gnome/help/gedit/C/images/lynx.png
+share/gnome/help/gedit/C/images/manager.png
+share/gnome/help/gedit/C/images/mta.png
+share/gnome/help/gedit/C/images/prefs-documents.png
+share/gnome/help/gedit/C/images/prefs-font.png
+share/gnome/help/gedit/C/images/prefs-general.png
+share/gnome/help/gedit/C/images/prefs-paper.png
+share/gnome/help/gedit/C/images/prefs-printing.png
+share/gnome/help/gedit/C/images/print-preview.png
+share/gnome/help/gedit/C/images/print.png
+share/gnome/help/gedit/C/images/replace.png
+share/gnome/help/gedit/C/images/shell.png
+share/gnome/help/gedit/C/images/toolbar.png
 share/gnome/help/gedit/C/index.html
 share/gnome/help/gedit/C/license.html
-share/gnome/help/gedit/C/ln12.html
+share/gnome/help/gedit/C/ln10.html
+share/gnome/help/gedit/C/menus.html
 share/gnome/help/gedit/C/plugins.html
 share/gnome/help/gedit/C/prefs.html
+share/gnome/help/gedit/C/stylesheet-images/caution.gif
+share/gnome/help/gedit/C/stylesheet-images/home.gif
+share/gnome/help/gedit/C/stylesheet-images/important.gif
+share/gnome/help/gedit/C/stylesheet-images/next.gif
+share/gnome/help/gedit/C/stylesheet-images/note.gif
+share/gnome/help/gedit/C/stylesheet-images/prev.gif
+share/gnome/help/gedit/C/stylesheet-images/tip.gif
+share/gnome/help/gedit/C/stylesheet-images/toc-blank.gif
+share/gnome/help/gedit/C/stylesheet-images/toc-minus.gif
+share/gnome/help/gedit/C/stylesheet-images/toc-plus.gif
+share/gnome/help/gedit/C/stylesheet-images/up.gif
+share/gnome/help/gedit/C/stylesheet-images/warning.gif
 share/gnome/help/gedit/C/topic.dat
 share/gnome/help/gedit/C/usage.html
 share/gnome/mime-info/gedit.keys
@@ -58,7 +95,7 @@ share/locale/wa/LC_MESSAGES/gedit.mo
 share/locale/zh_CN.GB2312/LC_MESSAGES/gedit.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/gedit.mo
 @dirrm share/gnome/help/gedit/C/stylesheet-images
-@dirrm share/gnome/help/gedit/C/figures
+@dirrm share/gnome/help/gedit/C/images
 @dirrm share/gnome/help/gedit/C
 @dirrm share/gnome/help/gedit
 @dirrm share/gnome/gedit/glade
diff --git a/editors/gedit2/Makefile b/editors/gedit2/Makefile
index 547c4d784234..3dc42b8c88f5 100644
--- a/editors/gedit2/Makefile
+++ b/editors/gedit2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gedit
-PORTVERSION=	0.7.9
+PORTVERSION=	0.9.0
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/editors/gedit2/distinfo b/editors/gedit2/distinfo
index 3bb72bd0326f..4e66af47fe77 100644
--- a/editors/gedit2/distinfo
+++ b/editors/gedit2/distinfo
@@ -1 +1 @@
-MD5 (gedit-0.7.9.tar.gz) = 76c5627dcc0926f4e4ff0385bd1ca9c5
+MD5 (gedit-0.9.0.tar.gz) = 808088afa1ece2dffc284ed34cd1b4af
diff --git a/editors/gedit2/files/patch-ao b/editors/gedit2/files/patch-ao
index db937b166381..ee22ad354593 100644
--- a/editors/gedit2/files/patch-ao
+++ b/editors/gedit2/files/patch-ao
@@ -22,14 +22,14 @@
 -libconvert_la_LDFLAGS = 
 +libconvert_la_LDFLAGS = -avoid-version
  libconvert_la_LIBADD = 
---- plugins/diff/Makefile.in.orig	Sun Jun 11 03:00:15 2000
-+++ plugins/diff/Makefile.in	Sun Jun 11 11:15:29 2000
+--- plugins/diff/Makefile.in.orig	Sun Jul  9 17:12:13 2000
++++ plugins/diff/Makefile.in	Mon Jul 10 09:32:42 2000
 @@ -128,3 +128,3 @@
  
--INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-I$(includedir) 					-I$(top_srcdir) 					-I$(top_srcdir)/src					$(GNOME_INCLUDEDIR)
-+INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-I$(includedir) 					-I$(top_srcdir) 					-I$(top_srcdir)/src					$(GNOME_INCLUDEDIR)
+-INCLUDES =  	-I$(top_srcdir)/src					-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-DGEDIT_GLADEDIR=\""$(gladedir)"\"			-I$(includedir)						$(GNOME_INCLUDEDIR)
++INCLUDES =  	-I$(top_srcdir)/src					-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-DGEDIT_GLADEDIR=\""$(gladedir)"\"			-I$(includedir)						$(GNOME_INCLUDEDIR)
  
-@@ -138,3 +138,3 @@
+@@ -144,3 +144,3 @@
  LIBS = @LIBS@
 -libdiff_la_LDFLAGS = 
 +libdiff_la_LDFLAGS = -avoid-version
@@ -58,24 +58,36 @@
 -libreverse_la_LDFLAGS = 
 +libreverse_la_LDFLAGS = -avoid-version
  libreverse_la_LIBADD = 
---- plugins/sample/Makefile.in.orig	Sun Jun 11 03:00:18 2000
-+++ plugins/sample/Makefile.in	Sun Jun 11 11:15:45 2000
+--- plugins/sample/Makefile.in.orig	Sun Jul  9 17:12:15 2000
++++ plugins/sample/Makefile.in	Mon Jul 10 09:33:18 2000
 @@ -130,3 +130,3 @@
  
--INCLUDES = -I../../src 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-I$(includedir)		$(GNOME_INCLUDEDIR)
-+INCLUDES = -I../../src 	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-I$(includedir)		$(GNOME_INCLUDEDIR)
+-INCLUDES =  	-I$(top_srcdir)/src 					-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-I$(includedir)						$(GNOME_INCLUDEDIR)
++INCLUDES =  	-I$(top_srcdir)/src 					-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-I$(includedir)						$(GNOME_INCLUDEDIR)
  
 @@ -140,3 +140,3 @@
  LIBS = @LIBS@
 -libsample_la_LDFLAGS = 
 +libsample_la_LDFLAGS = -avoid-version
  libsample_la_LIBADD = 
---- plugins/time/Makefile.in.orig	Sun Jun 11 03:00:17 2000
-+++ plugins/time/Makefile.in	Sun Jun 11 11:15:49 2000
+--- plugins/shell_output/Makefile.in.orig	Sun Jul  9 17:12:19 2000
++++ plugins/shell_output/Makefile.in	Mon Jul 10 09:38:40 2000
+@@ -130,3 +130,3 @@
+ 
+-INCLUDES =  	-I$(top_srcdir)/src					-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-DGEDIT_GLADEDIR=\""$(gladedir)"\"			-I$(includedir)						$(GNOME_INCLUDEDIR)
++INCLUDES =  	-I$(top_srcdir)/src					-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-DGEDIT_GLADEDIR=\""$(gladedir)"\"			-I$(includedir)						$(GNOME_INCLUDEDIR)
+ 
+@@ -147,3 +147,3 @@
+ LIBS = @LIBS@
+-libshell_output_la_LDFLAGS = 
++libshell_output_la_LDFLAGS = -avoid-version
+ libshell_output_la_LIBADD = 
+--- plugins/time/Makefile.in.orig	Sun Jul  9 17:12:16 2000
++++ plugins/time/Makefile.in	Mon Jul 10 09:33:38 2000
 @@ -130,3 +130,3 @@
  
--INCLUDES = -I../../src 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-I$(includedir)		$(GNOME_INCLUDEDIR)
-+INCLUDES = -I../../src 	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-I$(includedir)		$(GNOME_INCLUDEDIR)
+-INCLUDES =  	-I$(top_srcdir)/src					-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-I$(includedir)		$(GNOME_INCLUDEDIR)
++INCLUDES =  	-I$(top_srcdir)/src					-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-I$(includedir)		$(GNOME_INCLUDEDIR)
  
 @@ -140,3 +140,3 @@
  LIBS = @LIBS@
diff --git a/editors/gedit2/pkg-plist b/editors/gedit2/pkg-plist
index 85115edd9bef..055ecc608473 100644
--- a/editors/gedit2/pkg-plist
+++ b/editors/gedit2/pkg-plist
@@ -5,25 +5,62 @@ lib/gedit/plugins/libdiff.so
 lib/gedit/plugins/libemail.so
 lib/gedit/plugins/libreverse.so
 lib/gedit/plugins/libsample.so
+lib/gedit/plugins/libshell_output.so
 lib/gedit/plugins/libtime.so
 share/gnome/apps/Applications/gedit.desktop
 share/gnome/gedit/glade/about.glade
+share/gnome/gedit/glade/browse.glade
 share/gnome/gedit/glade/convert.glade
+share/gnome/gedit/glade/diff.glade
 share/gnome/gedit/glade/email.glade
 share/gnome/gedit/glade/goto-line.glade
+share/gnome/gedit/glade/plugin-manager.glade
 share/gnome/gedit/glade/prefs.glade
+share/gnome/gedit/glade/program.glade
 share/gnome/gedit/glade/replace.glade
+share/gnome/gedit/glade/shell_output.glade
 share/gnome/help/gedit/C/authors.html
 share/gnome/help/gedit/C/bugs.html
 share/gnome/help/gedit/C/docbook.css
-share/gnome/help/gedit/C/figures/mainwin.png
-share/gnome/help/gedit/C/figures/preferences.png
-share/gnome/help/gedit/C/figures/toolbar.png
+share/gnome/help/gedit/C/faq.html
+share/gnome/help/gedit/C/images/browse.png
+share/gnome/help/gedit/C/images/convert.png
+share/gnome/help/gedit/C/images/diff.png
+share/gnome/help/gedit/C/images/email.png
+share/gnome/help/gedit/C/images/find.png
+share/gnome/help/gedit/C/images/gedit.png
+share/gnome/help/gedit/C/images/goto-line.png
+share/gnome/help/gedit/C/images/lynx.png
+share/gnome/help/gedit/C/images/manager.png
+share/gnome/help/gedit/C/images/mta.png
+share/gnome/help/gedit/C/images/prefs-documents.png
+share/gnome/help/gedit/C/images/prefs-font.png
+share/gnome/help/gedit/C/images/prefs-general.png
+share/gnome/help/gedit/C/images/prefs-paper.png
+share/gnome/help/gedit/C/images/prefs-printing.png
+share/gnome/help/gedit/C/images/print-preview.png
+share/gnome/help/gedit/C/images/print.png
+share/gnome/help/gedit/C/images/replace.png
+share/gnome/help/gedit/C/images/shell.png
+share/gnome/help/gedit/C/images/toolbar.png
 share/gnome/help/gedit/C/index.html
 share/gnome/help/gedit/C/license.html
-share/gnome/help/gedit/C/ln12.html
+share/gnome/help/gedit/C/ln10.html
+share/gnome/help/gedit/C/menus.html
 share/gnome/help/gedit/C/plugins.html
 share/gnome/help/gedit/C/prefs.html
+share/gnome/help/gedit/C/stylesheet-images/caution.gif
+share/gnome/help/gedit/C/stylesheet-images/home.gif
+share/gnome/help/gedit/C/stylesheet-images/important.gif
+share/gnome/help/gedit/C/stylesheet-images/next.gif
+share/gnome/help/gedit/C/stylesheet-images/note.gif
+share/gnome/help/gedit/C/stylesheet-images/prev.gif
+share/gnome/help/gedit/C/stylesheet-images/tip.gif
+share/gnome/help/gedit/C/stylesheet-images/toc-blank.gif
+share/gnome/help/gedit/C/stylesheet-images/toc-minus.gif
+share/gnome/help/gedit/C/stylesheet-images/toc-plus.gif
+share/gnome/help/gedit/C/stylesheet-images/up.gif
+share/gnome/help/gedit/C/stylesheet-images/warning.gif
 share/gnome/help/gedit/C/topic.dat
 share/gnome/help/gedit/C/usage.html
 share/gnome/mime-info/gedit.keys
@@ -58,7 +95,7 @@ share/locale/wa/LC_MESSAGES/gedit.mo
 share/locale/zh_CN.GB2312/LC_MESSAGES/gedit.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/gedit.mo
 @dirrm share/gnome/help/gedit/C/stylesheet-images
-@dirrm share/gnome/help/gedit/C/figures
+@dirrm share/gnome/help/gedit/C/images
 @dirrm share/gnome/help/gedit/C
 @dirrm share/gnome/help/gedit
 @dirrm share/gnome/gedit/glade