Update Xfce to 4.12.0.

This is a very large change, and incorporates the 4.8, 4.10, and 4.12 major
Xfce releases since 4.6.2, our previous pkgsrc release.  For more information
about the thousands of changes in each major release since then, please see:

  Xfce 4.12 announcement:
    http://www.xfce.org/about/news

  Xfce 4.12 tour:
    http://www.xfce.org/about/tour

  Xfce 4.10 announcement:
    http://www.xfce.org/about/news/?post=1335571200

  Xfce 4.10 tour:
    http://www.xfce.org/about/tour410

  Xfce 4.8 announcement:
    http://www.xfce.org/about/news/?post=1295136000

  Xfce 4.8 tour:
    http://www.xfce.org/about/tour48

The pkgsrc changes since then are:

  New packages:
    archivers/xfce4-thunar-archive
    graphics/elementary-xfce-icon-theme
    mail/xfce4-mailwatch-plugin
    misc/xfce4-time-out-plugin
    multimedia/xfce4-thunar-media-tags
    sysutils/xfce4-mount-plugin
    sysutils/xfce4-taskmanager
    sysutils/xfce4-thunar-vcs
    sysutils/xfce4-verve-plugin
    x11/xfce4-garcon
    x11/xfce4-notifyd
    x11/xfce4-tumbler
    x11/xfce4-whiskermenu-plugin

  Renamed packages:
    devel/xfconf to devel/xfce4-conf
    x11/libxfce4menu to x11/libxfce4ui
    x11/xfce4-screenshooter-plugin to x11/xfce4-screenshooter

  Updated packages:
    audio/xfce4-mixer
    audio/xfce4-xmms-plugin
    devel/xfce4-dev-tools
    editors/xfce4-mousepad
    graphics/ristretto
    meta-pkgs/xfce4-extras
    meta-pkgs/xfce4
    misc/xfce4-weather-plugin
    multimedia/xfce4-mpc-plugin
    net/xfce4-wavelan-plugin
    sysutils/xfce4-appfinder
    sysutils/xfce4-battery-plugin
    sysutils/xfce4-cpugraph-plugin
    sysutils/xfce4-diskperf-plugin
    sysutils/xfce4-fsguard-plugin
    sysutils/xfce4-genmon-plugin
    sysutils/xfce4-netload-plugin
    sysutils/xfce4-quicklauncher-plugin
    sysutils/xfce4-systemload-plugin
    sysutils/xfce4-thunar
    sysutils/xfce4-xarchiver
    sysutils/xfce4-xkb-plugin
    textproc/xfce4-dict-plugin
    time/xfce4-datetime-plugin
    time/xfce4-orage
    time/xfce4-timer-plugin
    wm/xfce4-wm-themes
    wm/xfce4-wm
    x11/libxfce4gui
    x11/libxfce4util
    x11/xfce4-clipman-plugin
    x11/xfce4-desktop
    x11/xfce4-exo
    x11/xfce4-eyes-plugin
    x11/xfce4-gtk2-engine
    x11/xfce4-notes-plugin
    x11/xfce4-panel
    x11/xfce4-places-plugin
    x11/xfce4-session
    x11/xfce4-settings
    x11/xfce4-terminal

  Removed packages:
    sysutils/xfce4-volman
    x11/xfce4-utils

This is based on a huge amount of work by the NetBSDfr team and Youri Mouton,
who takes over as MAINTAINER, and has been tested by Youri on a large number
of platforms prior to commit.  A massive thanks to them.  Any issues with the
import are mine alone as the committer-by-proxy.

5 files changed, 100 insertions, 290 deletions

diff --git a/x11/xfce4-terminal/Makefile b/x11/xfce4-terminal/Makefile
index e6565eec8f3..1a2e2e75694 100644
--- a/x11/xfce4-terminal/Makefile
+++ b/x11/xfce4-terminal/Makefile
@@ -1,25 +1,21 @@
-# $NetBSD: Makefile,v 1.35 2014/05/05 00:48:37 ryoon Exp $
+# $NetBSD: Makefile,v 1.36 2015/04/21 08:56:45 jperkin Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-XFCE4_VERSION=	0.4.2
-
-DISTNAME=	Terminal-${XFCE4_VERSION}
-PKGNAME=	xfce4-terminal-${XFCE4_VERSION}
-PKGREVISION=	21
+DISTNAME=	xfce4-terminal-0.6.3
 CATEGORIES=	x11
-COMMENT=	Xfce terminal emulator
+MASTER_SITES=	http://archive.xfce.org/src/apps/xfce4-terminal/0.6/
 
-MASTER_SITES=	http://www.xfce.org/archive/src/apps/terminal/0.4/
+HOMEPAGE=	http://docs.xfce.org/apps/terminal/start
+COMMENT=	Xfce terminal emulator
 
 MAKE_JOBS_SAFE=	no
 
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
 .include "../../x11/vte/buildlink3.mk"
+.include "../../x11/libxfce4ui/buildlink3.mk"
 .include "../../x11/xfce4-exo/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-terminal/PLIST b/x11/xfce4-terminal/PLIST
index 0970b1de753..edc457bd09b 100644
--- a/x11/xfce4-terminal/PLIST
+++ b/x11/xfce4-terminal/PLIST
@@ -1,184 +1,90 @@
-@comment $NetBSD: PLIST,v 1.6 2009/11/29 22:16:34 snj Exp $
-bin/Terminal
-bin/terminal
-libexec/TerminalHelp
-man/man1/Terminal.1
-share/Terminal/Terminal-toolbars.ui
-share/Terminal/Terminal.glade
-share/applications/Terminal.desktop
-share/doc/Terminal/C/advanced.html
-share/doc/Terminal/C/copyright.html
-share/doc/Terminal/C/faq.html
-share/doc/Terminal/C/getting-started.html
-share/doc/Terminal/C/images/terminal-compose-shortcut.png
-share/doc/Terminal/C/images/terminal-edit-preferences.png
-share/doc/Terminal/C/images/terminal-first-time.png
-share/doc/Terminal/C/images/terminal-multiple-tabs.png
-share/doc/Terminal/C/images/terminal-preferences-advanced.png
-share/doc/Terminal/C/images/terminal-preferences-appearance.png
-share/doc/Terminal/C/images/terminal-preferences-colors.png
-share/doc/Terminal/C/images/terminal-preferences-general.png
-share/doc/Terminal/C/images/terminal-preferences-shortcuts.png
-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/support.html
-share/doc/Terminal/C/usage.html
-share/doc/Terminal/da/advanced.html
-share/doc/Terminal/da/copyright.html
-share/doc/Terminal/da/faq.html
-share/doc/Terminal/da/getting-started.html
-share/doc/Terminal/da/images/terminal-compose-shortcut.png
-share/doc/Terminal/da/images/terminal-edit-preferences.png
-share/doc/Terminal/da/images/terminal-first-time.png
-share/doc/Terminal/da/images/terminal-multiple-tabs.png
-share/doc/Terminal/da/images/terminal-preferences-advanced.png
-share/doc/Terminal/da/images/terminal-preferences-appearance.png
-share/doc/Terminal/da/images/terminal-preferences-colors.png
-share/doc/Terminal/da/images/terminal-preferences-general.png
-share/doc/Terminal/da/images/terminal-preferences-shortcuts.png
-share/doc/Terminal/da/images/terminal-set-title.png
-share/doc/Terminal/da/images/terminal-toolbars.png
-share/doc/Terminal/da/index.html
-share/doc/Terminal/da/preferences.html
-share/doc/Terminal/da/support.html
-share/doc/Terminal/da/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-compose-shortcut.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/gl/advanced.html
-share/doc/Terminal/gl/copyright.html
-share/doc/Terminal/gl/faq.html
-share/doc/Terminal/gl/getting-started.html
-share/doc/Terminal/gl/images/terminal-compose-shortcut.png
-share/doc/Terminal/gl/images/terminal-edit-preferences.png
-share/doc/Terminal/gl/images/terminal-first-time.png
-share/doc/Terminal/gl/images/terminal-multiple-tabs.png
-share/doc/Terminal/gl/images/terminal-preferences-advanced.png
-share/doc/Terminal/gl/images/terminal-preferences-appearance.png
-share/doc/Terminal/gl/images/terminal-preferences-colors.png
-share/doc/Terminal/gl/images/terminal-preferences-general.png
-share/doc/Terminal/gl/images/terminal-preferences-shortcuts.png
-share/doc/Terminal/gl/images/terminal-set-title.png
-share/doc/Terminal/gl/images/terminal-toolbars.png
-share/doc/Terminal/gl/index.html
-share/doc/Terminal/gl/preferences.html
-share/doc/Terminal/gl/support.html
-share/doc/Terminal/gl/usage.html
-share/doc/Terminal/id/advanced.html
-share/doc/Terminal/id/copyright.html
-share/doc/Terminal/id/faq.html
-share/doc/Terminal/id/getting-started.html
-share/doc/Terminal/id/images/terminal-compose-shortcut.png
-share/doc/Terminal/id/images/terminal-edit-preferences.png
-share/doc/Terminal/id/images/terminal-first-time.png
-share/doc/Terminal/id/images/terminal-multiple-tabs.png
-share/doc/Terminal/id/images/terminal-preferences-advanced.png
-share/doc/Terminal/id/images/terminal-preferences-appearance.png
-share/doc/Terminal/id/images/terminal-preferences-colors.png
-share/doc/Terminal/id/images/terminal-preferences-general.png
-share/doc/Terminal/id/images/terminal-preferences-shortcuts.png
-share/doc/Terminal/id/images/terminal-set-title.png
-share/doc/Terminal/id/images/terminal-toolbars.png
-share/doc/Terminal/id/index.html
-share/doc/Terminal/id/preferences.html
-share/doc/Terminal/id/support.html
-share/doc/Terminal/id/usage.html
-share/doc/Terminal/ja/advanced.html
-share/doc/Terminal/ja/copyright.html
-share/doc/Terminal/ja/faq.html
-share/doc/Terminal/ja/getting-started.html
-share/doc/Terminal/ja/images/terminal-compose-shortcut.png
-share/doc/Terminal/ja/images/terminal-edit-preferences.png
-share/doc/Terminal/ja/images/terminal-first-time.png
-share/doc/Terminal/ja/images/terminal-multiple-tabs.png
-share/doc/Terminal/ja/images/terminal-preferences-advanced.png
-share/doc/Terminal/ja/images/terminal-preferences-appearance.png
-share/doc/Terminal/ja/images/terminal-preferences-colors.png
-share/doc/Terminal/ja/images/terminal-preferences-general.png
-share/doc/Terminal/ja/images/terminal-preferences-shortcuts.png
-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/support.html
-share/doc/Terminal/ja/usage.html
-share/doc/Terminal/terminal.css
-share/icons/hicolor/16x16/stock/navigation/stock_terminal-closetab.png
-share/icons/hicolor/16x16/stock/navigation/stock_terminal-closewindow.png
-share/icons/hicolor/16x16/stock/navigation/stock_terminal-newtab.png
-share/icons/hicolor/16x16/stock/navigation/stock_terminal-newwindow.png
-share/icons/hicolor/16x16/stock/navigation/stock_terminal-reportbug.png
-share/icons/hicolor/24x24/stock/navigation/stock_terminal-closetab.png
-share/icons/hicolor/24x24/stock/navigation/stock_terminal-closewindow.png
-share/icons/hicolor/24x24/stock/navigation/stock_terminal-newtab.png
-share/icons/hicolor/24x24/stock/navigation/stock_terminal-newwindow.png
-share/icons/hicolor/24x24/stock/navigation/stock_terminal-reportbug.png
-share/icons/hicolor/24x24/stock/navigation/stock_terminal-showborders.png
-share/icons/hicolor/24x24/stock/navigation/stock_terminal-showmenu.png
-share/icons/hicolor/48x48/apps/Terminal.png
-share/icons/hicolor/48x48/stock/navigation/stock_terminal-compose.png
-share/icons/hicolor/scalable/apps/Terminal.svg
-share/locale/ar/LC_MESSAGES/Terminal.mo
-share/locale/ast/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
-share/locale/da/LC_MESSAGES/Terminal.mo
-share/locale/de/LC_MESSAGES/Terminal.mo
-share/locale/dz/LC_MESSAGES/Terminal.mo
-share/locale/el/LC_MESSAGES/Terminal.mo
-share/locale/en_GB/LC_MESSAGES/Terminal.mo
-share/locale/eo/LC_MESSAGES/Terminal.mo
-share/locale/es/LC_MESSAGES/Terminal.mo
-share/locale/et/LC_MESSAGES/Terminal.mo
-share/locale/eu/LC_MESSAGES/Terminal.mo
-share/locale/fi/LC_MESSAGES/Terminal.mo
-share/locale/fr/LC_MESSAGES/Terminal.mo
-share/locale/gl/LC_MESSAGES/Terminal.mo
-share/locale/he/LC_MESSAGES/Terminal.mo
-share/locale/hu/LC_MESSAGES/Terminal.mo
-share/locale/id/LC_MESSAGES/Terminal.mo
-share/locale/it/LC_MESSAGES/Terminal.mo
-share/locale/ja/LC_MESSAGES/Terminal.mo
-share/locale/kk/LC_MESSAGES/Terminal.mo
-share/locale/ko/LC_MESSAGES/Terminal.mo
-share/locale/ku/LC_MESSAGES/Terminal.mo
-share/locale/lt/LC_MESSAGES/Terminal.mo
-share/locale/lv/LC_MESSAGES/Terminal.mo
-share/locale/nb/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/LC_MESSAGES/Terminal.mo
-share/locale/pt_BR/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/ur_PK/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
+@comment $NetBSD: PLIST,v 1.7 2015/04/21 08:56:45 jperkin Exp $
+bin/xfce4-terminal
+man/ar/man1/xfce4-terminal.1
+man/ca/man1/xfce4-terminal.1
+man/da/man1/xfce4-terminal.1
+man/de/man1/xfce4-terminal.1
+man/el/man1/xfce4-terminal.1
+man/es/man1/xfce4-terminal.1
+man/fr/man1/xfce4-terminal.1
+man/gl/man1/xfce4-terminal.1
+man/id/man1/xfce4-terminal.1
+man/it/man1/xfce4-terminal.1
+man/ja/man1/xfce4-terminal.1
+man/ko/man1/xfce4-terminal.1
+man/lt/man1/xfce4-terminal.1
+man/man1/xfce4-terminal.1
+man/pl/man1/xfce4-terminal.1
+man/pt/man1/xfce4-terminal.1
+man/pt_BR/man1/xfce4-terminal.1
+man/ru/man1/xfce4-terminal.1
+man/sr/man1/xfce4-terminal.1
+man/sv/man1/xfce4-terminal.1
+man/tr/man1/xfce4-terminal.1
+man/ug/man1/xfce4-terminal.1
+man/uk/man1/xfce4-terminal.1
+man/zh_CN/man1/xfce4-terminal.1
+share/applications/xfce4-terminal.desktop
+share/gnome-control-center/default-apps/xfce4-terminal-default-apps.xml
+share/locale/ar/LC_MESSAGES/xfce4-terminal.mo
+share/locale/ast/LC_MESSAGES/xfce4-terminal.mo
+share/locale/be/LC_MESSAGES/xfce4-terminal.mo
+share/locale/bg/LC_MESSAGES/xfce4-terminal.mo
+share/locale/ca/LC_MESSAGES/xfce4-terminal.mo
+share/locale/cs/LC_MESSAGES/xfce4-terminal.mo
+share/locale/da/LC_MESSAGES/xfce4-terminal.mo
+share/locale/de/LC_MESSAGES/xfce4-terminal.mo
+share/locale/el/LC_MESSAGES/xfce4-terminal.mo
+share/locale/en_AU/LC_MESSAGES/xfce4-terminal.mo
+share/locale/en_GB/LC_MESSAGES/xfce4-terminal.mo
+share/locale/eo/LC_MESSAGES/xfce4-terminal.mo
+share/locale/es/LC_MESSAGES/xfce4-terminal.mo
+share/locale/et/LC_MESSAGES/xfce4-terminal.mo
+share/locale/eu/LC_MESSAGES/xfce4-terminal.mo
+share/locale/fi/LC_MESSAGES/xfce4-terminal.mo
+share/locale/fr/LC_MESSAGES/xfce4-terminal.mo
+share/locale/gl/LC_MESSAGES/xfce4-terminal.mo
+share/locale/he/LC_MESSAGES/xfce4-terminal.mo
+share/locale/hr/LC_MESSAGES/xfce4-terminal.mo
+share/locale/hu/LC_MESSAGES/xfce4-terminal.mo
+share/locale/id/LC_MESSAGES/xfce4-terminal.mo
+share/locale/is/LC_MESSAGES/xfce4-terminal.mo
+share/locale/it/LC_MESSAGES/xfce4-terminal.mo
+share/locale/ja/LC_MESSAGES/xfce4-terminal.mo
+share/locale/kk/LC_MESSAGES/xfce4-terminal.mo
+share/locale/ko/LC_MESSAGES/xfce4-terminal.mo
+share/locale/lt/LC_MESSAGES/xfce4-terminal.mo
+share/locale/lv/LC_MESSAGES/xfce4-terminal.mo
+share/locale/nb/LC_MESSAGES/xfce4-terminal.mo
+share/locale/nl/LC_MESSAGES/xfce4-terminal.mo
+share/locale/oc/LC_MESSAGES/xfce4-terminal.mo
+share/locale/pa/LC_MESSAGES/xfce4-terminal.mo
+share/locale/pl/LC_MESSAGES/xfce4-terminal.mo
+share/locale/pt/LC_MESSAGES/xfce4-terminal.mo
+share/locale/pt_BR/LC_MESSAGES/xfce4-terminal.mo
+share/locale/ro/LC_MESSAGES/xfce4-terminal.mo
+share/locale/ru/LC_MESSAGES/xfce4-terminal.mo
+share/locale/si/LC_MESSAGES/xfce4-terminal.mo
+share/locale/sk/LC_MESSAGES/xfce4-terminal.mo
+share/locale/sq/LC_MESSAGES/xfce4-terminal.mo
+share/locale/sr/LC_MESSAGES/xfce4-terminal.mo
+share/locale/sv/LC_MESSAGES/xfce4-terminal.mo
+share/locale/te/LC_MESSAGES/xfce4-terminal.mo
+share/locale/th/LC_MESSAGES/xfce4-terminal.mo
+share/locale/tr/LC_MESSAGES/xfce4-terminal.mo
+share/locale/ug/LC_MESSAGES/xfce4-terminal.mo
+share/locale/uk/LC_MESSAGES/xfce4-terminal.mo
+share/locale/ur/LC_MESSAGES/xfce4-terminal.mo
+share/locale/ur_PK/LC_MESSAGES/xfce4-terminal.mo
+share/locale/vi/LC_MESSAGES/xfce4-terminal.mo
+share/locale/zh_CN/LC_MESSAGES/xfce4-terminal.mo
+share/locale/zh_TW/LC_MESSAGES/xfce4-terminal.mo
+share/xfce4/terminal/colorschemes/black-on-white.theme
+share/xfce4/terminal/colorschemes/dark-pastels.theme
+share/xfce4/terminal/colorschemes/green-on-black.theme
+share/xfce4/terminal/colorschemes/solarized-dark.theme
+share/xfce4/terminal/colorschemes/solarized-light.theme
+share/xfce4/terminal/colorschemes/tango.theme
+share/xfce4/terminal/colorschemes/white-on-black.theme
+share/xfce4/terminal/colorschemes/xterm.theme
+share/xfce4/terminal/terminal-preferences.ui
diff --git a/x11/xfce4-terminal/buildlink3.mk b/x11/xfce4-terminal/buildlink3.mk
deleted file mode 100644
index 6af90d16431..00000000000
--- a/x11/xfce4-terminal/buildlink3.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.8 2009/09/16 01:15:36 reed Exp $
-
-BUILDLINK_TREE+=	xfce4-terminal
-
-.if !defined(XFCE4_TERMINAL_BUILDLINK3_MK)
-XFCE4_TERMINAL_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.xfce4-terminal+=	xfce4-terminal>=0.2.10
-BUILDLINK_PKGSRCDIR.xfce4-terminal?=	../../x11/xfce4-terminal
-
-.endif # XFCE4_TERMINAL_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-xfce4-terminal
diff --git a/x11/xfce4-terminal/distinfo b/x11/xfce4-terminal/distinfo
index ba9d679c269..a0875d79842 100644
--- a/x11/xfce4-terminal/distinfo
+++ b/x11/xfce4-terminal/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.7 2013/01/08 01:23:19 marino Exp $
+$NetBSD: distinfo,v 1.8 2015/04/21 08:56:45 jperkin Exp $
 
-SHA1 (Terminal-0.4.2.tar.bz2) = bf4510e331284d7f68ba193fe1d6f2e57b7815bb
-RMD160 (Terminal-0.4.2.tar.bz2) = 8e6364673d6b0d8eddfd59f3f82d3944fca45684
-Size (Terminal-0.4.2.tar.bz2) = 1981158 bytes
-SHA1 (patch-terminal_terminal-screen.c) = dcfa62798ea47e26ed65df031c09991f24d4fa7c
+SHA1 (xfce4-terminal-0.6.3.tar.bz2) = 4dd4d2bef8101f563487b0230346070930ff689f
+RMD160 (xfce4-terminal-0.6.3.tar.bz2) = 2d369f99c4eb45b19c5348e5520d14c43160a9f6
+Size (xfce4-terminal-0.6.3.tar.bz2) = 815207 bytes
diff --git a/x11/xfce4-terminal/patches/patch-terminal_terminal-screen.c b/x11/xfce4-terminal/patches/patch-terminal_terminal-screen.c
deleted file mode 100644
index 98868ba7c00..00000000000
--- a/x11/xfce4-terminal/patches/patch-terminal_terminal-screen.c
+++ /dev/null
@@ -1,78 +0,0 @@
-$NetBSD: patch-terminal_terminal-screen.c,v 1.1 2013/01/08 01:23:19 marino Exp $
-
-Fix for 100% CPU usage on XFce4 Terminal (Dave Tyson)
-PR# pkg/45448
-PR# pkg/46926
-
---- terminal/terminal-screen.c.orig	2009-10-06 15:07:01.000000000 +0000
-+++ terminal/terminal-screen.c
-@@ -87,6 +87,7 @@ static gboolean   terminal_screen_get_ch
-                                                                  GError               **error);
- static gchar    **terminal_screen_get_child_environment         (TerminalScreen        *screen);
- static void       terminal_screen_update_background             (TerminalScreen        *screen);
-+static void       terminal_screen_update_background_fast        (TerminalScreen        *screen);
- static void       terminal_screen_update_binding_backspace      (TerminalScreen        *screen);
- static void       terminal_screen_update_binding_delete         (TerminalScreen        *screen);
- static void       terminal_screen_update_colors                 (TerminalScreen        *screen);
-@@ -132,6 +133,8 @@ struct _TerminalScreen
-   GtkWidget           *scrollbar;
-   GtkWidget           *tab_label;
- 
-+  gulong              background_signal_id;
-+
-   GPid                 pid;
-   gchar               *working_directory;
- 
-@@ -231,7 +234,6 @@ terminal_screen_init (TerminalScreen *sc
-                     "signal::context-menu", G_CALLBACK (terminal_screen_vte_get_context_menu), screen,
-                     "signal::selection-changed", G_CALLBACK (terminal_screen_vte_selection_changed), screen,
-                     "signal::window-title-changed", G_CALLBACK (terminal_screen_vte_window_title_changed), screen,
--                    "swapped-signal::size-allocate", G_CALLBACK (terminal_screen_timer_background), screen,
-                     "swapped-signal::style-set", G_CALLBACK (terminal_screen_update_colors), screen,
-                     NULL);
-   gtk_box_pack_start (GTK_BOX (screen), screen->terminal, TRUE, TRUE, 0);
-@@ -573,6 +575,18 @@ terminal_screen_get_child_environment (T
- 
- 
- static void
-+terminal_screen_update_background_fast (TerminalScreen *screen)
-+{
-+  if (G_UNLIKELY (screen->background_timer_id == 0))
-+    {
-+      screen->background_timer_id = g_idle_add_full (G_PRIORITY_LOW, terminal_screen_timer_background,
-+                                                     screen, terminal_screen_timer_background_destroy);
-+    }
-+}
-+
-+
-+
-+static void
- terminal_screen_update_background (TerminalScreen *screen)
- {
-   if (G_UNLIKELY (screen->background_timer_id != 0))
-@@ -1015,9 +1029,25 @@ terminal_screen_timer_background (gpoint
-       if (G_LIKELY (image != NULL))
-         g_object_unref (G_OBJECT (image));
-       g_object_unref (G_OBJECT (loader));
-+      
-+            /* refresh background on size changes */
-+            if (screen->background_signal_id == 0)
-+              {
-+                screen->background_signal_id =
-+                   g_signal_connect_swapped (G_OBJECT (screen->terminal), "size-allocate",
-+                                             G_CALLBACK (terminal_screen_update_background_fast), screen);
-+              }
-     }
-   else
-     {
-+          /* stop updating on size changes */
-+          if (screen->background_signal_id != 0)
-+            {
-+              g_signal_handler_disconnect (G_OBJECT (screen->terminal), screen->background_signal_id);
-+              screen->background_signal_id = 0;
-+            }
-+    
-+          /* WARNING: the causes a resize too! */
-       vte_terminal_set_background_image (VTE_TERMINAL (screen->terminal), NULL);
-     }
-