Update to 2.15.4.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6548 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 70 insertions, 94 deletions

diff --git a/editors/gedit-plugins/Makefile b/editors/gedit-plugins/Makefile
index 96e22cdc3..2d45552bb 100644
--- a/editors/gedit-plugins/Makefile
+++ b/editors/gedit-plugins/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/editors/gedit-plugins/Makefile,v 1.13 2006/06/11 19:11:10 marcus Exp $
+#   $MCom: ports/editors/gedit-plugins/Makefile,v 1.14 2006/06/11 19:59:46 marcus Exp $
 #
 
 PORTNAME=	gedit-plugins
-PORTVERSION=	2.15.3
-PORTREVISION=	1
+PORTVERSION=	2.15.4
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/editors/gedit-plugins/distinfo b/editors/gedit-plugins/distinfo
index 1ded506a4..a8de9395b 100644
--- a/editors/gedit-plugins/distinfo
+++ b/editors/gedit-plugins/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gedit-plugins-2.15.3.tar.bz2) = 4182e0b3b522cb35e5348ce00c8aaa1d
-SHA256 (gnome2/gedit-plugins-2.15.3.tar.bz2) = 00ae3061a3fc388dfd02ed4106bec9f48973bbcda4a3320d0fb5136232b5e123
-SIZE (gnome2/gedit-plugins-2.15.3.tar.bz2) = 286307
+MD5 (gnome2/gedit-plugins-2.15.4.tar.bz2) = 9fd2264eab6c4b7b3baa870bf3a573e5
+SHA256 (gnome2/gedit-plugins-2.15.4.tar.bz2) = 5a57b20b33da94bde278800818bea2b8d98bab4d027acc0d4c112469669fcf75
+SIZE (gnome2/gedit-plugins-2.15.4.tar.bz2) = 583212
diff --git a/editors/gedit-plugins/files/patch-configure b/editors/gedit-plugins/files/patch-configure
index 36d6a0198..020063197 100644
--- a/editors/gedit-plugins/files/patch-configure
+++ b/editors/gedit-plugins/files/patch-configure
@@ -1,94 +1,11 @@
---- configure.orig	Sun Jun 11 15:53:52 2006
-+++ configure	Sun Jun 11 15:58:59 2006
-@@ -22866,7 +22866,7 @@ disabled_plugins=
- # ================================================================
- # Plugin specific checks
- # ================================================================
--function check_plugin_defined() {
-+check_plugin_defined() {
- 	if echo "$2" | egrep "\b($1)\b" > /dev/null;
- 	then
- 		return 1
-@@ -22875,17 +22875,17 @@ function check_plugin_defined() {
- 	fi
- }
- 
--function plugin_defined() {
-+plugin_defined() {
- 	check_plugin_defined "$1" "$PLUGINS"
- 	return $?
- }
- 
--function plugin_defined_explicit() {
-+plugin_defined_explicit() {
- 	check_plugin_defined "$1" "$explicit_plugins"
- 	return $?
- }
- 
--function undef_plugin() {
-+undef_plugin() {
- 	if test -z "$disabled_plugins"
- 	then
- 		disabled_plugins="$1 ($2)"
-@@ -22893,13 +22893,13 @@ function undef_plugin() {
+--- configure.orig	Tue Jul 11 02:29:20 2006
++++ configure	Tue Jul 11 02:29:48 2006
+@@ -22893,7 +22893,7 @@ undef_plugin() {
  		disabled_plugins="$disabled_plugins, $1 ($2)"
  	fi
  
--	PLUGINS=$(echo "$PLUGINS" | sed "s/\(\W\|^\)$1\b//")
-+	PLUGINS=$(echo "$PLUGINS" | sed "s/[^[:alnum:]]$1[[:space:]]\{1,\}/ /" | sed "s/[^[:alnum:]]$1$//" | sed "s/^$1[[:space:]]\{1,\}/ /")
+-	PLUGINS=$(echo "$PLUGINS" | sed -e "s/^a-zA-Z0-9_$1 \t\r\n\f\{1,\}/ /" -e "s/^a-zA-Z0-9_$1$//" -e "s/^$1 \t\r\n\f\{1,\}//")
++	PLUGINS=$(echo "$PLUGINS" | sed -e "s/[^a-zA-Z0-9_]$1[ \t\r\n\f]\{1,\}/ /" -e "s/[^a-zA-Z0-9_]$1$//" -e "s/^$1[ \t\r\n\f]\{1,\}//")
  }
  
  # ================================================================
- # disable all python plugins if there is no python support
- # ================================================================
--if test "x$enable_python" == "xno"
-+if test "x$enable_python" = "xno"
- then
- 	for pl in $PYTHON_ALL_PLUGINS
- 	do
-@@ -22911,7 +22911,7 @@ fi
- # gucharmap
- # ================================================================
- plugin_defined charmap
--if test "$?" == 1
-+if test "$?" = 1
- then
- 
- pkg_failed=no
-@@ -22999,10 +22999,10 @@ echo "${ECHO_T}yes" >&6
- 	have_gucharmap=yes
- fi
- 
--	if test "x$have_gucharmap" == "xno"
-+	if test "x$have_gucharmap" = "xno"
- 	then
- 		plugin_defined_explicit charmap
--		if test "$?" == 1
-+		if test "$?" = 1
- 		then
- 			{ { echo "$as_me:$LINENO: error: gucharmap could not be found, needed to built charmap plugin" >&5
- echo "$as_me: error: gucharmap could not be found, needed to built charmap plugin" >&2;}
-@@ -23020,12 +23020,12 @@ fi
- # Terminal plugin vte check
- # ================================================================
- plugin_defined terminal
--if test "$?" == 1
-+if test "$?" = 1
- then
- 	echo "$as_me:$LINENO: checking for python-vte module" >&5
- echo $ECHO_N "checking for python-vte module... $ECHO_C" >&6
- 
--	if $PYTHON -c "import vte" &>/dev/null;
-+	if $PYTHON -c "import vte" >/dev/null 2>&1;
- 	then
- 		echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-@@ -23035,7 +23035,7 @@ echo "${ECHO_T}yes" >&6
- echo "${ECHO_T}no" >&6
- 
- 		plugin_defined_explicit terminal
--		if test "$?" == 1
-+		if test "$?" = 1
- 		then
- 			{ { echo "$as_me:$LINENO: error: the python vte module could not be found, needed to built terminal plugin" >&5
- echo "$as_me: error: the python vte module could not be found, needed to built terminal plugin" >&2;}
diff --git a/editors/gedit-plugins/pkg-plist b/editors/gedit-plugins/pkg-plist
index 3930df932..b43974be1 100644
--- a/editors/gedit-plugins/pkg-plist
+++ b/editors/gedit-plugins/pkg-plist
@@ -16,3 +16,63 @@ lib/gedit-2/plugins/showtabbar.gedit-plugin
 %%PYTHON%%lib/gedit-2/plugins/smartspaces.py
 %%PYTHON%%lib/gedit-2/plugins/smartspaces.pyc
 %%PYTHON%%lib/gedit-2/plugins/smartspaces.pyo
+share/locale/ar/LC_MESSAGES/gedit-plugins.mo
+share/locale/az/LC_MESSAGES/gedit-plugins.mo
+share/locale/be/LC_MESSAGES/gedit-plugins.mo
+share/locale/bg/LC_MESSAGES/gedit-plugins.mo
+share/locale/ca/LC_MESSAGES/gedit-plugins.mo
+share/locale/cs/LC_MESSAGES/gedit-plugins.mo
+share/locale/da/LC_MESSAGES/gedit-plugins.mo
+share/locale/de/LC_MESSAGES/gedit-plugins.mo
+share/locale/el/LC_MESSAGES/gedit-plugins.mo
+share/locale/en_CA/LC_MESSAGES/gedit-plugins.mo
+share/locale/en_GB/LC_MESSAGES/gedit-plugins.mo
+share/locale/es/LC_MESSAGES/gedit-plugins.mo
+share/locale/et/LC_MESSAGES/gedit-plugins.mo
+share/locale/eu/LC_MESSAGES/gedit-plugins.mo
+share/locale/fi/LC_MESSAGES/gedit-plugins.mo
+share/locale/fr/LC_MESSAGES/gedit-plugins.mo
+share/locale/ga/LC_MESSAGES/gedit-plugins.mo
+share/locale/gl/LC_MESSAGES/gedit-plugins.mo
+share/locale/gu/LC_MESSAGES/gedit-plugins.mo
+share/locale/he/LC_MESSAGES/gedit-plugins.mo
+share/locale/hi/LC_MESSAGES/gedit-plugins.mo
+share/locale/hr/LC_MESSAGES/gedit-plugins.mo
+share/locale/hu/LC_MESSAGES/gedit-plugins.mo
+share/locale/ja/LC_MESSAGES/gedit-plugins.mo
+share/locale/kn/LC_MESSAGES/gedit-plugins.mo
+share/locale/ko/LC_MESSAGES/gedit-plugins.mo
+share/locale/lt/LC_MESSAGES/gedit-plugins.mo
+share/locale/lv/LC_MESSAGES/gedit-plugins.mo
+share/locale/mk/LC_MESSAGES/gedit-plugins.mo
+share/locale/ml/LC_MESSAGES/gedit-plugins.mo
+share/locale/mn/LC_MESSAGES/gedit-plugins.mo
+share/locale/ms/LC_MESSAGES/gedit-plugins.mo
+share/locale/nb/LC_MESSAGES/gedit-plugins.mo
+share/locale/ne/LC_MESSAGES/gedit-plugins.mo
+share/locale/nl/LC_MESSAGES/gedit-plugins.mo
+share/locale/nn/LC_MESSAGES/gedit-plugins.mo
+share/locale/no/LC_MESSAGES/gedit-plugins.mo
+share/locale/or/LC_MESSAGES/gedit-plugins.mo
+share/locale/pa/LC_MESSAGES/gedit-plugins.mo
+share/locale/pl/LC_MESSAGES/gedit-plugins.mo
+share/locale/pt/LC_MESSAGES/gedit-plugins.mo
+share/locale/pt_BR/LC_MESSAGES/gedit-plugins.mo
+share/locale/ro/LC_MESSAGES/gedit-plugins.mo
+share/locale/ru/LC_MESSAGES/gedit-plugins.mo
+share/locale/rw/LC_MESSAGES/gedit-plugins.mo
+share/locale/sk/LC_MESSAGES/gedit-plugins.mo
+share/locale/sl/LC_MESSAGES/gedit-plugins.mo
+share/locale/sq/LC_MESSAGES/gedit-plugins.mo
+share/locale/sr/LC_MESSAGES/gedit-plugins.mo
+share/locale/sr@Latn/LC_MESSAGES/gedit-plugins.mo
+share/locale/sv/LC_MESSAGES/gedit-plugins.mo
+share/locale/ta/LC_MESSAGES/gedit-plugins.mo
+share/locale/th/LC_MESSAGES/gedit-plugins.mo
+share/locale/tr/LC_MESSAGES/gedit-plugins.mo
+share/locale/uk/LC_MESSAGES/gedit-plugins.mo
+share/locale/vi/LC_MESSAGES/gedit-plugins.mo
+share/locale/wa/LC_MESSAGES/gedit-plugins.mo
+share/locale/zh_CN/LC_MESSAGES/gedit-plugins.mo
+share/locale/zh_HK/LC_MESSAGES/gedit-plugins.mo
+share/locale/zh_TW/LC_MESSAGES/gedit-plugins.mo