Update to 0.7.9

10 files changed, 234 insertions, 22 deletions

diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 673ca4513027..21bb2991ebc2 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gedit
-PORTVERSION=	0.7.0
+PORTVERSION=	0.7.9
 CATEGORIES=	editors gnome
 MASTER_SITES=	http://download.sourceforge.net/gedit/
 
diff --git a/editors/gedit/distinfo b/editors/gedit/distinfo
index 0e1a3f810c68..3bb72bd0326f 100644
--- a/editors/gedit/distinfo
+++ b/editors/gedit/distinfo
@@ -1 +1 @@
-MD5 (gedit-0.7.0.tar.gz) = b9327f8cb53c3b79eb110cd492cf16e8
+MD5 (gedit-0.7.9.tar.gz) = 76c5627dcc0926f4e4ff0385bd1ca9c5
diff --git a/editors/gedit/files/patch-an b/editors/gedit/files/patch-an
new file mode 100644
index 000000000000..b78c1188906c
--- /dev/null
+++ b/editors/gedit/files/patch-an
@@ -0,0 +1,8 @@
+--- app-docs.make.orig	Fri May  5 14:35:51 2000
++++ app-docs.make	Sun Jun 11 11:11:24 2000
+@@ -1,4 +1,4 @@
+-helpdir = $(datadir)/gnome/help/$(app)/$(lang)
++helpdir = $(datadir)/help/$(app)/$(lang)
+ help_DATA = \
+ 	index.html	\
+ 	topic.dat	\
diff --git a/editors/gedit/files/patch-ao b/editors/gedit/files/patch-ao
new file mode 100644
index 000000000000..db937b166381
--- /dev/null
+++ b/editors/gedit/files/patch-ao
@@ -0,0 +1,84 @@
+--- plugins/browse/Makefile.in.orig	Sun Jun 11 03:00:15 2000
++++ plugins/browse/Makefile.in	Sun Jun 11 11:15:17 2000
+@@ -128,3 +128,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)
+ 
+@@ -138,3 +138,3 @@
+ LIBS = @LIBS@
+-libbrowse_la_LDFLAGS = 
++libbrowse_la_LDFLAGS = -avoid-version
+ libbrowse_la_LIBADD = 
+--- plugins/convert/Makefile.in.orig	Sun Jun 11 03:00:17 2000
++++ plugins/convert/Makefile.in	Sun Jun 11 11:15:25 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@
+-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
+@@ -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)
+ 
+@@ -138,3 +138,3 @@
+ LIBS = @LIBS@
+-libdiff_la_LDFLAGS = 
++libdiff_la_LDFLAGS = -avoid-version
+ libdiff_la_LIBADD = 
+--- plugins/email/Makefile.in.orig	Sun Jun 11 03:00:16 2000
++++ plugins/email/Makefile.in	Sun Jun 11 11:15:33 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@
+-libemail_la_LDFLAGS = 
++libemail_la_LDFLAGS = -avoid-version
+ libemail_la_LIBADD = 
+--- plugins/reverse/Makefile.in.orig	Sun Jun 11 03:00:18 2000
++++ plugins/reverse/Makefile.in	Sun Jun 11 11:15:40 2000
+@@ -130,3 +130,3 @@
+ 
+-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@
+-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
+@@ -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)
+ 
+@@ -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
+@@ -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)
+ 
+@@ -140,3 +140,3 @@
+ LIBS = @LIBS@
+-libtime_la_LDFLAGS = 
++libtime_la_LDFLAGS = -avoid-version
+ libtime_la_LIBADD = 
diff --git a/editors/gedit/pkg-plist b/editors/gedit/pkg-plist
index c1f48c9ba3d9..85115edd9bef 100644
--- a/editors/gedit/pkg-plist
+++ b/editors/gedit/pkg-plist
@@ -1,28 +1,41 @@
 bin/gedit
+lib/gedit/plugins/libbrowse.so
+lib/gedit/plugins/libconvert.so
 lib/gedit/plugins/libdiff.so
 lib/gedit/plugins/libemail.so
+lib/gedit/plugins/libreverse.so
+lib/gedit/plugins/libsample.so
 lib/gedit/plugins/libtime.so
 share/gnome/apps/Applications/gedit.desktop
 share/gnome/gedit/glade/about.glade
+share/gnome/gedit/glade/convert.glade
 share/gnome/gedit/glade/email.glade
-share/gnome/gedit/glade/find-line.glade
+share/gnome/gedit/glade/goto-line.glade
 share/gnome/gedit/glade/prefs.glade
 share/gnome/gedit/glade/replace.glade
-share/gnome/gedit/glade/search.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/index.html
+share/gnome/help/gedit/C/license.html
+share/gnome/help/gedit/C/ln12.html
+share/gnome/help/gedit/C/plugins.html
+share/gnome/help/gedit/C/prefs.html
 share/gnome/help/gedit/C/topic.dat
-share/gnome/help/gedit/no/index.html
-share/gnome/help/gedit/no/topic.dat
-share/gnome/help/gedit/uk/index.html
-share/gnome/help/gedit/uk/topic.dat
+share/gnome/help/gedit/C/usage.html
 share/gnome/mime-info/gedit.keys
+share/gnome/pixmaps/gedit-icon.xpm
 share/gnome/pixmaps/gedit-logo.png
-share/gnome/pixmaps/gnome-gedit.png
+share/locale/ca/LC_MESSAGES/gedit.mo
 share/locale/cs/LC_MESSAGES/gedit.mo
 share/locale/da/LC_MESSAGES/gedit.mo
 share/locale/de/LC_MESSAGES/gedit.mo
 share/locale/el/LC_MESSAGES/gedit.mo
 share/locale/es/LC_MESSAGES/gedit.mo
+share/locale/fi/LC_MESSAGES/gedit.mo
 share/locale/fr/LC_MESSAGES/gedit.mo
 share/locale/ga/LC_MESSAGES/gedit.mo
 share/locale/gl/LC_MESSAGES/gedit.mo
@@ -37,14 +50,15 @@ share/locale/pl/LC_MESSAGES/gedit.mo
 share/locale/pt/LC_MESSAGES/gedit.mo
 share/locale/pt_BR/LC_MESSAGES/gedit.mo
 share/locale/ru/LC_MESSAGES/gedit.mo
+share/locale/sl/LC_MESSAGES/gedit.mo
 share/locale/sv/LC_MESSAGES/gedit.mo
 share/locale/tr/LC_MESSAGES/gedit.mo
 share/locale/uk/LC_MESSAGES/gedit.mo
 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/uk
-@dirrm share/gnome/help/gedit/no
+@dirrm share/gnome/help/gedit/C/stylesheet-images
+@dirrm share/gnome/help/gedit/C/figures
 @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 673ca4513027..21bb2991ebc2 100644
--- a/editors/gedit2/Makefile
+++ b/editors/gedit2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gedit
-PORTVERSION=	0.7.0
+PORTVERSION=	0.7.9
 CATEGORIES=	editors gnome
 MASTER_SITES=	http://download.sourceforge.net/gedit/
 
diff --git a/editors/gedit2/distinfo b/editors/gedit2/distinfo
index 0e1a3f810c68..3bb72bd0326f 100644
--- a/editors/gedit2/distinfo
+++ b/editors/gedit2/distinfo
@@ -1 +1 @@
-MD5 (gedit-0.7.0.tar.gz) = b9327f8cb53c3b79eb110cd492cf16e8
+MD5 (gedit-0.7.9.tar.gz) = 76c5627dcc0926f4e4ff0385bd1ca9c5
diff --git a/editors/gedit2/files/patch-an b/editors/gedit2/files/patch-an
new file mode 100644
index 000000000000..b78c1188906c
--- /dev/null
+++ b/editors/gedit2/files/patch-an
@@ -0,0 +1,8 @@
+--- app-docs.make.orig	Fri May  5 14:35:51 2000
++++ app-docs.make	Sun Jun 11 11:11:24 2000
+@@ -1,4 +1,4 @@
+-helpdir = $(datadir)/gnome/help/$(app)/$(lang)
++helpdir = $(datadir)/help/$(app)/$(lang)
+ help_DATA = \
+ 	index.html	\
+ 	topic.dat	\
diff --git a/editors/gedit2/files/patch-ao b/editors/gedit2/files/patch-ao
new file mode 100644
index 000000000000..db937b166381
--- /dev/null
+++ b/editors/gedit2/files/patch-ao
@@ -0,0 +1,84 @@
+--- plugins/browse/Makefile.in.orig	Sun Jun 11 03:00:15 2000
++++ plugins/browse/Makefile.in	Sun Jun 11 11:15:17 2000
+@@ -128,3 +128,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)
+ 
+@@ -138,3 +138,3 @@
+ LIBS = @LIBS@
+-libbrowse_la_LDFLAGS = 
++libbrowse_la_LDFLAGS = -avoid-version
+ libbrowse_la_LIBADD = 
+--- plugins/convert/Makefile.in.orig	Sun Jun 11 03:00:17 2000
++++ plugins/convert/Makefile.in	Sun Jun 11 11:15:25 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@
+-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
+@@ -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)
+ 
+@@ -138,3 +138,3 @@
+ LIBS = @LIBS@
+-libdiff_la_LDFLAGS = 
++libdiff_la_LDFLAGS = -avoid-version
+ libdiff_la_LIBADD = 
+--- plugins/email/Makefile.in.orig	Sun Jun 11 03:00:16 2000
++++ plugins/email/Makefile.in	Sun Jun 11 11:15:33 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@
+-libemail_la_LDFLAGS = 
++libemail_la_LDFLAGS = -avoid-version
+ libemail_la_LIBADD = 
+--- plugins/reverse/Makefile.in.orig	Sun Jun 11 03:00:18 2000
++++ plugins/reverse/Makefile.in	Sun Jun 11 11:15:40 2000
+@@ -130,3 +130,3 @@
+ 
+-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@
+-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
+@@ -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)
+ 
+@@ -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
+@@ -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)
+ 
+@@ -140,3 +140,3 @@
+ LIBS = @LIBS@
+-libtime_la_LDFLAGS = 
++libtime_la_LDFLAGS = -avoid-version
+ libtime_la_LIBADD = 
diff --git a/editors/gedit2/pkg-plist b/editors/gedit2/pkg-plist
index c1f48c9ba3d9..85115edd9bef 100644
--- a/editors/gedit2/pkg-plist
+++ b/editors/gedit2/pkg-plist
@@ -1,28 +1,41 @@
 bin/gedit
+lib/gedit/plugins/libbrowse.so
+lib/gedit/plugins/libconvert.so
 lib/gedit/plugins/libdiff.so
 lib/gedit/plugins/libemail.so
+lib/gedit/plugins/libreverse.so
+lib/gedit/plugins/libsample.so
 lib/gedit/plugins/libtime.so
 share/gnome/apps/Applications/gedit.desktop
 share/gnome/gedit/glade/about.glade
+share/gnome/gedit/glade/convert.glade
 share/gnome/gedit/glade/email.glade
-share/gnome/gedit/glade/find-line.glade
+share/gnome/gedit/glade/goto-line.glade
 share/gnome/gedit/glade/prefs.glade
 share/gnome/gedit/glade/replace.glade
-share/gnome/gedit/glade/search.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/index.html
+share/gnome/help/gedit/C/license.html
+share/gnome/help/gedit/C/ln12.html
+share/gnome/help/gedit/C/plugins.html
+share/gnome/help/gedit/C/prefs.html
 share/gnome/help/gedit/C/topic.dat
-share/gnome/help/gedit/no/index.html
-share/gnome/help/gedit/no/topic.dat
-share/gnome/help/gedit/uk/index.html
-share/gnome/help/gedit/uk/topic.dat
+share/gnome/help/gedit/C/usage.html
 share/gnome/mime-info/gedit.keys
+share/gnome/pixmaps/gedit-icon.xpm
 share/gnome/pixmaps/gedit-logo.png
-share/gnome/pixmaps/gnome-gedit.png
+share/locale/ca/LC_MESSAGES/gedit.mo
 share/locale/cs/LC_MESSAGES/gedit.mo
 share/locale/da/LC_MESSAGES/gedit.mo
 share/locale/de/LC_MESSAGES/gedit.mo
 share/locale/el/LC_MESSAGES/gedit.mo
 share/locale/es/LC_MESSAGES/gedit.mo
+share/locale/fi/LC_MESSAGES/gedit.mo
 share/locale/fr/LC_MESSAGES/gedit.mo
 share/locale/ga/LC_MESSAGES/gedit.mo
 share/locale/gl/LC_MESSAGES/gedit.mo
@@ -37,14 +50,15 @@ share/locale/pl/LC_MESSAGES/gedit.mo
 share/locale/pt/LC_MESSAGES/gedit.mo
 share/locale/pt_BR/LC_MESSAGES/gedit.mo
 share/locale/ru/LC_MESSAGES/gedit.mo
+share/locale/sl/LC_MESSAGES/gedit.mo
 share/locale/sv/LC_MESSAGES/gedit.mo
 share/locale/tr/LC_MESSAGES/gedit.mo
 share/locale/uk/LC_MESSAGES/gedit.mo
 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/uk
-@dirrm share/gnome/help/gedit/no
+@dirrm share/gnome/help/gedit/C/stylesheet-images
+@dirrm share/gnome/help/gedit/C/figures
 @dirrm share/gnome/help/gedit/C
 @dirrm share/gnome/help/gedit
 @dirrm share/gnome/gedit/glade