Updated Xfce to 4.4.2

Lots of bug fixes. For the official ChangeLog, please see
http://www.xfce.org/documentation/changelogs/4.4.2

5 files changed, 43 insertions, 249 deletions

diff --git a/x11/xfce4-terminal/Makefile b/x11/xfce4-terminal/Makefile
index 15409e98582..5427ed9b0d4 100644
--- a/x11/xfce4-terminal/Makefile
+++ b/x11/xfce4-terminal/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.3 2007/09/21 13:04:45 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2007/12/07 19:43:31 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-XFCE4_VERSION=	0.2.6
+XFCE4_VERSION=	0.2.8
 
 DISTNAME=	Terminal-${XFCE4_VERSION}
 PKGNAME=	xfce4-terminal-${XFCE4_VERSION}
-PKGREVISION=	2
+#PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	Xfce terminal emulator
 
diff --git a/x11/xfce4-terminal/PLIST b/x11/xfce4-terminal/PLIST
index 21a3822c5a6..1779e1bc814 100644
--- a/x11/xfce4-terminal/PLIST
+++ b/x11/xfce4-terminal/PLIST
@@ -1,28 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/04/12 09:51:20 martti Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/12/07 19:43:31 martti Exp $
 bin/Terminal
 bin/terminal
 libexec/TerminalHelp
 man/man1/Terminal.1
 share/Terminal/Terminal-toolbars.ui
-share/Terminal/Terminal.ui
-share/Terminal/apps/balsa.desktop
-share/Terminal/apps/epiphany.desktop
-share/Terminal/apps/evolution.desktop
-share/Terminal/apps/exo-open-browser.desktop
-share/Terminal/apps/exo-open-mailer.desktop
-share/Terminal/apps/firefox.desktop
-share/Terminal/apps/galeon.desktop
-share/Terminal/apps/kmail.desktop
-share/Terminal/apps/konqueror.desktop
-share/Terminal/apps/lynx.desktop
-share/Terminal/apps/mozilla-browser.desktop
-share/Terminal/apps/mozilla-mailer.desktop
-share/Terminal/apps/mutt.desktop
-share/Terminal/apps/opera-browser.desktop
-share/Terminal/apps/opera-mailer.desktop
-share/Terminal/apps/sensible-browser.desktop
-share/Terminal/apps/sylpheed-claws.desktop
-share/Terminal/apps/thunderbird.desktop
 share/applications/Terminal.desktop
 share/doc/Terminal/C/advanced.html
 share/doc/Terminal/C/copyright.html
@@ -45,9 +26,31 @@ share/doc/Terminal/C/images/terminal-set-title.png
 share/doc/Terminal/C/images/terminal-toolbars.png
 share/doc/Terminal/C/index.html
 share/doc/Terminal/C/preferences.html
-share/doc/Terminal/C/preferred-applications.html
 share/doc/Terminal/C/support.html
 share/doc/Terminal/C/usage.html
+share/doc/Terminal/fr/advanced.html
+share/doc/Terminal/fr/copyright.html
+share/doc/Terminal/fr/faq.html
+share/doc/Terminal/fr/getting-started.html
+share/doc/Terminal/fr/images/terminal-applications-dialog.png
+share/doc/Terminal/fr/images/terminal-applications-menu.png
+share/doc/Terminal/fr/images/terminal-choose-custom-webbrowser.png
+share/doc/Terminal/fr/images/terminal-compose-shortcut.png
+share/doc/Terminal/fr/images/terminal-edit-applications.png
+share/doc/Terminal/fr/images/terminal-edit-preferences.png
+share/doc/Terminal/fr/images/terminal-first-time.png
+share/doc/Terminal/fr/images/terminal-multiple-tabs.png
+share/doc/Terminal/fr/images/terminal-preferences-advanced.png
+share/doc/Terminal/fr/images/terminal-preferences-appearance.png
+share/doc/Terminal/fr/images/terminal-preferences-colors.png
+share/doc/Terminal/fr/images/terminal-preferences-general.png
+share/doc/Terminal/fr/images/terminal-preferences-shortcuts.png
+share/doc/Terminal/fr/images/terminal-set-title.png
+share/doc/Terminal/fr/images/terminal-toolbars.png
+share/doc/Terminal/fr/index.html
+share/doc/Terminal/fr/preferences.html
+share/doc/Terminal/fr/support.html
+share/doc/Terminal/fr/usage.html
 share/doc/Terminal/ja/advanced.html
 share/doc/Terminal/ja/copyright.html
 share/doc/Terminal/ja/faq.html
@@ -69,7 +72,6 @@ share/doc/Terminal/ja/images/terminal-set-title.png
 share/doc/Terminal/ja/images/terminal-toolbars.png
 share/doc/Terminal/ja/index.html
 share/doc/Terminal/ja/preferences.html
-share/doc/Terminal/ja/preferred-applications.html
 share/doc/Terminal/ja/support.html
 share/doc/Terminal/ja/usage.html
 share/doc/Terminal/terminal.css
@@ -92,10 +94,9 @@ share/icons/hicolor/48x48/stock/navigation/stock_terminal-appearance.png
 share/icons/hicolor/48x48/stock/navigation/stock_terminal-colors.png
 share/icons/hicolor/48x48/stock/navigation/stock_terminal-compose.png
 share/icons/hicolor/48x48/stock/navigation/stock_terminal-general.png
-share/icons/hicolor/48x48/stock/navigation/stock_terminal-mailreader.png
 share/icons/hicolor/48x48/stock/navigation/stock_terminal-shortcuts.png
-share/icons/hicolor/48x48/stock/navigation/stock_terminal-webbrowser.png
 share/icons/hicolor/scalable/apps/Terminal.svg
+share/locale/ar/LC_MESSAGES/Terminal.mo
 share/locale/be/LC_MESSAGES/Terminal.mo
 share/locale/ca/LC_MESSAGES/Terminal.mo
 share/locale/cs/LC_MESSAGES/Terminal.mo
@@ -115,22 +116,30 @@ share/locale/it/LC_MESSAGES/Terminal.mo
 share/locale/ja/LC_MESSAGES/Terminal.mo
 share/locale/ko/LC_MESSAGES/Terminal.mo
 share/locale/lt/LC_MESSAGES/Terminal.mo
+share/locale/lv/LC_MESSAGES/Terminal.mo
+share/locale/nb_NO/LC_MESSAGES/Terminal.mo
 share/locale/nl/LC_MESSAGES/Terminal.mo
 share/locale/pa/LC_MESSAGES/Terminal.mo
 share/locale/pl/LC_MESSAGES/Terminal.mo
 share/locale/pt_BR/LC_MESSAGES/Terminal.mo
+share/locale/pt_PT/LC_MESSAGES/Terminal.mo
+share/locale/ro/LC_MESSAGES/Terminal.mo
 share/locale/ru/LC_MESSAGES/Terminal.mo
 share/locale/sk/LC_MESSAGES/Terminal.mo
+share/locale/sq/LC_MESSAGES/Terminal.mo
 share/locale/sv/LC_MESSAGES/Terminal.mo
+share/locale/tr/LC_MESSAGES/Terminal.mo
 share/locale/uk/LC_MESSAGES/Terminal.mo
+share/locale/ur/LC_MESSAGES/Terminal.mo
 share/locale/vi/LC_MESSAGES/Terminal.mo
 share/locale/zh_CN/LC_MESSAGES/Terminal.mo
 share/locale/zh_TW/LC_MESSAGES/Terminal.mo
 share/pixmaps/terminal.xpm
 @dirrm share/doc/Terminal/ja/images
 @dirrm share/doc/Terminal/ja
+@dirrm share/doc/Terminal/fr/images
+@dirrm share/doc/Terminal/fr
 @dirrm share/doc/Terminal/C/images
 @dirrm share/doc/Terminal/C
 @dirrm share/doc/Terminal
-@dirrm share/Terminal/apps
 @dirrm share/Terminal
diff --git a/x11/xfce4-terminal/buildlink3.mk b/x11/xfce4-terminal/buildlink3.mk
index 8cc0a4ec25a..04ca08bd501 100644
--- a/x11/xfce4-terminal/buildlink3.mk
+++ b/x11/xfce4-terminal/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2007/08/23 09:24:57 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2007/12/07 19:43:31 martti Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_TERMINAL_BUILDLINK3_MK:=	${XFCE4_TERMINAL_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	xfce4-terminal
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-terminal
 
 .if ${XFCE4_TERMINAL_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4-terminal+=	xfce4-terminal>=0.2.6nb1
+BUILDLINK_API_DEPENDS.xfce4-terminal+=	xfce4-terminal>=0.2.8
 BUILDLINK_PKGSRCDIR.xfce4-terminal?=	../../x11/xfce4-terminal
 .endif	# XFCE4_TERMINAL_BUILDLINK3_MK
 
diff --git a/x11/xfce4-terminal/distinfo b/x11/xfce4-terminal/distinfo
index cd7f5b5bdf0..4a0d91db27e 100644
--- a/x11/xfce4-terminal/distinfo
+++ b/x11/xfce4-terminal/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.2 2007/08/23 09:24:57 martti Exp $
+$NetBSD: distinfo,v 1.3 2007/12/07 19:43:31 martti Exp $
 
-SHA1 (Terminal-0.2.6.tar.bz2) = 8851179492c4768a1a53d2424d7a7c8b1a873c58
-RMD160 (Terminal-0.2.6.tar.bz2) = 0e1bcb66b83a92044eae891c35cc3750918ca83e
-Size (Terminal-0.2.6.tar.bz2) = 1582076 bytes
-SHA1 (patch-aa) = f08cf609852fbf1ce81fb9066dfaa1338dbea85b
+SHA1 (Terminal-0.2.8.tar.bz2) = 9c4ae0422dea8161aa72659d3bd1b035688d70d7
+RMD160 (Terminal-0.2.8.tar.bz2) = 49bf87091ef39011dc9111439a939a52f19771fe
+Size (Terminal-0.2.8.tar.bz2) = 1908459 bytes
diff --git a/x11/xfce4-terminal/patches/patch-aa b/x11/xfce4-terminal/patches/patch-aa
deleted file mode 100644
index 682ac00f5a3..00000000000
--- a/x11/xfce4-terminal/patches/patch-aa
+++ /dev/null
@@ -1,214 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2007/08/23 09:24:57 martti Exp $
-
-Patch for http://bugzilla.xfce.org/show_bug.cgi?id=3383
-
---- helpers/balsa.desktop.in	2007-01-20 16:30:46.000000000 +0200
-+++ Terminal-0.2.6.patched/helpers/balsa.desktop.in	2007-08-14 09:12:57.000000000 +0300
-@@ -5,4 +5,4 @@
- Type=Application
- X-Terminal-Binaries=balsa
- X-Terminal-Category=MailReader
--X-Terminal-Command=%B -m "mailto:%u"
-+X-Terminal-Command=%B -m mailto:%u
-
---- helpers/epiphany.desktop.in	2007-01-20 16:30:46.000000000 +0200
-+++ Terminal-0.2.6.patched/helpers/epiphany.desktop.in	2007-08-14 09:12:57.000000000 +0300
-@@ -5,4 +5,4 @@
- Type=Application
- X-Terminal-Binaries=epiphany;
- X-Terminal-Category=WebBrowser
--X-Terminal-Command=%B "%u"
-+X-Terminal-Command=%B %u
-
---- helpers/evolution.desktop.in	2007-01-20 16:30:46.000000000 +0200
-+++ Terminal-0.2.6.patched/helpers/evolution.desktop.in	2007-08-14 09:12:57.000000000 +0300
-@@ -5,4 +5,4 @@
- Type=Application
- X-Terminal-Binaries=evolution-2.2;evolution-2.0;evolution-1.6;evolution-1.5;evolution-1.4;evolution;
- X-Terminal-Category=MailReader
--X-Terminal-Command=%B "mailto:%u"
-+X-Terminal-Command=%B mailto:%u
-
---- helpers/exo-open-browser.desktop.in	2007-01-20 16:30:46.000000000 +0200
-+++ Terminal-0.2.6.patched/helpers/exo-open-browser.desktop.in	2007-08-14 09:12:57.000000000 +0300
-@@ -5,4 +5,4 @@
- Type=Application
- X-Terminal-Binaries=exo-open
- X-Terminal-Category=WebBrowser
--X-Terminal-Command=%B --launch WebBrowser "%u"
-+X-Terminal-Command=%B --launch WebBrowser %u
-
---- helpers/exo-open-mailer.desktop.in	2007-01-20 16:30:46.000000000 +0200
-+++ Terminal-0.2.6.patched/helpers/exo-open-mailer.desktop.in	2007-08-14 09:12:57.000000000 +0300
-@@ -5,4 +5,4 @@
- Type=Application
- X-Terminal-Binaries=exo-open
- X-Terminal-Category=MailReader
--X-Terminal-Command=%B --launch MailReader "%u"
-+X-Terminal-Command=%B --launch MailReader %u
-
---- helpers/firefox.desktop.in	2007-01-20 16:30:46.000000000 +0200
-+++ Terminal-0.2.6.patched/helpers/firefox.desktop.in	2007-08-14 09:12:57.000000000 +0300
-@@ -5,4 +5,4 @@
- Type=Application
- X-Terminal-Binaries=firefox;firefox-gtk2;firefox-gtk;mozilla-firefox;
- X-Terminal-Category=WebBrowser
--X-Terminal-Command=%B -remote "openURL(%u)" || %B "%u"
-+X-Terminal-Command=%B -remote openURL\(%u\) || %B %u
-
---- helpers/galeon.desktop.in	2007-01-20 16:30:46.000000000 +0200
-+++ Terminal-0.2.6.patched/helpers/galeon.desktop.in	2007-08-14 09:12:57.000000000 +0300
-@@ -5,4 +5,4 @@
- Type=Application
- X-Terminal-Binaries=galeon;
- X-Terminal-Category=WebBrowser
--X-Terminal-Command=%B "%u"
-+X-Terminal-Command=%B %u
-
---- helpers/kmail.desktop.in	2007-01-20 16:30:46.000000000 +0200
-+++ Terminal-0.2.6.patched/helpers/kmail.desktop.in	2007-08-14 09:12:57.000000000 +0300
-@@ -5,4 +5,4 @@
- Type=Application
- X-Terminal-Binaries=kmail;
- X-Terminal-Category=MailReader
--X-Terminal-Command=%B "%u"
-+X-Terminal-Command=%B %u
-
---- helpers/konqueror.desktop.in	2007-01-20 16:30:46.000000000 +0200
-+++ Terminal-0.2.6.patched/helpers/konqueror.desktop.in	2007-08-14 09:12:57.000000000 +0300
-@@ -5,6 +5,6 @@
- Type=Application
- X-Terminal-Binaries=konqueror;
- X-Terminal-Category=WebBrowser
--X-Terminal-Command=%B "%u"
-+X-Terminal-Command=%B %u
- 
- 
-
---- helpers/lynx.desktop.in	2007-01-20 16:30:46.000000000 +0200
-+++ Terminal-0.2.6.patched/helpers/lynx.desktop.in	2007-08-14 09:12:57.000000000 +0300
-@@ -5,4 +5,4 @@
- Type=Application
- X-Terminal-Binaries=lynx;
- X-Terminal-Category=WebBrowser
--X-Terminal-Command=Terminal -x %B "%u"
-+X-Terminal-Command=Terminal -x %B %u
-
---- helpers/mozilla-browser.desktop.in	2007-01-20 16:30:46.000000000 +0200
-+++ Terminal-0.2.6.patched/helpers/mozilla-browser.desktop.in	2007-08-14 09:12:57.000000000 +0300
-@@ -5,4 +5,4 @@
- Type=Application
- X-Terminal-Binaries=mozilla;mozilla-gtk2;mozilla-gtk;
- X-Terminal-Category=WebBrowser
--X-Terminal-Command=%B -remote "openURL(%u,new-window)" || %B "%u"
-+X-Terminal-Command=%B -remote openURL\(%u,new-window\) || %B %u
-
---- helpers/mozilla-mailer.desktop.in	2007-01-20 16:30:46.000000000 +0200
-+++ Terminal-0.2.6.patched/helpers/mozilla-mailer.desktop.in	2007-08-14 09:12:57.000000000 +0300
-@@ -5,4 +5,4 @@
- Type=Application
- X-Terminal-Binaries=mozilla;mozilla-gtk2;mozilla-gtk;
- X-Terminal-Category=MailReader
--X-Terminal-Command=%B -remote "mailto(%u)" || %B -compose "mailto:%u"
-+X-Terminal-Command=%B -remote mailto\(%u\) || %B -compose mailto:%u
-
---- helpers/mutt.desktop.in	2007-01-20 16:30:46.000000000 +0200
-+++ Terminal-0.2.6.patched/helpers/mutt.desktop.in	2007-08-14 09:12:57.000000000 +0300
-@@ -5,4 +5,4 @@
- Type=Application
- X-Terminal-Binaries=mutt;
- X-Terminal-Category=MailReader
--X-Terminal-Command=Terminal -x %B "%u"
-+X-Terminal-Command=Terminal -x %B %u
-
---- helpers/opera-browser.desktop.in	2007-01-20 16:30:46.000000000 +0200
-+++ Terminal-0.2.6.patched/helpers/opera-browser.desktop.in	2007-08-14 09:12:57.000000000 +0300
-@@ -5,4 +5,4 @@
- Type=Application
- X-Terminal-Binaries=opera;
- X-Terminal-Category=WebBrowser
--X-Terminal-Command=%B -remote "openURL(%u,new-window)" || %B "%u"
-+X-Terminal-Command=%B -remote openURL\(%u,new-window\) || %B %u
-
---- helpers/opera-mailer.desktop.in	2007-01-20 16:30:46.000000000 +0200
-+++ Terminal-0.2.6.patched/helpers/opera-mailer.desktop.in	2007-08-14 09:12:57.000000000 +0300
-@@ -5,4 +5,4 @@
- Type=Application
- X-Terminal-Binaries=opera;
- X-Terminal-Category=MailReader
--X-Terminal-Command=%B -remote "openURL(mailto:%u)" || %B "mailto:%u"
-+X-Terminal-Command=%B -remote openURL\(mailto:%u\) || %B mailto:%u
-
---- helpers/sensible-browser.desktop.in	2007-01-20 16:30:46.000000000 +0200
-+++ Terminal-0.2.6.patched/helpers/sensible-browser.desktop.in	2007-08-14 09:12:57.000000000 +0300
-@@ -5,4 +5,4 @@
- Type=Application
- X-Terminal-Binaries=sensible-browser
- X-Terminal-Category=WebBrowser
--X-Terminal-Command=%B "%u"
-+X-Terminal-Command=%B %u
-
---- helpers/sylpheed-claws.desktop.in	2007-01-20 16:30:46.000000000 +0200
-+++ Terminal-0.2.6.patched/helpers/sylpheed-claws.desktop.in	2007-08-14 09:12:57.000000000 +0300
-@@ -7,4 +7,4 @@
- StartupNotify=true
- X-Terminal-Binaries=sylpheed-claws;
- X-Terminal-Category=MailReader
--X-Terminal-Command=%B --compose "%u"
-+X-Terminal-Command=%B --compose %u
-
---- helpers/thunderbird.desktop.in	2007-01-20 16:30:46.000000000 +0200
-+++ Terminal-0.2.6.patched/helpers/thunderbird.desktop.in	2007-08-14 09:12:57.000000000 +0300
-@@ -5,4 +5,4 @@
- Type=Application
- X-Terminal-Binaries=thunderbird;thunderbird-gtk2;thunderbird-gtk;mozilla-thunderbird;
- X-Terminal-Category=MailReader
--X-Terminal-Command=%B -remote "mailto(%u)" || %B -compose "mailto:%u"
-+X-Terminal-Command=%B -remote mailto\(%u\) || %B -compose mailto:%u
-
---- terminal/terminal-helper.c	2007-01-20 16:30:51.000000000 +0200
-+++ Terminal-0.2.6.patched/terminal/terminal-helper.c	2007-08-14 09:17:20.000000000 +0300
-@@ -349,6 +349,8 @@
-   gchar       *argv[4];
-   gchar       *command;
-   gchar       *t;
-+  gchar       *escaped;
-+  gchar       **parts;
-   guint        n;
- 
-   g_return_if_fail (TERMINAL_IS_HELPER (helper));
-@@ -359,6 +361,12 @@
-     if (s[0] == '%' && g_ascii_tolower (s[1]) == 'u')
-       ++n;
- 
-+  parts = g_strsplit (uri, "$", 0);
-+
-+  escaped = g_shell_quote (g_strjoinv("\$", parts));
-+
-+  g_strfreev (parts);
-+
-   if (n > 0)
-     {
-       command = g_new (gchar, strlen (helper->command) + n * strlen (uri) + 1);
-@@ -366,7 +374,7 @@
-         {
-           if (s[0] == '%' && g_ascii_tolower (s[1]) == 'u')
-             {
--              for (u = uri; *u != '\0'; )
-+              for (u = escaped; *u != '\0'; )
-                 *t++ = *u++;
-               s += 2;
-             }
-@@ -379,9 +387,11 @@
-     }
-   else
-     {
--      command = g_strconcat (helper->command, " ", uri, NULL);
-+      command = g_strconcat (helper->command, " ", escaped, NULL);
-     }
- 
-+  g_free (escaped);
-+
-   argv[0] = "/bin/sh";
-   argv[1] = "-c";
-   argv[2] = command;