Import xfce 4.4

- remove all obsolete ports or plugins
- update all plugins to their latest version to support xfce 4.4
  (otherwise they won't compile with 4.4)

31 files changed, 497 insertions, 303 deletions

diff --git a/x11/Terminal/Makefile b/x11/Terminal/Makefile
index 6df009dd0bbd..4c95e70110d2 100644
--- a/x11/Terminal/Makefile
+++ b/x11/Terminal/Makefile
@@ -3,30 +3,56 @@
 # Whom:			Matt Lancereau <ports@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/x11/Terminal/Makefile,v 1.2 2006/10/08 00:20:31 mezz Exp $
 #
 
 PORTNAME=	Terminal
-PORTVERSION=	0.2.4
-PORTREVISION=	3
-CATEGORIES=	x11
-MASTER_SITES=	http://download.berlios.de/xfce-goodies/
+PORTVERSION=	0.2.6
+PORTREVISION=	0
+CATEGORIES=	x11 xfce
+MASTER_SITES=	${MASTER_SITES_XFCE}
+DIST_SUBDIR=	xfce4
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	Terminal emulator for the X windowing system
 
-LIB_DEPENDS=	exo-0.3:${PORTSDIR}/x11/libexo \
-		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
+LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification
 
 GNU_CONFIGURE=	yes
+INSTALLS_ICONS= yes
+USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_GNOME=	glib20 vte intlhack
+USE_GNOME=	gnometarget gtk20 intltool intlhack pkgconfig vte
+USE_XFCE=	configenv libexo libutil panel
+USE_XLIB=	yes
+
+OPTIONS=	DBUS	"Enable D-BUS support"			on \
+		STARTUP "Enable startup notification support"	on
 
 MAN1=		Terminal.1
 
+.include  <bsd.port.pre.mk>
+.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
+
+.if !defined(WITHOUT_DBUS)
+LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+CONFIGURE_ARGS+=--enable-dbus
+PLIST_SUB+=	WITH_DBUS=""
+.else
+CONFIGURE_ARGS+=--disable-dbus
+PLIST_SUB+=	WITH_DBUS="@comment "
+.endif
+
+.if !defined(WITHOUT_STARTUP)
+LIB_DEPENDS+=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification
+CONFIGURE_ARGS+=--enable-startup-notification
+.else
+CONFIGURE_ARGS+=--disable-startup-notification
+.endif
+
 post-patch:
 .if defined(NOPORTDOCS)
 	@${REINPLACE_CMD} -e 's|	doc[    ]*||' ${WRKSRC}/Makefile.in
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11/Terminal/distinfo b/x11/Terminal/distinfo
index 61ba83082352..025c6591911b 100644
--- a/x11/Terminal/distinfo
+++ b/x11/Terminal/distinfo
@@ -1,3 +1,3 @@
-MD5 (Terminal-0.2.4.tar.gz) = 954727a2f5e54bd9ffcc3c69918efdef
-SHA256 (Terminal-0.2.4.tar.gz) = 221b1e028917487cfd8e4c3668893a436a12216a15e231292271477ee3b9cfd8
-SIZE (Terminal-0.2.4.tar.gz) = 1248992
+MD5 (xfce4/Terminal-0.2.6.tar.bz2) = ed091c02e002e2402e3203a2ab2f7c9a
+SHA256 (xfce4/Terminal-0.2.6.tar.bz2) = a1dcb1a86e79780acb1f3548466eba1fb03a9d9e9bd31e6ff3496b07504e53d8
+SIZE (xfce4/Terminal-0.2.6.tar.bz2) = 1582076
diff --git a/x11/Terminal/pkg-descr b/x11/Terminal/pkg-descr
index bb98ac08d0c3..4a02064836df 100644
--- a/x11/Terminal/pkg-descr
+++ b/x11/Terminal/pkg-descr
@@ -1,4 +1,4 @@
 This is the Terminal emulator application. Terminal is a lightweight and
 easy to use terminal emulator for the X windowing system.
 
-WWW: http://www.os-cillation.com
+WWW: http://www.os-cillation.com/
diff --git a/x11/Terminal/pkg-plist b/x11/Terminal/pkg-plist
index c1e1fb3e156c..df3599687e8e 100644
--- a/x11/Terminal/pkg-plist
+++ b/x11/Terminal/pkg-plist
@@ -6,6 +6,8 @@ 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
@@ -17,6 +19,7 @@ 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
 %%PORTDOCS%%%%DOCSDIR%%/C/advanced.html
@@ -43,18 +46,106 @@ share/applications/Terminal.desktop
 %%PORTDOCS%%%%DOCSDIR%%/C/preferred-applications.html
 %%PORTDOCS%%%%DOCSDIR%%/C/support.html
 %%PORTDOCS%%%%DOCSDIR%%/C/usage.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/images/terminal-applications-dialog.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/images/terminal-applications-menu.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/images/terminal-choose-custom-webbrowser.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/images/terminal-compose-shortcut.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/images/terminal-edit-applications.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/images/terminal-edit-preferences.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/images/terminal-first-time.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/images/terminal-multiple-tabs.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/images/terminal-preferences-advanced.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/images/terminal-preferences-appearance.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/images/terminal-preferences-colors.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/images/terminal-set-title.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/images/terminal-preferences-general.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/images/terminal-preferences-shortcuts.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/images/terminal-toolbars.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/copyright.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/getting-started.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/index.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/preferences.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/preferred-applications.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/support.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/usage.html
 %%PORTDOCS%%%%DOCSDIR%%/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-fullscreen.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-advanced.png
+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/be/LC_MESSAGES/Terminal.mo
+share/locale/de/LC_MESSAGES/Terminal.mo
+share/locale/dz/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/eu/LC_MESSAGES/Terminal.mo
+share/locale/fr/LC_MESSAGES/Terminal.mo
+share/locale/he/LC_MESSAGES/Terminal.mo
+share/locale/hu/LC_MESSAGES/Terminal.mo
+share/locale/it/LC_MESSAGES/Terminal.mo
+share/locale/ja/LC_MESSAGES/Terminal.mo
+share/locale/lt/LC_MESSAGES/Terminal.mo
+share/locale/nl/LC_MESSAGES/Terminal.mo
+share/locale/pa/LC_MESSAGES/Terminal.mo
+share/locale/pt_BR/LC_MESSAGES/Terminal.mo
+share/locale/ru/LC_MESSAGES/Terminal.mo
+share/locale/sv/LC_MESSAGES/Terminal.mo
+share/locale/vi/LC_MESSAGES/Terminal.mo
+share/locale/ca/LC_MESSAGES/Terminal.mo
+share/locale/cs/LC_MESSAGES/Terminal.mo
+share/locale/el/LC_MESSAGES/Terminal.mo
+share/locale/fi/LC_MESSAGES/Terminal.mo
+share/locale/gl/LC_MESSAGES/Terminal.mo
+share/locale/ko/LC_MESSAGES/Terminal.mo
+share/locale/pl/LC_MESSAGES/Terminal.mo
+share/locale/sk/LC_MESSAGES/Terminal.mo
+share/locale/uk/LC_MESSAGES/Terminal.mo
+share/locale/zh_CN/LC_MESSAGES/Terminal.mo
+share/locale/zh_TW/LC_MESSAGES/Terminal.mo
 share/pixmaps/terminal.xpm
 @dirrmtry share/pixmaps
 @dirrmtry share/icons/hicolor/scalable
-@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/24x24/stock/navigation
+@dirrmtry share/icons/hicolor/24x24/stock
+@dirrmtry share/icons/hicolor/24x24
 @dirrmtry share/icons/hicolor
 @dirrmtry icons
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/C/images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/C
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/ja/images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/ja
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/applications
 @dirrm share/Terminal/apps
 @dirrm share/Terminal
+@dirrmtry share/icons/hicolor/16x16/stock/navigation
+@dirrmtry share/icons/hicolor/16x16/stock
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor/48x48/stock/navigation
+@dirrmtry share/icons/hicolor/48x48/stock
+@dirrmtry share/icons/hicolor/scalable/apps
+@dirrmtry share/icons/hicolor/scalable
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
diff --git a/x11/libexo/Makefile b/x11/libexo/Makefile
index 4418293328c7..2c7a1da72ea3 100644
--- a/x11/libexo/Makefile
+++ b/x11/libexo/Makefile
@@ -6,43 +6,72 @@
 #    $MCom: ports/x11/libexo/Makefile,v 1.1 2006/10/02 21:05:55 ahze Exp $
 
 PORTNAME=	libexo
-PORTVERSION=	0.3.0
-PORTREVISION=	3
+PORTVERSION=	0.3.2
 CATEGORIES=	x11 xfce
-MASTER_SITES=	http://download.berlios.de/xfce-goodies/
 DISTNAME=	exo-${PORTVERSION}
+MASTER_SITES=	${MASTER_SITES_XFCE}
 
-MAINTAINER=	ports@FreeBSD.org
+DIST_SUBDIR=	xfce4
+PATCH_SITES=	http://people.freebsd.org/~oliver/xfce/
+PATCHFILES=	gcc295-libexo.patch
+
+MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	Terminal library, extensions to Xfce by os-cillation
 
-LIB_DEPENDS=	xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
+BUILD_DEPENDS=	${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
-USE_GNOME=	glib20
+INSTALLS_ICONS= yes
+USE_BZIP2=	yes
+USE_GETTEXT=	yes
+USE_GMAKE=	yes
+USE_GNOME=	glib20 gnomehack gnometarget gtk20 intltool intlhack pkgconfig
 USE_LDCONFIG=	yes
+USE_XFCE=	configenv libutil mcsmanager
+USE_XLIB=	yes
+
+OPTIONS=	PYTHON	"Enable Python support"			off \
+		GTKDOC	"Build with documentation"		off \
+		MCS	"Build with xfce4-mcs-manager support"	on
+
+MAN1=		exo-csource.1 exo-open.1
+
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
 
 .if defined(WITH_GTKDOC)
 BUILD_DEPENDS+=	gtkdocize:${PORTSDIR}/textproc/gtk-doc
 CONFIGURE_ARGS+=--enable-gtk-doc
+PLIST_SUB+=	GTK_DOC=""
 .else
 CONFIGURE_ARGS+=--disable-gtk-doc
+PLIST_SUB+=	GTK_DOC="@comment "
 .endif
 
 .if defined(WITH_PYTHON)
 CONFIGURE_ARGS+=--enable-python
 USE_PYTHON=	yes
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/pygtk.py:${PORTSDIR}/x11-toolkits/py-gtk
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/pygtk.py:${PORTSDIR}/x11-toolkits/py-gtk2
 PLIST_SUB+=	PYTHON=""
 .else
 CONFIGURE_ARGS+=--disable-python
 PLIST_SUB+=	PYTHON="@comment "
 .endif
 
+.if !defined(WITHOUT_MCS)
+CONFIGURE_ARGS+=--enable-mcs-plugin
+BUILD_DEPENDS+=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
+RUN_DEPENDS+=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
+PLIST_SUB+=	MCS_MANAGER=""
+.else
+CONFIGURE_ARGS+=--disable-mcs-plugin
+PLIST_SUB+=	MCS_MANAGER="@comment "
+.endif
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
-		${WRKSRC}/exo/Makefile.in
+	@${REINPLACE_CMD} -e 's|FALSE;;|FALSE;|' ${WRKSRC}/exo/exo-icon-view.c
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11/libexo/distinfo b/x11/libexo/distinfo
index 2c8673957f4d..25a994094d6a 100644
--- a/x11/libexo/distinfo
+++ b/x11/libexo/distinfo
@@ -1,3 +1,6 @@
-MD5 (exo-0.3.0.tar.gz) = 078d50c378064823696995f38e759b08
-SHA256 (exo-0.3.0.tar.gz) = 53f1a0ee85d01f597c5be9abed050960ad397586c1609780d1aaa766af694ed1
-SIZE (exo-0.3.0.tar.gz) = 541683
+MD5 (xfce4/exo-0.3.2.tar.bz2) = 8b73acc98d0938d1193b31316823b6db
+SHA256 (xfce4/exo-0.3.2.tar.bz2) = 632834506cf7768f9541286dbd90b9aa835bd3bb1ef1a022f2bcb99812945c3f
+SIZE (xfce4/exo-0.3.2.tar.bz2) = 1121928
+MD5 (xfce4/gcc295-libexo.patch) = 5b70891dfe9b9c68a9ae68759f1c7172
+SHA256 (xfce4/gcc295-libexo.patch) = dd79882498b45b9bfe2f1573b04eb2764588d94e74e526f2f0418441e21cf83f
+SIZE (xfce4/gcc295-libexo.patch) = 266
diff --git a/x11/libexo/pkg-descr b/x11/libexo/pkg-descr
index c0770bdcf806..b157cfa07232 100644
--- a/x11/libexo/pkg-descr
+++ b/x11/libexo/pkg-descr
@@ -1,3 +1,3 @@
 Terminal library, extensions to Xfce by os-cillation
 
-WWW: http://www.os-cillation.com
+WWW: http://www.os-cillation.com/
diff --git a/x11/libexo/pkg-plist b/x11/libexo/pkg-plist
index a3fcb008ebe6..5622763f768b 100644
--- a/x11/libexo/pkg-plist
+++ b/x11/libexo/pkg-plist
@@ -1,26 +1,49 @@
+bin/exo-csource
+bin/exo-desktop-item-edit
+bin/exo-eject
+bin/exo-mount
+bin/exo-open
+bin/exo-preferred-applications
+bin/exo-unmount
+etc/xdg/xfce4/helpers.rc
 include/exo-0.3/exo/exo-binding.h
 include/exo-0.3/exo/exo-cell-renderer-ellipsized-text.h
+include/exo-0.3/exo/exo-cell-renderer-icon.h
 include/exo-0.3/exo/exo-config.h
 include/exo-0.3/exo/exo-ellipsized-label.h
 include/exo-0.3/exo/exo-enum-types.h
+include/exo-0.3/exo/exo-execute.h
 include/exo-0.3/exo/exo-gdk-pixbuf-extensions.h
 include/exo-0.3/exo/exo-gobject-extensions.h
 include/exo-0.3/exo/exo-gtk-extensions.h
 include/exo-0.3/exo/exo-icon-bar.h
+include/exo-0.3/exo/exo-icon-chooser-dialog.h
 include/exo-0.3/exo/exo-icon-view.h
 include/exo-0.3/exo/exo-md5.h
+include/exo-0.3/exo/exo-mount-point.h
 include/exo-0.3/exo/exo-pango-extensions.h
 include/exo-0.3/exo/exo-string.h
 include/exo-0.3/exo/exo-toolbars-editor-dialog.h
 include/exo-0.3/exo/exo-toolbars-editor.h
 include/exo-0.3/exo/exo-toolbars-model.h
 include/exo-0.3/exo/exo-toolbars-view.h
+include/exo-0.3/exo/exo-tree-view.h
+include/exo-0.3/exo/exo-url.h
+include/exo-0.3/exo/exo-utils.h
+include/exo-0.3/exo/exo-wrap-table.h
 include/exo-0.3/exo/exo-xsession-client.h
 include/exo-0.3/exo/exo.h
+include/exo-0.3/exo-hal/exo-hal.h
 lib/libexo-0.3.a
 lib/libexo-0.3.la
 lib/libexo-0.3.so
-lib/libexo-0.3.so.0
+lib/libexo-0.3.so.4
+lib/libexo-hal-0.3.a
+lib/libexo-hal-0.3.la
+lib/libexo-hal-0.3.so
+lib/libexo-hal-0.3.so.4
+%%PYTHON%%lib/python2.4/site-packages/exo-0.3/_exo.a
+%%PYTHON%%lib/python2.4/site-packages/exo-0.3/_exo.la
 %%PYTHON%%lib/python2.4/site-packages/exo-0.3/_exo.so
 %%PYTHON%%lib/python2.4/site-packages/exo-0.3/exo/__init__.py
 %%PYTHON%%lib/python2.4/site-packages/exo-0.3/exo/__init__.pyc
@@ -28,49 +51,166 @@ lib/libexo-0.3.so.0
 %%PYTHON%%lib/python2.4/site-packages/pyexo.py
 %%PYTHON%%lib/python2.4/site-packages/pyexo.pyc
 %%PYTHON%%lib/python2.4/site-packages/pyexo.pyo
+%%MCS_MANAGER%%lib/xfce4/mcs-plugins/exo-preferred-applications-settings.a
+%%MCS_MANAGER%%lib/xfce4/mcs-plugins/exo-preferred-applications-settings.la
+%%MCS_MANAGER%%lib/xfce4/mcs-plugins/exo-preferred-applications-settings.so
 libdata/pkgconfig/exo-0.3.pc
-share/gtk-doc/html/exo/ExoCellRendererEllipsizedText.html
-share/gtk-doc/html/exo/ExoEllipsizedLabel.html
-share/gtk-doc/html/exo/ExoIconBar.html
-share/gtk-doc/html/exo/ExoIconView.html
-share/gtk-doc/html/exo/ExoToolbarsEditor.html
-share/gtk-doc/html/exo/ExoToolbarsEditorDialog.html
-share/gtk-doc/html/exo/ExoToolbarsModel.html
-share/gtk-doc/html/exo/ExoToolbarsView.html
-share/gtk-doc/html/exo/ExoXsessionClient.html
-share/gtk-doc/html/exo/exo-Binding-Properties-Functions.html
-share/gtk-doc/html/exo/exo-Extensions-to-GObject.html
-share/gtk-doc/html/exo/exo-Extensions-to-Pango.html
-share/gtk-doc/html/exo/exo-Extensions-to-gdk-pixbuf.html
-share/gtk-doc/html/exo/exo-MD5-functions.html
-share/gtk-doc/html/exo/exo-String-Utility-Functions.html
-share/gtk-doc/html/exo/exo-Version-Information.html
-share/gtk-doc/html/exo/exo-extensions.html
-share/gtk-doc/html/exo/exo-miscelleanous.html
-share/gtk-doc/html/exo/exo-overview.html
-share/gtk-doc/html/exo/exo-toolbars.html
-share/gtk-doc/html/exo/exo-widgets.html
-share/gtk-doc/html/exo/exo.devhelp
-share/gtk-doc/html/exo/home.png
-share/gtk-doc/html/exo/index.html
-share/gtk-doc/html/exo/index.sgml
-share/gtk-doc/html/exo/ix01.html
-share/gtk-doc/html/exo/left.png
-share/gtk-doc/html/exo/right.png
-share/gtk-doc/html/exo/style.css
-share/gtk-doc/html/exo/up.png
+libdata/pkgconfig/exo-hal-0.3.pc
+libexec/exo-compose-mail-0.3
+libexec/exo-helper-0.3
+share/applications/exo-preferred-applications.desktop
+%%GTK_DOC%%share/gtk-doc/html/exo/ExoCellRendererEllipsizedText.html
+%%GTK_DOC%%share/gtk-doc/html/exo/ExoEllipsizedLabel.html
+%%GTK_DOC%%share/gtk-doc/html/exo/ExoIconBar.html
+%%GTK_DOC%%share/gtk-doc/html/exo/ExoIconView.html
+%%GTK_DOC%%share/gtk-doc/html/exo/ExoToolbarsEditor.html
+%%GTK_DOC%%share/gtk-doc/html/exo/ExoToolbarsEditorDialog.html
+%%GTK_DOC%%share/gtk-doc/html/exo/ExoToolbarsModel.html
+%%GTK_DOC%%share/gtk-doc/html/exo/ExoToolbarsView.html
+%%GTK_DOC%%share/gtk-doc/html/exo/ExoTreeView.html
+%%GTK_DOC%%share/gtk-doc/html/exo/ExoWrapTable.html
+%%GTK_DOC%%share/gtk-doc/html/exo/ExoXsessionClient.html
+%%GTK_DOC%%share/gtk-doc/html/exo/exo-Binding-Properties-Functions.html
+%%GTK_DOC%%share/gtk-doc/html/exo/exo-Executing-Applications.html
+%%GTK_DOC%%share/gtk-doc/html/exo/exo-Extensions-to-GObject.html
+%%GTK_DOC%%share/gtk-doc/html/exo/exo-Extensions-to-Gtk.html
+%%GTK_DOC%%share/gtk-doc/html/exo/exo-Extensions-to-Pango.html
+%%GTK_DOC%%share/gtk-doc/html/exo/exo-Extensions-to-gdk-pixbuf.html
+%%GTK_DOC%%share/gtk-doc/html/exo/exo-MD5-functions.html
+%%GTK_DOC%%share/gtk-doc/html/exo/exo-Miscellaneous-Utility-Functions.html
+%%GTK_DOC%%share/gtk-doc/html/exo/exo-Opening-URLs.html
+%%GTK_DOC%%share/gtk-doc/html/exo/exo-String-Utility-Functions.html
+%%GTK_DOC%%share/gtk-doc/html/exo/exo-Version-Information.html
+%%GTK_DOC%%share/gtk-doc/html/exo/exo-csource.html
+%%GTK_DOC%%share/gtk-doc/html/exo/exo-extensions.html
+%%GTK_DOC%%share/gtk-doc/html/exo/exo-miscelleanous.html
+%%GTK_DOC%%share/gtk-doc/html/exo/exo-overview.html
+%%GTK_DOC%%share/gtk-doc/html/exo/exo-toolbars.html
+%%GTK_DOC%%share/gtk-doc/html/exo/exo-tools.html
+%%GTK_DOC%%share/gtk-doc/html/exo/exo-widgets.html
+%%GTK_DOC%%share/gtk-doc/html/exo/exo.devhelp
+%%GTK_DOC%%share/gtk-doc/html/exo/home.png
+%%GTK_DOC%%share/gtk-doc/html/exo/index.html
+%%GTK_DOC%%share/gtk-doc/html/exo/index.sgml
+%%GTK_DOC%%share/gtk-doc/html/exo/ix01.html
+%%GTK_DOC%%share/gtk-doc/html/exo/left.png
+%%GTK_DOC%%share/gtk-doc/html/exo/right.png
+%%GTK_DOC%%share/gtk-doc/html/exo/style.css
+%%GTK_DOC%%share/gtk-doc/html/exo/up.png
+share/icons/hicolor/24x24/apps/preferences-desktop-default-applications.png
+share/icons/hicolor/48x48/apps/applications-internet.png
+share/icons/hicolor/48x48/apps/applications-other.png
+share/icons/hicolor/48x48/apps/preferences-desktop-default-applications.png
+share/locale/be/LC_MESSAGES/libexo-0.3.mo
+share/locale/ca/LC_MESSAGES/libexo-0.3.mo
+share/locale/cy/LC_MESSAGES/libexo-0.3.mo
+share/locale/cs/LC_MESSAGES/libexo-0.3.mo
+share/locale/de/LC_MESSAGES/libexo-0.3.mo
+share/locale/dz/LC_MESSAGES/libexo-0.3.mo
+share/locale/el/LC_MESSAGES/libexo-0.3.mo
+share/locale/en_GB/LC_MESSAGES/libexo-0.3.mo
+share/locale/es/LC_MESSAGES/libexo-0.3.mo
+share/locale/et/LC_MESSAGES/libexo-0.3.mo
+share/locale/eu/LC_MESSAGES/libexo-0.3.mo
+share/locale/fi/LC_MESSAGES/libexo-0.3.mo
+share/locale/fr/LC_MESSAGES/libexo-0.3.mo
+share/locale/gl/LC_MESSAGES/libexo-0.3.mo
+share/locale/he/LC_MESSAGES/libexo-0.3.mo
+share/locale/hu/LC_MESSAGES/libexo-0.3.mo
+share/locale/it/LC_MESSAGES/libexo-0.3.mo
+share/locale/ja/LC_MESSAGES/libexo-0.3.mo
+share/locale/ka/LC_MESSAGES/libexo-0.3.mo
+share/locale/lt/LC_MESSAGES/libexo-0.3.mo
+share/locale/mk/LC_MESSAGES/libexo-0.3.mo
+share/locale/nl/LC_MESSAGES/libexo-0.3.mo
+share/locale/pa/LC_MESSAGES/libexo-0.3.mo
+share/locale/pl/LC_MESSAGES/libexo-0.3.mo
+share/locale/pt_BR/LC_MESSAGES/libexo-0.3.mo
+share/locale/ro/LC_MESSAGES/libexo-0.3.mo
+share/locale/ru/LC_MESSAGES/libexo-0.3.mo
+share/locale/sv/LC_MESSAGES/libexo-0.3.mo
+share/pixmaps/exo-0.3/exo-thumbnail-frame.png
 %%PYTHON%%share/pygtk/2.0/defs/exo-0.3/exo.defs
-%%PYTHON%%@dirrm share/pygtk/2.0/defs/exo-0.3
+share/xfce4/doc/C/exo-preferred-applications.html
+share/xfce4/doc/C/images/exo-preferred-applications-internet.png
+share/xfce4/doc/C/images/exo-preferred-applications-utilities.png
+share/xfce4/doc/C/images/exo-preferred-applications-webbrowser-custom.png
+share/xfce4/doc/C/images/exo-preferred-applications-webbrowser-menu.png
+share/xfce4/doc/fr/exo-preferred-applications.html
+share/xfce4/doc/fr/images/exo-preferred-applications-internet.png
+share/xfce4/doc/fr/images/exo-preferred-applications-utilities.png
+share/xfce4/doc/fr/images/exo-preferred-applications-webbrowser-custom.png
+share/xfce4/doc/fr/images/exo-preferred-applications-webbrowser-menu.png
+share/xfce4/doc/ja/exo-preferred-applications.html
+share/xfce4/doc/ja/images/exo-preferred-applications-internet.png
+share/xfce4/doc/ja/images/exo-preferred-applications-utilities.png
+share/xfce4/doc/ja/images/exo-preferred-applications-webbrowser-custom.png
+share/xfce4/doc/ja/images/exo-preferred-applications-webbrowser-menu.png
+share/xfce4/helpers/Terminal.desktop
+share/xfce4/helpers/aterm.desktop
+share/xfce4/helpers/balsa.desktop
+share/xfce4/helpers/debian-sensible-browser.desktop
+share/xfce4/helpers/debian-x-terminal-emulator.desktop
+share/xfce4/helpers/encompass.desktop
+share/xfce4/helpers/epiphany.desktop
+share/xfce4/helpers/eterm.desktop
+share/xfce4/helpers/evolution.desktop
+share/xfce4/helpers/firefox.desktop
+share/xfce4/helpers/galeon.desktop
+share/xfce4/helpers/gnome-terminal.desktop
+share/xfce4/helpers/kmail.desktop
+share/xfce4/helpers/konqueror.desktop
+share/xfce4/helpers/links.desktop
+share/xfce4/helpers/lynx.desktop
+share/xfce4/helpers/mozilla-browser.desktop
+share/xfce4/helpers/mozilla-mailer.desktop
+share/xfce4/helpers/mutt.desktop
+share/xfce4/helpers/netscape-navigator.desktop
+share/xfce4/helpers/nxterm.desktop
+share/xfce4/helpers/opera-browser.desktop
+share/xfce4/helpers/opera-mailer.desktop
+share/xfce4/helpers/sylpheed-claws.desktop
+share/xfce4/helpers/sylpheed.desktop
+share/xfce4/helpers/thunderbird.desktop
+share/xfce4/helpers/urxvt.desktop
+share/xfce4/helpers/w3m.desktop
+share/xfce4/helpers/xterm.desktop
+@dirrmtry etc/xdg/xfce4
+@dirrmtry etc/xdg
 @dirrmtry share/gtk-doc/html
-%%PYTHON%%@dirrmtry share/pygtk/2.0/defs
-%%PYTHON%%@dirrmtry share/pygtk/2.0
-%%PYTHON%%@dirrmtry share/pygtk
-@dirrm share/gtk-doc/html/exo
-@dirrmtry share/gtk-doc/html
-@dirrmtry share/gtk-doc
+@dirrm include/exo-0.3/exo
+@dirrm include/exo-0.3/exo-hal
+@dirrm include/exo-0.3
+@dirrmtry lib/xfce4/mcs-plugins
+@dirrmtry lib/xfce4
+%%GTK_DOC%%@dirrm share/gtk-doc/html/exo
+%%GTK_DOC%%@dirrmtry share/gtk-doc/html
+%%GTK_DOC%%@dirrmtry share/gtk-doc
+@dirrmtry share/applications
+@dirrmtry share/icons/hicolor/24x24/apps
+@dirrmtry share/icons/hicolor/24x24
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
 %%PYTHON%%@dirrm lib/python2.4/site-packages/exo-0.3/exo
 %%PYTHON%%@dirrm lib/python2.4/site-packages/exo-0.3
 %%PYTHON%%@dirrmtry lib/python2.4/site-packages
 %%PYTHON%%@dirrmtry lib/python2.4
-@dirrm include/exo-0.3/exo
-@dirrm include/exo-0.3
+%%PYTHON%%@dirrm share/pygtk/2.0/defs/exo-0.3
+%%PYTHON%%@dirrmtry share/pygtk/2.0/defs
+%%PYTHON%%@dirrmtry share/pygtk/2.0
+%%PYTHON%%@dirrmtry share/pygtk
+@dirrm share/pixmaps/exo-0.3
+@dirrmtry share/xfce4/doc/C/images
+@dirrmtry share/xfce4/doc/C
+@dirrmtry share/xfce4/doc/fr/images
+@dirrmtry share/xfce4/doc/fr
+@dirrmtry share/xfce4/doc/ja/images
+@dirrmtry share/xfce4/doc/ja
+@dirrmtry share/xfce4/doc
+@dirrmtry share/xfce4/helpers
+@dirrmtry share/xfce4
+@dirrmtry share/pixmaps
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
diff --git a/x11/libxfce4mcs/Makefile b/x11/libxfce4mcs/Makefile
index 58b9933a4037..9b3f3e64c4f0 100644
--- a/x11/libxfce4mcs/Makefile
+++ b/x11/libxfce4mcs/Makefile
@@ -6,32 +6,44 @@
 #
 
 PORTNAME=	libxfce4mcs
-PORTVERSION=	4.2.3
-PORTREVISION=	3
+PORTVERSION=	4.4.0
 CATEGORIES=	x11 xfce
-MASTER_SITES=	http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
-		http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
-		http://public.fh-wolfenbuettel.de/~luedickj/xfce4/xfce-${PORTVERSION}/src/ \
-		http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-${PORTVERSION}/src/
+MASTER_SITES=	${MASTER_SITES_XFCE}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 settings management library used by most XFce 4 modules
 
-LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util
-
-USE_XLIB=	yes
-USE_GNOME=	glib20 gnomehack
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-INSTALLS_SHLIB=	yes
 NO_FILTER_SHLIBS=	yes
+USE_BZIP2=	yes
+USE_GETTEXT=	yes
+USE_GMAKE=	yes
+USE_GNOME=	glib20 gnomehack gnometarget pkgconfig
+USE_LDCONFIG=	yes
+USE_XFCE=	configenv libutil
+USE_XLIB=	yes
+
+OPTIONS=	GTKDOC	"install the library documentation"	off \
+		STARTUP "Enable startup notification support"	on
+
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
 
 .if defined(WITH_GTKDOC)
 BUILD_DEPENDS+=	gtkdocize:${PORTSDIR}/textproc/gtk-doc
 CONFIGURE_ARGS+=--enable-gtk-doc
+PLIST_SUB+=	GTK_DOC=""
 .else
 CONFIGURE_ARGS+=--disable-gtk-doc
+PLIST_SUB+=	GTK_DOC="@comment "
+.endif
+
+.if !defined(WITHOUT_STARTUP)
+LIB_DEPENDS+=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification
+CONFIGURE_ARGS+=--enable-startup-notification
+.else
+CONFIGURE_ARGS+=--disable-startup-notification
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11/libxfce4mcs/distinfo b/x11/libxfce4mcs/distinfo
index 0ba8e8711b60..dd0028490e9b 100644
--- a/x11/libxfce4mcs/distinfo
+++ b/x11/libxfce4mcs/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/libxfce4mcs-4.2.3.tar.gz) = b3244024bea7f5756f4c0f541bc24128
-SHA256 (xfce4/libxfce4mcs-4.2.3.tar.gz) = 52a3a3b034cb67de224252cd905763277080f9a068f32a879f6f30e18e5fc8dc
-SIZE (xfce4/libxfce4mcs-4.2.3.tar.gz) = 384594
+MD5 (xfce4/libxfce4mcs-4.4.0.tar.bz2) = 224863509b7f546fa1ca198374c424d3
+SHA256 (xfce4/libxfce4mcs-4.4.0.tar.bz2) = 35f2cd224f98d3c296d8f4a6299a1e99d09a841d65b9b3431edca102c15788fa
+SIZE (xfce4/libxfce4mcs-4.4.0.tar.bz2) = 259923
diff --git a/x11/libxfce4mcs/pkg-descr b/x11/libxfce4mcs/pkg-descr
index 7cc53b9ab7a9..6fc74612b2f8 100644
--- a/x11/libxfce4mcs/pkg-descr
+++ b/x11/libxfce4mcs/pkg-descr
@@ -1,3 +1,3 @@
 XFce 4 settings management library used by most XFce 4 modules. 
 
-WWW: http://www.xfce.org
+WWW: http://www.xfce.org/
diff --git a/x11/libxfce4mcs/pkg-plist b/x11/libxfce4mcs/pkg-plist
index bee51b11e758..913ac3aa4e09 100644
--- a/x11/libxfce4mcs/pkg-plist
+++ b/x11/libxfce4mcs/pkg-plist
@@ -2,14 +2,12 @@ include/xfce4/libxfce4mcs/mcs-client.h
 include/xfce4/libxfce4mcs/mcs-client-enum-types.h
 include/xfce4/libxfce4mcs/mcs-common.h
 include/xfce4/libxfce4mcs/mcs-manager.h
-lib/libxfce4mcs-client.a
 lib/libxfce4mcs-client.la
 lib/libxfce4mcs-client.so
-lib/libxfce4mcs-client.so.2
-lib/libxfce4mcs-manager.a
+lib/libxfce4mcs-client.so.3
 lib/libxfce4mcs-manager.la
 lib/libxfce4mcs-manager.so
-lib/libxfce4mcs-manager.so.2
+lib/libxfce4mcs-manager.so.3
 libdata/pkgconfig/libxfce4mcs-manager-1.0.pc
 libdata/pkgconfig/libxfce4mcs-client-1.0.pc
 share/gtk-doc/html/libxfce4mcs/ch01.html
@@ -22,6 +20,7 @@ share/gtk-doc/html/libxfce4mcs/libxfce4mcs-mcs-common.html
 share/gtk-doc/html/libxfce4mcs/libxfce4mcs-mcs-manager.html
 share/gtk-doc/html/libxfce4mcs/libxfce4mcs.devhelp
 share/gtk-doc/html/libxfce4mcs/right.png
+share/gtk-doc/html/libxfce4mcs/style.css
 share/gtk-doc/html/libxfce4mcs/up.png
 @dirrm include/xfce4/libxfce4mcs
 @dirrm share/gtk-doc/html/libxfce4mcs
diff --git a/x11/libxfce4util/Makefile b/x11/libxfce4util/Makefile
index cc734a398c8d..457c87d40e9d 100644
--- a/x11/libxfce4util/Makefile
+++ b/x11/libxfce4util/Makefile
@@ -6,29 +6,31 @@
 #
 
 PORTNAME=	libxfce4util
-PORTVERSION=	4.2.3.2
-PORTREVISION=	2
+PORTVERSION=	4.4.0
 CATEGORIES=	x11 xfce
-MASTER_SITES=	http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
-		http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
-		http://www.p0llux.be/xfce/xfce-${PORTVERSION}/src/ \
-		http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-${PORTVERSION}/src/
+MASTER_SITES=	${MASTER_SITES_XFCE}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 library with non-graphical helper functions
 
-USE_GNOME=	glib20 gnomehack
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-INSTALLS_SHLIB=	yes
 NO_FILTER_SHLIBS=	yes
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_GNOME=	glib20 gnomehack gnometarget pkgconfig
+USE_LDCONFIG=	yes
+USE_XFCE=	configenv
 
 .if defined(WITH_GTKDOC)
 BUILD_DEPENDS+=	gtkdocize:${PORTSDIR}/textproc/gtk-doc
 CONFIGURE_ARGS+=--enable-gtk-doc
+PLIST_SUB+=	GTK_DOC=""
 .else
 CONFIGURE_ARGS+=--disable-gtk-doc
+PLIST_SUB+=	GTK_DOC="@comment "
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
+.include <bsd.port.post.mk>
diff --git a/x11/libxfce4util/distinfo b/x11/libxfce4util/distinfo
index 971b1aa8bf10..0f0186f82fea 100644
--- a/x11/libxfce4util/distinfo
+++ b/x11/libxfce4util/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/libxfce4util-4.2.3.2.tar.gz) = 2d312ba48da612501d6776f8b4a65797
-SHA256 (xfce4/libxfce4util-4.2.3.2.tar.gz) = 344e0dec9183fbc90f38ed887f0ce4fab82d50c3076ae92bd27086f3fa6d7170
-SIZE (xfce4/libxfce4util-4.2.3.2.tar.gz) = 469106
+MD5 (xfce4/libxfce4util-4.4.0.tar.bz2) = 543fb8efe96d6e83f897a7c64c48e9e6
+SHA256 (xfce4/libxfce4util-4.4.0.tar.bz2) = 47ca0ae8dd2bc65f05603ca2a1c37ad7c8a37e5dbeec923b480b77e8212d1786
+SIZE (xfce4/libxfce4util-4.4.0.tar.bz2) = 326862
diff --git a/x11/libxfce4util/pkg-descr b/x11/libxfce4util/pkg-descr
index 5cca69a33dd7..bee6f4f5bd4d 100644
--- a/x11/libxfce4util/pkg-descr
+++ b/x11/libxfce4util/pkg-descr
@@ -1,3 +1,3 @@
 XFce 4 library with non-graphical helper functions. 
 
-WWW: http://www.xfce.org
+WWW: http://www.xfce.org/
diff --git a/x11/libxfce4util/pkg-plist b/x11/libxfce4util/pkg-plist
index ed26fb17971f..e415b223174a 100644
--- a/x11/libxfce4util/pkg-plist
+++ b/x11/libxfce4util/pkg-plist
@@ -2,20 +2,23 @@ include/xfce4/libxfce4util/debug.h
 include/xfce4/libxfce4util/i18n.h
 include/xfce4/libxfce4util/libxfce4util.h
 include/xfce4/libxfce4util/libxfce4util-config.h
+include/xfce4/libxfce4util/libxfce4util-enum-types.h
 include/xfce4/libxfce4util/utf8.h
 include/xfce4/libxfce4util/util.h
-include/xfce4/libxfce4util/util-enum-types.h
 include/xfce4/libxfce4util/xfce-desktopentry.h
 include/xfce4/libxfce4util/xfce-fileutils.h
 include/xfce4/libxfce4util/xfce-generics.h
+include/xfce4/libxfce4util/xfce-i18n.h
 include/xfce4/libxfce4util/xfce-kiosk.h
+include/xfce4/libxfce4util/xfce-license.h
 include/xfce4/libxfce4util/xfce-miscutils.h
 include/xfce4/libxfce4util/xfce-rc.h
 include/xfce4/libxfce4util/xfce-resource.h
+include/xfce4/libxfce4util/xfce-utf8.h
 lib/libxfce4util.a
 lib/libxfce4util.la
 lib/libxfce4util.so
-lib/libxfce4util.so.1
+lib/libxfce4util.so.4
 libdata/pkgconfig/libxfce4util-1.0.pc
 sbin/xfce4-kiosk-query
 share/gtk-doc/html/libxfce4util/home.png
@@ -28,9 +31,11 @@ share/gtk-doc/html/libxfce4util/libxfce4util-Internationalisation.html
 share/gtk-doc/html/libxfce4util/libxfce4util-Miscellaneous-Utilities.html
 share/gtk-doc/html/libxfce4util/libxfce4util-Resource-Config-File-Support.html
 share/gtk-doc/html/libxfce4util/libxfce4util-Resource-lookup-functions.html
-share/gtk-doc/html/libxfce4util/libxfce4util-Standard-Macros.html
 share/gtk-doc/html/libxfce4util/libxfce4util-Unicode-Support-Functions.html
+share/gtk-doc/html/libxfce4util/style.css
 share/gtk-doc/html/libxfce4util/up.png
+share/gtk-doc/html/libxfce4util/libxfce4util-Software-Licenses.html
+share/gtk-doc/html/libxfce4util/libxfce4util-Version-Information.html
 share/gtk-doc/html/libxfce4util/libxfce4util-Xfce-Generics.html
 share/gtk-doc/html/libxfce4util/libxfce4util-Xfce-Kiosk-functions.html
 share/gtk-doc/html/libxfce4util/libxfce4util-core.html
@@ -40,14 +45,27 @@ share/gtk-doc/html/libxfce4util/libxfce4util-utilities.html
 share/gtk-doc/html/libxfce4util/libxfce4util.devhelp
 share/gtk-doc/html/libxfce4util/reference.html
 share/gtk-doc/html/libxfce4util/right.png
-share/xfce4/m4/X11.m4
-share/xfce4/m4/debug.m4
-share/xfce4/m4/depends.m4
-share/xfce4/m4/i18n.m4
+share/locale/cs/LC_MESSAGES/libxfce4util.mo
+share/locale/cy/LC_MESSAGES/libxfce4util.mo
+share/locale/de/LC_MESSAGES/libxfce4util.mo
+share/locale/dz/LC_MESSAGES/libxfce4util.mo
+share/locale/fr/LC_MESSAGES/libxfce4util.mo
+share/locale/he/LC_MESSAGES/libxfce4util.mo
+share/locale/ja/LC_MESSAGES/libxfce4util.mo
+share/locale/ka/LC_MESSAGES/libxfce4util.mo
+share/locale/lt/LC_MESSAGES/libxfce4util.mo
+share/locale/mk/LC_MESSAGES/libxfce4util.mo
+share/locale/nl/LC_MESSAGES/libxfce4util.mo
+share/locale/pt_BR/LC_MESSAGES/libxfce4util.mo
+share/locale/ca/LC_MESSAGES/libxfce4util.mo
+share/locale/fi/LC_MESSAGES/libxfce4util.mo
+share/locale/gl/LC_MESSAGES/libxfce4util.mo
+share/locale/ko/LC_MESSAGES/libxfce4util.mo
+share/locale/pl/LC_MESSAGES/libxfce4util.mo
+share/locale/uk/LC_MESSAGES/libxfce4util.mo
 @dirrm include/xfce4/libxfce4util
 @dirrmtry include/xfce4
 @dirrm share/gtk-doc/html/libxfce4util
 @dirrmtry share/gtk-doc/html
 @dirrmtry share/gtk-doc
-@dirrm share/xfce4/m4
 @dirrmtry share/xfce4
diff --git a/x11/xfce4-clipman-plugin/Makefile b/x11/xfce4-clipman-plugin/Makefile
index 7bd939a35201..9fa4e7b4979c 100644
--- a/x11/xfce4-clipman-plugin/Makefile
+++ b/x11/xfce4-clipman-plugin/Makefile
@@ -6,26 +6,22 @@
 #
 
 PORTNAME=	xfce4-clipman-plugin
-PORTVERSION=	0.4.1
-PORTREVISION=	4
+PORTVERSION=	0.8.0
 CATEGORIES=	x11 xfce
-MASTER_SITES=	${MASTER_SITE_BERLIOS}
-MASTER_SITE_SUBDIR=	xfce-goodies
+MASTER_SITES=	http://goodies.xfce.org/releases/${PORTNAME}/
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	r.c.ladan@gmail.com
 COMMENT=	XFce 4 clipboard module for xfce4-panel
 
-BUILD_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
-		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui \
-		xml2.5:${PORTSDIR}/textproc/libxml2 \
-		startup-notification-1.0:${PORTSDIR}/x11/startup-notification
-RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-
-USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+USE_BZIP2=	yes
+USE_GETTEXT=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnometarget gtk20 intltool intlhack pkgconfig
+USE_XFCE=	configenv panel
+USE_XLIB=	yes
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
+.include <bsd.port.post.mk>
diff --git a/x11/xfce4-clipman-plugin/distinfo b/x11/xfce4-clipman-plugin/distinfo
index ba6a217998bd..780e90551408 100644
--- a/x11/xfce4-clipman-plugin/distinfo
+++ b/x11/xfce4-clipman-plugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfce4-clipman-plugin-0.4.1.tar.gz) = 664f6ca8500d8f240289c27d7bf4f419
-SHA256 (xfce4/xfce4-clipman-plugin-0.4.1.tar.gz) = c120a80772914ea6a5da661efb8a2473bd7919d5a530867d6a4f12b9706a9df4
-SIZE (xfce4/xfce4-clipman-plugin-0.4.1.tar.gz) = 305762
+MD5 (xfce4/xfce4-clipman-plugin-0.8.0.tar.bz2) = 808d4e8bc6e9a9d4ed30124fb2236c1d
+SHA256 (xfce4/xfce4-clipman-plugin-0.8.0.tar.bz2) = 49e6c6160ae4c4123836fd1b8e24edff567cd3345e4b3f9e847299733888a1ca
+SIZE (xfce4/xfce4-clipman-plugin-0.8.0.tar.bz2) = 193458
diff --git a/x11/xfce4-clipman-plugin/pkg-descr b/x11/xfce4-clipman-plugin/pkg-descr
index 242dea8663a1..03231149cb8b 100644
--- a/x11/xfce4-clipman-plugin/pkg-descr
+++ b/x11/xfce4-clipman-plugin/pkg-descr
@@ -3,4 +3,4 @@ for the panel. It now includes a "Clear clipboard" option, and a drag-and-drop
 paste feature contributed by Andre Lerche.
 
 Author:	Eduard Roccatello <master@spine-group.org>
-WWW:	http://xfce-goodies.berlios.de/
+WWW: http://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin
diff --git a/x11/xfce4-clipman-plugin/pkg-plist b/x11/xfce4-clipman-plugin/pkg-plist
index 4681d71322f4..7c2ba26b8c30 100644
--- a/x11/xfce4-clipman-plugin/pkg-plist
+++ b/x11/xfce4-clipman-plugin/pkg-plist
@@ -1,5 +1,16 @@
-@comment $FreeBSD$
-lib/xfce4/panel-plugins/libclipman.a
-lib/xfce4/panel-plugins/libclipman.la
-lib/xfce4/panel-plugins/libclipman.so
-@dirrmtry lib/xfce4/panel-plugins
+libexec/xfce4/panel-plugins/xfce4-clipman-plugin
+share/locale/ca/LC_MESSAGES/xfce4-clipman-plugin.mo
+share/locale/cs/LC_MESSAGES/xfce4-clipman-plugin.mo
+share/locale/de/LC_MESSAGES/xfce4-clipman-plugin.mo
+share/locale/eu/LC_MESSAGES/xfce4-clipman-plugin.mo
+share/locale/fr/LC_MESSAGES/xfce4-clipman-plugin.mo
+share/locale/hu/LC_MESSAGES/xfce4-clipman-plugin.mo
+share/locale/ja/LC_MESSAGES/xfce4-clipman-plugin.mo
+share/locale/pl/LC_MESSAGES/xfce4-clipman-plugin.mo
+share/locale/pt_BR/LC_MESSAGES/xfce4-clipman-plugin.mo
+share/locale/zh_TW/LC_MESSAGES/xfce4-clipman-plugin.mo
+share/xfce4/panel-plugins/clipman.desktop
+@dirrmtry share/xfce4/panel-plugins
+@dirrmtry share/xfce4
+@dirrmtry libexec/xfce4/panel-plugins
+@dirrmtry libexec/xfce4
diff --git a/x11/xfce4-taskmanager/Makefile b/x11/xfce4-taskmanager/Makefile
index 518bb3f51bad..a1778ddc2a3e 100644
--- a/x11/xfce4-taskmanager/Makefile
+++ b/x11/xfce4-taskmanager/Makefile
@@ -6,15 +6,26 @@
 #
 
 PORTNAME=	xfce4-taskmanager
-PORTVERSION=	0.2.1
+PORTVERSION=	0.4.0.r2
 CATEGORIES=	x11 xfce
-MASTER_SITES=	http://download.berlios.de/xfce-goodies/
+MASTER_SITES=	http://xfce4-taskmanager.nebulon.de/
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/-rc/}
+DIST_SUBDIR=	xfce4
 
 MAINTAINER=	DaJoob@dajoob.com
 COMMENT=	A task manager for XFCE
 
-BUILD_DEPENDS=	xfwm4:${PORTSDIR}/x11-wm/xfce4-wm
+CONFIGURE_ENV=	PKG_CONFIG_PATH=${X11BASE}/libdata/pkgconfig:${LOCALBASE}/libdata/pkgconfig
 
-USE_AUTOTOOLS=	automake:19 autoconf:259
+GNU_CONFIGURE=	yes
+USE_BZIP=	yes
+USE_GCC=	3.4+
+USE_GETTEXT=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnometarget gtk20 intltool intlhack pkgconfig
+USE_XFCE=	configenv libgui
+USE_XLIB=	yes
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
+.include <bsd.port.post.mk>
diff --git a/x11/xfce4-taskmanager/distinfo b/x11/xfce4-taskmanager/distinfo
index c86c6e9f3842..d982a8d5252d 100644
--- a/x11/xfce4-taskmanager/distinfo
+++ b/x11/xfce4-taskmanager/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4-taskmanager-0.2.1.tar.gz) = 223be8e08c2696ff468ad15093067f03
-SHA256 (xfce4-taskmanager-0.2.1.tar.gz) = c227c7cb21762f69ac615972f1229a4ab77fcda3cf9da46dcfdc80315be20053
-SIZE (xfce4-taskmanager-0.2.1.tar.gz) = 321272
+MD5 (xfce4/xfce4-taskmanager-0.4.0-rc2.tar.gz) = 360b18415f85563f6359860d031b0382
+SHA256 (xfce4/xfce4-taskmanager-0.4.0-rc2.tar.gz) = c3c95826f59657732ae6fc53b53ae50fa195235a3f4580738b8c683df45d54c1
+SIZE (xfce4/xfce4-taskmanager-0.4.0-rc2.tar.gz) = 376201
diff --git a/x11/xfce4-taskmanager/files/patch-aclocal.m4 b/x11/xfce4-taskmanager/files/patch-aclocal.m4
deleted file mode 100644
index 9586331bbaa2..000000000000
--- a/x11/xfce4-taskmanager/files/patch-aclocal.m4
+++ /dev/null
@@ -1,19 +0,0 @@
-*** aclocal.m4.orig	Mon May  9 19:35:59 2005
---- aclocal.m4	Mon May  9 19:37:22 2005
-***************
-*** 98,104 ****
-  # Call AM_AUTOMAKE_VERSION so it can be traced.
-  # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-  AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-! 	 [AM_AUTOMAKE_VERSION([1.9.1])])
-  
-  # AM_AUX_DIR_EXPAND
-  
---- 98,104 ----
-  # Call AM_AUTOMAKE_VERSION so it can be traced.
-  # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-  AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-! 	 [AM_AUTOMAKE_VERSION([1.9.6])])
-  
-  # AM_AUX_DIR_EXPAND
-  
diff --git a/x11/xfce4-taskmanager/files/patch-src-functions.c b/x11/xfce4-taskmanager/files/patch-src-functions.c
deleted file mode 100644
index 3d453cea6744..000000000000
--- a/x11/xfce4-taskmanager/files/patch-src-functions.c
+++ /dev/null
@@ -1,53 +0,0 @@
---- src/functions.c.orig	Tue Feb  1 23:32:27 2005
-+++ src/functions.c	Tue May 24 21:57:39 2005
-@@ -41,13 +41,13 @@
- {
- 	/* markes all tasks to "not checked" */
- 	gint i;
-+	DIR *dir;
-+	struct dirent *dir_entry;
- 	
- 	for(i = 0; i < task_count; i++)
- 		all_tasks[i].checked = FALSE;
- 	
- 	/* load the current taskdetails */
--	DIR *dir;
--	struct dirent *dir_entry;
- 
- 	if((dir = opendir("/proc")) == NULL)
- 		printf("Error: couldn't load the directory\n");
-@@ -56,18 +56,20 @@
- 	{
- 		if(atoi(dir_entry->d_name) != 0)
- 		{
--			FILE *task_file;
--			gchar task_file_name[256] = "/proc/";
--			g_strlcat(task_file_name,dir_entry->d_name, 256);
--			g_strlcat(task_file_name,"/status", 256);
--		
- 			gchar buffer[256];
- 			gint line_count = 0;
- 			struct task task;
- 			struct passwd *passwdp;
- 		
-+			FILE *task_file;
-+			gchar task_file_name[256] = "/proc/";
-+			g_strlcat(task_file_name,dir_entry->d_name, 256);
-+			g_strlcat(task_file_name,"/status", 256);
-+		
- 			if((task_file = fopen(task_file_name,"r")) != NULL)
- 			{
-+				gboolean new_task = TRUE;
-+				
- 				while(fgets(buffer, 256, task_file) != NULL)
- 				{
- 					if(line_count == 0)
-@@ -89,8 +91,6 @@
- 				fclose(task_file);
- 				
- 				/* check if task is new and marks the task that its checked*/
--				gboolean new_task = TRUE;
--				
- 				for(i = 0; i < task_count; i++)
- 				{
- 					if(strcmp(all_tasks[i].pid,task.pid) == 0)
diff --git a/x11/xfce4-taskmanager/files/patch-src-gui.c b/x11/xfce4-taskmanager/files/patch-src-gui.c
deleted file mode 100644
index 19e9b9c180a3..000000000000
--- a/x11/xfce4-taskmanager/files/patch-src-gui.c
+++ /dev/null
@@ -1,32 +0,0 @@
---- src/gui.c.orig	Tue Feb  1 23:20:47 2005
-+++ src/gui.c	Tue May 24 21:51:04 2005
-@@ -98,24 +98,25 @@
- gboolean add_new_list_item(struct task task)
- {
- 	GtkTreeIter iter;
-+	gchar *list_value_1, *list_value_2, *list_value_3, *list_value_4;
- 	
- 	/* Append new line in the list */
- 	gtk_list_store_append(GTK_LIST_STORE(list_store), &iter);
- 	
- 	/* Fill the appended line with data */
--	gchar *list_value_1 = g_strdup_printf("%s", task.uid);
-+	list_value_1 = g_strdup_printf("%s", task.uid);
- 	gtk_list_store_set(GTK_LIST_STORE(list_store), &iter, 0, list_value_1, -1);
- 	g_free(list_value_1);
- 
--	gchar *list_value_2 = g_strdup_printf("%s", task.pid);
-+	list_value_2 = g_strdup_printf("%s", task.pid);
- 	gtk_list_store_set(GTK_LIST_STORE(list_store), &iter, 1, list_value_2, -1);
- 	g_free(list_value_2);
- 	
--	gchar *list_value_3 = g_strdup_printf("%s", task.ppid);
-+	list_value_3 = g_strdup_printf("%s", task.ppid);
- 	gtk_list_store_set(GTK_LIST_STORE(list_store), &iter, 2, list_value_3, -1);
- 	g_free(list_value_3);
- 	
--	gchar *list_value_4 = g_strdup_printf("%s", task.name);
-+	list_value_4 = g_strdup_printf("%s", task.name);
- 	gtk_list_store_set(GTK_LIST_STORE(list_store), &iter, 3, list_value_4, -1);
- 	g_free(list_value_4);
- 	
diff --git a/x11/xfce4-taskmanager/pkg-descr b/x11/xfce4-taskmanager/pkg-descr
index c1d5bc5ef484..f13a0bee0a7a 100644
--- a/x11/xfce4-taskmanager/pkg-descr
+++ b/x11/xfce4-taskmanager/pkg-descr
@@ -1,7 +1,4 @@
 This is a port of the xfce-goodies plugin that adds a task
 manager to XFCE.
 
-WWW: http://xfce-goodies.berlios.de
-
-- DaJoob
-DaJoob@dajoob.com
+WWW: http://www.xfce.org/
diff --git a/x11/xfce4-taskmanager/pkg-plist b/x11/xfce4-taskmanager/pkg-plist
index b25c6ff00a9b..2ec120eb7a04 100644
--- a/x11/xfce4-taskmanager/pkg-plist
+++ b/x11/xfce4-taskmanager/pkg-plist
@@ -1 +1,14 @@
 bin/xfce4-taskmanager
+share/locale/de/LC_MESSAGES/xfce4-taskmanager.mo
+share/locale/eu/LC_MESSAGES/xfce4-taskmanager.mo
+share/locale/fr/LC_MESSAGES/xfce4-taskmanager.mo
+share/locale/hu/LC_MESSAGES/xfce4-taskmanager.mo
+share/locale/ja/LC_MESSAGES/xfce4-taskmanager.mo
+share/locale/pt_BR/LC_MESSAGES/xfce4-taskmanager.mo
+share/locale/ru/LC_MESSAGES/xfce4-taskmanager.mo
+share/locale/vi/LC_MESSAGES/xfce4-taskmanager.mo
+share/locale/fi/LC_MESSAGES/xfce4-taskmanager.mo
+share/locale/gl/LC_MESSAGES/xfce4-taskmanager.mo
+share/locale/pl/LC_MESSAGES/xfce4-taskmanager.mo
+share/locale/zh_TW/LC_MESSAGES/xfce4-taskmanager.mo
+
diff --git a/x11/xfce4-trigger-launcher/Makefile b/x11/xfce4-trigger-launcher/Makefile
deleted file mode 100644
index 0acfdfd43ddd..000000000000
--- a/x11/xfce4-trigger-launcher/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# New ports collection makefile for:	xfce4-trigger-launcher
-# Date created:				2004/05/10
-# Whom:					Zahemszky, Gábor <Gabor@Zahemszky.HU>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xfce4-trigger-launcher
-PORTVERSION=	4.2.3
-PORTREVISION=	2
-CATEGORIES=	x11 xfce
-MASTER_SITES=	http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
-		http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
-		http://public.fh-wolfenbuettel.de/~luedickj/xfce4/xfce-${PORTVERSION}/src/ \
-		http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-${PORTVERSION}/src/
-DISTNAME=	xfce4-trigger-launcher-${PORTVERSION}
-DIST_SUBDIR=	xfce4
-
-MAINTAINER=	oliver@FreeBSD.org
-COMMENT=	A command trigger plugin for xfce4-panel
-
-BUILD_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
-		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui \
-		startup-notification-1.0:${PORTSDIR}/x11/startup-notification
-RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-
-USE_GNOME=	gtk20 libxml2
-GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-
-.include <bsd.port.mk>
diff --git a/x11/xfce4-trigger-launcher/distinfo b/x11/xfce4-trigger-launcher/distinfo
deleted file mode 100644
index 0878518547b3..000000000000
--- a/x11/xfce4-trigger-launcher/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xfce4/xfce4-trigger-launcher-4.2.3.tar.gz) = af3c0356862af8a37e90ec18ad008918
-SHA256 (xfce4/xfce4-trigger-launcher-4.2.3.tar.gz) = 8ddb31039d3c44e04272f1d42c863d80f3bfdfcc6b39a6752c47ce65c69dd164
-SIZE (xfce4/xfce4-trigger-launcher-4.2.3.tar.gz) = 371223
diff --git a/x11/xfce4-trigger-launcher/pkg-descr b/x11/xfce4-trigger-launcher/pkg-descr
deleted file mode 100644
index cf3e0ddc348b..000000000000
--- a/x11/xfce4-trigger-launcher/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-xfce4-trigger-launcher is a command trigger plugin for xfce4-panel.
-The commands can be changed via the properties dialog.
-
-Authors:
-       Danny Milosavljevic <danny_milo@yahoo.com>
-       Benedikt Meurer <benedikt.meurer@unix-ag.uni-siegen.de>
-
-WWW: http://www.xfce.org/
-
-Ported: Gabor@Zahemszky.HU
diff --git a/x11/xfce4-trigger-launcher/pkg-plist b/x11/xfce4-trigger-launcher/pkg-plist
deleted file mode 100644
index a74c42d57b8d..000000000000
--- a/x11/xfce4-trigger-launcher/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-lib/xfce4/panel-plugins/libtriggerlauncher.a
-lib/xfce4/panel-plugins/libtriggerlauncher.la
-lib/xfce4/panel-plugins/libtriggerlauncher.so
-@dirrmtry lib/xfce4/panel-plugins
-@dirrmtry lib/xfce4