8 files changed, 90 insertions, 74 deletions

diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 050662bcdba2..ac2f8dc552aa 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gedit
-PORTVERSION=	0.9.6
+PORTVERSION=	0.9.7
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gedit
@@ -16,7 +16,7 @@ MAINTAINER=	gnome@FreeBSD.org
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	yes
-USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
diff --git a/editors/gedit/distinfo b/editors/gedit/distinfo
index 878143fd9a3f..ce822916cf55 100644
--- a/editors/gedit/distinfo
+++ b/editors/gedit/distinfo
@@ -1 +1 @@
-MD5 (gedit-0.9.6.tar.gz) = 6050a8d7288aef81727736e935f7fe6a
+MD5 (gedit-0.9.7.tar.gz) = a02667dd67e46efdbdb6f875442506b1
diff --git a/editors/gedit/files/patch-ltmain.sh b/editors/gedit/files/patch-ltmain.sh
new file mode 100644
index 000000000000..33bc7983f107
--- /dev/null
+++ b/editors/gedit/files/patch-ltmain.sh
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- ltmain.sh	2001/08/27 09:51:26	1.1
++++ ltmain.sh	2001/08/27 09:51:42
+@@ -4175,10 +4175,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/editors/gedit/pkg-plist b/editors/gedit/pkg-plist
index cac481f4245d..11eced353199 100644
--- a/editors/gedit/pkg-plist
+++ b/editors/gedit/pkg-plist
@@ -1,17 +1,36 @@
 bin/gedit
+lib/gedit/plugins/libasciitable.a
+lib/gedit/plugins/libasciitable.so
+lib/gedit/plugins/libasciitable.so.0
+lib/gedit/plugins/libbrowse.a
 lib/gedit/plugins/libbrowse.so
+lib/gedit/plugins/libconvert.a
 lib/gedit/plugins/libconvert.so
+lib/gedit/plugins/libdiff.a
 lib/gedit/plugins/libdiff.so
+lib/gedit/plugins/libdocinfo.a
+lib/gedit/plugins/libdocinfo.so
+lib/gedit/plugins/libdocinfo.so.0
+lib/gedit/plugins/libemail.a
 lib/gedit/plugins/libemail.so
+lib/gedit/plugins/libreverse.a
 lib/gedit/plugins/libreverse.so
+lib/gedit/plugins/libsample.a
 lib/gedit/plugins/libsample.so
+lib/gedit/plugins/libshell_output.a
 lib/gedit/plugins/libshell_output.so
+lib/gedit/plugins/libsort.a
+lib/gedit/plugins/libsort.so
+lib/gedit/plugins/libsort.so.0
+lib/gedit/plugins/libtime.a
 lib/gedit/plugins/libtime.so
 share/gnome/apps/Applications/gedit.desktop
 share/gnome/gedit/glade/about.glade
+share/gnome/gedit/glade/asciitable.glade
 share/gnome/gedit/glade/browse.glade
 share/gnome/gedit/glade/convert.glade
 share/gnome/gedit/glade/diff.glade
+share/gnome/gedit/glade/docinfo.glade
 share/gnome/gedit/glade/email.glade
 share/gnome/gedit/glade/goto-line.glade
 share/gnome/gedit/glade/plugin-manager.glade
@@ -19,8 +38,8 @@ 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/gedit/glade/sort.glade
 share/gnome/gedit/glade/uri.glade
-share/gnome/help/gedit/C/docbook.css
 share/gnome/help/gedit/C/images/browse.png
 share/gnome/help/gedit/C/images/convert.png
 share/gnome/help/gedit/C/images/diff.png
@@ -41,23 +60,7 @@ 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/plugins.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/help/gedit/ja/docbook.css
 share/gnome/help/gedit/ja/images/browse.png
 share/gnome/help/gedit/ja/images/convert.png
 share/gnome/help/gedit/ja/images/diff.png
@@ -78,22 +81,7 @@ share/gnome/help/gedit/ja/images/print.png
 share/gnome/help/gedit/ja/images/replace.png
 share/gnome/help/gedit/ja/images/shell.png
 share/gnome/help/gedit/ja/images/toolbar.png
-share/gnome/help/gedit/ja/index.html
-share/gnome/help/gedit/ja/plugins.html
-share/gnome/help/gedit/ja/stylesheet-images/caution.gif
-share/gnome/help/gedit/ja/stylesheet-images/home.gif
-share/gnome/help/gedit/ja/stylesheet-images/important.gif
-share/gnome/help/gedit/ja/stylesheet-images/next.gif
-share/gnome/help/gedit/ja/stylesheet-images/note.gif
-share/gnome/help/gedit/ja/stylesheet-images/prev.gif
-share/gnome/help/gedit/ja/stylesheet-images/tip.gif
-share/gnome/help/gedit/ja/stylesheet-images/toc-blank.gif
-share/gnome/help/gedit/ja/stylesheet-images/toc-minus.gif
-share/gnome/help/gedit/ja/stylesheet-images/toc-plus.gif
-share/gnome/help/gedit/ja/stylesheet-images/up.gif
-share/gnome/help/gedit/ja/stylesheet-images/warning.gif
 share/gnome/help/gedit/ja/topic.dat
-share/gnome/help/gedit/ja/usage.html
 share/gnome/mime-info/gedit.keys
 share/gnome/pixmaps/gedit-icon.png
 share/gnome/pixmaps/gedit-logo.png
@@ -114,6 +102,7 @@ share/locale/ja/LC_MESSAGES/gedit.mo
 share/locale/ko/LC_MESSAGES/gedit.mo
 share/locale/lt/LC_MESSAGES/gedit.mo
 share/locale/nl/LC_MESSAGES/gedit.mo
+share/locale/nn/LC_MESSAGES/gedit.mo
 share/locale/no/LC_MESSAGES/gedit.mo
 share/locale/pl/LC_MESSAGES/gedit.mo
 share/locale/pt/LC_MESSAGES/gedit.mo
@@ -122,11 +111,12 @@ share/locale/ru/LC_MESSAGES/gedit.mo
 share/locale/sk/LC_MESSAGES/gedit.mo
 share/locale/sl/LC_MESSAGES/gedit.mo
 share/locale/sv/LC_MESSAGES/gedit.mo
+share/locale/ta/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
+share/locale/zh_CN/LC_MESSAGES/gedit.mo
+share/locale/zh_TW/LC_MESSAGES/gedit.mo
 @dirrm share/gnome/help/gedit/ja/stylesheet-images
 @dirrm share/gnome/help/gedit/ja/images
 @dirrm share/gnome/help/gedit/ja
diff --git a/editors/gedit2/Makefile b/editors/gedit2/Makefile
index 050662bcdba2..ac2f8dc552aa 100644
--- a/editors/gedit2/Makefile
+++ b/editors/gedit2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gedit
-PORTVERSION=	0.9.6
+PORTVERSION=	0.9.7
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gedit
@@ -16,7 +16,7 @@ MAINTAINER=	gnome@FreeBSD.org
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	yes
-USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
diff --git a/editors/gedit2/distinfo b/editors/gedit2/distinfo
index 878143fd9a3f..ce822916cf55 100644
--- a/editors/gedit2/distinfo
+++ b/editors/gedit2/distinfo
@@ -1 +1 @@
-MD5 (gedit-0.9.6.tar.gz) = 6050a8d7288aef81727736e935f7fe6a
+MD5 (gedit-0.9.7.tar.gz) = a02667dd67e46efdbdb6f875442506b1
diff --git a/editors/gedit2/files/patch-ltmain.sh b/editors/gedit2/files/patch-ltmain.sh
new file mode 100644
index 000000000000..33bc7983f107
--- /dev/null
+++ b/editors/gedit2/files/patch-ltmain.sh
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- ltmain.sh	2001/08/27 09:51:26	1.1
++++ ltmain.sh	2001/08/27 09:51:42
+@@ -4175,10 +4175,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/editors/gedit2/pkg-plist b/editors/gedit2/pkg-plist
index cac481f4245d..11eced353199 100644
--- a/editors/gedit2/pkg-plist
+++ b/editors/gedit2/pkg-plist
@@ -1,17 +1,36 @@
 bin/gedit
+lib/gedit/plugins/libasciitable.a
+lib/gedit/plugins/libasciitable.so
+lib/gedit/plugins/libasciitable.so.0
+lib/gedit/plugins/libbrowse.a
 lib/gedit/plugins/libbrowse.so
+lib/gedit/plugins/libconvert.a
 lib/gedit/plugins/libconvert.so
+lib/gedit/plugins/libdiff.a
 lib/gedit/plugins/libdiff.so
+lib/gedit/plugins/libdocinfo.a
+lib/gedit/plugins/libdocinfo.so
+lib/gedit/plugins/libdocinfo.so.0
+lib/gedit/plugins/libemail.a
 lib/gedit/plugins/libemail.so
+lib/gedit/plugins/libreverse.a
 lib/gedit/plugins/libreverse.so
+lib/gedit/plugins/libsample.a
 lib/gedit/plugins/libsample.so
+lib/gedit/plugins/libshell_output.a
 lib/gedit/plugins/libshell_output.so
+lib/gedit/plugins/libsort.a
+lib/gedit/plugins/libsort.so
+lib/gedit/plugins/libsort.so.0
+lib/gedit/plugins/libtime.a
 lib/gedit/plugins/libtime.so
 share/gnome/apps/Applications/gedit.desktop
 share/gnome/gedit/glade/about.glade
+share/gnome/gedit/glade/asciitable.glade
 share/gnome/gedit/glade/browse.glade
 share/gnome/gedit/glade/convert.glade
 share/gnome/gedit/glade/diff.glade
+share/gnome/gedit/glade/docinfo.glade
 share/gnome/gedit/glade/email.glade
 share/gnome/gedit/glade/goto-line.glade
 share/gnome/gedit/glade/plugin-manager.glade
@@ -19,8 +38,8 @@ 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/gedit/glade/sort.glade
 share/gnome/gedit/glade/uri.glade
-share/gnome/help/gedit/C/docbook.css
 share/gnome/help/gedit/C/images/browse.png
 share/gnome/help/gedit/C/images/convert.png
 share/gnome/help/gedit/C/images/diff.png
@@ -41,23 +60,7 @@ 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/plugins.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/help/gedit/ja/docbook.css
 share/gnome/help/gedit/ja/images/browse.png
 share/gnome/help/gedit/ja/images/convert.png
 share/gnome/help/gedit/ja/images/diff.png
@@ -78,22 +81,7 @@ share/gnome/help/gedit/ja/images/print.png
 share/gnome/help/gedit/ja/images/replace.png
 share/gnome/help/gedit/ja/images/shell.png
 share/gnome/help/gedit/ja/images/toolbar.png
-share/gnome/help/gedit/ja/index.html
-share/gnome/help/gedit/ja/plugins.html
-share/gnome/help/gedit/ja/stylesheet-images/caution.gif
-share/gnome/help/gedit/ja/stylesheet-images/home.gif
-share/gnome/help/gedit/ja/stylesheet-images/important.gif
-share/gnome/help/gedit/ja/stylesheet-images/next.gif
-share/gnome/help/gedit/ja/stylesheet-images/note.gif
-share/gnome/help/gedit/ja/stylesheet-images/prev.gif
-share/gnome/help/gedit/ja/stylesheet-images/tip.gif
-share/gnome/help/gedit/ja/stylesheet-images/toc-blank.gif
-share/gnome/help/gedit/ja/stylesheet-images/toc-minus.gif
-share/gnome/help/gedit/ja/stylesheet-images/toc-plus.gif
-share/gnome/help/gedit/ja/stylesheet-images/up.gif
-share/gnome/help/gedit/ja/stylesheet-images/warning.gif
 share/gnome/help/gedit/ja/topic.dat
-share/gnome/help/gedit/ja/usage.html
 share/gnome/mime-info/gedit.keys
 share/gnome/pixmaps/gedit-icon.png
 share/gnome/pixmaps/gedit-logo.png
@@ -114,6 +102,7 @@ share/locale/ja/LC_MESSAGES/gedit.mo
 share/locale/ko/LC_MESSAGES/gedit.mo
 share/locale/lt/LC_MESSAGES/gedit.mo
 share/locale/nl/LC_MESSAGES/gedit.mo
+share/locale/nn/LC_MESSAGES/gedit.mo
 share/locale/no/LC_MESSAGES/gedit.mo
 share/locale/pl/LC_MESSAGES/gedit.mo
 share/locale/pt/LC_MESSAGES/gedit.mo
@@ -122,11 +111,12 @@ share/locale/ru/LC_MESSAGES/gedit.mo
 share/locale/sk/LC_MESSAGES/gedit.mo
 share/locale/sl/LC_MESSAGES/gedit.mo
 share/locale/sv/LC_MESSAGES/gedit.mo
+share/locale/ta/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
+share/locale/zh_CN/LC_MESSAGES/gedit.mo
+share/locale/zh_TW/LC_MESSAGES/gedit.mo
 @dirrm share/gnome/help/gedit/ja/stylesheet-images
 @dirrm share/gnome/help/gedit/ja/images
 @dirrm share/gnome/help/gedit/ja