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)

3 files changed, 49 insertions, 68 deletions

diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile
index 6b5ca6b94258..000d1af44840 100644
--- a/x11-wm/xfce4-session/Makefile
+++ b/x11-wm/xfce4-session/Makefile
@@ -6,35 +6,29 @@
 #
 
 PORTNAME=	xfce4-session
-PORTVERSION=	4.2.3
-PORTREVISION=	2
+PORTVERSION=	4.4.0
 CATEGORIES=	x11-wm 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=	Session manager for the Xfce 4 desktop environment
 
-BUILD_DEPENDS=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager \
-		iceauth:${X_CLIENTS_PORT}
-LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
-		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
-RUN_DEPENDS=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager \
-		iceauth:${X_CLIENTS_PORT}
+BUILD_DEPENDS=	iceauth:${X_CLIENTS_PORT}
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
-USE_GETTEXT=	yes
-USE_GNOME=	gnomehack
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-INSTALLS_SHLIB= yes
-
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include \
-			-L${LOCALBASE}/lib -I${X11BASE}/include \
-			-L${X11BASE}/lib"
+INSTALLS_ICONS= yes
+USE_BZIP2=	yes
+USE_GETTEXT=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnomehack gnometarget gtk20 intltool intlhack pkgconfig
+USE_LDCONFIG=	yes
+USE_XFCE=	configenv libgui libmcs libutil mcsmanager
+USE_XLIB=	yes
 
 MAN1=		xfce4-session.1 xfce4-session-logout.1
 
-.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-wm/xfce4-session/distinfo b/x11-wm/xfce4-session/distinfo
index 4597063025ef..b72f0c819ab7 100644
--- a/x11-wm/xfce4-session/distinfo
+++ b/x11-wm/xfce4-session/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfce4-session-4.2.3.tar.gz) = e3685ace007f065eadbd7acce6fa61e8
-SHA256 (xfce4/xfce4-session-4.2.3.tar.gz) = cbf5f6b8d68c0d29f503b805a2143d73b6192f96ce3d667c38521db16f09ca8b
-SIZE (xfce4/xfce4-session-4.2.3.tar.gz) = 1629362
+MD5 (xfce4/xfce4-session-4.4.0.tar.bz2) = 03132946280bae3107101e02fbad0ba8
+SHA256 (xfce4/xfce4-session-4.4.0.tar.bz2) = ebaa5c338a2264dbb3fc3c2f51c4f870c660df0141368c47178771d0c0c53be2
+SIZE (xfce4/xfce4-session-4.4.0.tar.bz2) = 1328917
diff --git a/x11-wm/xfce4-session/pkg-plist b/x11-wm/xfce4-session/pkg-plist
index 0ceaecfa6233..3ac5bf25e892 100644
--- a/x11-wm/xfce4-session/pkg-plist
+++ b/x11-wm/xfce4-session/pkg-plist
@@ -1,5 +1,8 @@
+bin/xfce4-autostart-editor
 bin/xfce4-session
 bin/xfce4-session-logout
+bin/xfce4-tips
+etc/xdg/autostart/xfce4-tips-autostart.desktop
 etc/xdg/xfce4-session/xfce4-session.rc
 include/xfce4/xfce4-session-4.2/libxfsm/xfsm-splash-engine.h
 include/xfce4/xfce4-session-4.2/libxfsm/xfsm-splash-rc.h
@@ -26,6 +29,7 @@ lib/xfce4/splash/engines/libsimple.so
 libexec/balou-export-theme
 libexec/balou-install-theme
 libexec/xfsm-shutdown-helper
+share/applications/xfce4-autostart-editor.desktop
 share/applications/xfce-session-settings.desktop
 share/applications/xfce-splash-settings.desktop
 share/icons/hicolor/128x128/apps/xfce4-session.png
@@ -37,15 +41,14 @@ share/icons/hicolor/72x72/apps/xfsm-trash-hilight.png
 share/icons/hicolor/72x72/apps/xfsm-trash-normal.png
 share/icons/hicolor/scalable/apps/xfce4-session.svg
 share/icons/hicolor/scalable/apps/xfsm-shutdown.svg
-share/locale/af/LC_MESSAGES/xfce4-session.mo
 share/locale/ar/LC_MESSAGES/xfce4-session.mo
 share/locale/az/LC_MESSAGES/xfce4-session.mo
 share/locale/be/LC_MESSAGES/xfce4-session.mo
 share/locale/bn_IN/LC_MESSAGES/xfce4-session.mo
 share/locale/ca/LC_MESSAGES/xfce4-session.mo
 share/locale/cs/LC_MESSAGES/xfce4-session.mo
-share/locale/da/LC_MESSAGES/xfce4-session.mo
 share/locale/de/LC_MESSAGES/xfce4-session.mo
+share/locale/dz/LC_MESSAGES/xfce4-session.mo
 share/locale/el/LC_MESSAGES/xfce4-session.mo
 share/locale/en_GB/LC_MESSAGES/xfce4-session.mo
 share/locale/eo/LC_MESSAGES/xfce4-session.mo
@@ -56,15 +59,17 @@ share/locale/eu/LC_MESSAGES/xfce4-session.mo
 share/locale/fa/LC_MESSAGES/xfce4-session.mo
 share/locale/fi/LC_MESSAGES/xfce4-session.mo
 share/locale/fr/LC_MESSAGES/xfce4-session.mo
+share/locale/gl/LC_MESSAGES/xfce4-session.mo
 share/locale/gu/LC_MESSAGES/xfce4-session.mo
 share/locale/he/LC_MESSAGES/xfce4-session.mo
 share/locale/hi/LC_MESSAGES/xfce4-session.mo
 share/locale/hu/LC_MESSAGES/xfce4-session.mo
 share/locale/it/LC_MESSAGES/xfce4-session.mo
 share/locale/ja/LC_MESSAGES/xfce4-session.mo
+share/locale/ka/LC_MESSAGES/xfce4-session.mo
 share/locale/ko/LC_MESSAGES/xfce4-session.mo
-share/locale/ku/LC_MESSAGES/xfce4-session.mo
 share/locale/lt/LC_MESSAGES/xfce4-session.mo
+share/locale/mk/LC_MESSAGES/xfce4-session.mo
 share/locale/mr/LC_MESSAGES/xfce4-session.mo
 share/locale/ms/LC_MESSAGES/xfce4-session.mo
 share/locale/nb_NO/LC_MESSAGES/xfce4-session.mo
@@ -76,7 +81,6 @@ share/locale/pt_PT/LC_MESSAGES/xfce4-session.mo
 share/locale/ro/LC_MESSAGES/xfce4-session.mo
 share/locale/ru/LC_MESSAGES/xfce4-session.mo
 share/locale/sk/LC_MESSAGES/xfce4-session.mo
-share/locale/sl/LC_MESSAGES/xfce4-session.mo
 share/locale/sv/LC_MESSAGES/xfce4-session.mo
 share/locale/ta/LC_MESSAGES/xfce4-session.mo
 share/locale/tr/LC_MESSAGES/xfce4-session.mo
@@ -94,16 +98,25 @@ share/xfce4/doc/fr/images/xfsm-advanced.png
 share/xfce4/doc/fr/images/xfsm-general.png
 share/xfce4/doc/fr/images/xfsm-splash.png
 share/xfce4/doc/fr/xfce4-session.html
-share/xfce4/doc/he/images/xfsm-advanced.png
-share/xfce4/doc/he/images/xfsm-general.png
-share/xfce4/doc/he/images/xfsm-splash.png
-share/xfce4/doc/he/xfce4-session.html
+share/xfce4/tips/tips
+share/xfce4/tips/tips.dat
+share/icons/hicolor/48x48/apps/xfsm-logout.png
+share/icons/hicolor/48x48/apps/xfsm-reboot.png
+@dirrm etc/xdg/autostart
 @dirrm etc/xdg/xfce4-session
 @dirrmtry etc/xdg
 @dirrm include/xfce4/xfce4-session-4.2/libxfsm
 @dirrm include/xfce4/xfce4-session-4.2
 @dirrmtry include/xfce4
 @dirrmtry share/applications
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
 @dirrm share/themes/Default/balou
 @dirrmtry share/themes/Default
 @dirrmtry share/themes
@@ -111,46 +124,20 @@ share/xfce4/doc/he/xfce4-session.html
 @dirrmtry share/xfce4/doc/C
 @dirrmtry share/xfce4/doc/fr/images
 @dirrmtry share/xfce4/doc/fr
-@dirrmtry share/xfce4/doc/he/images
-@dirrmtry share/xfce4/doc/he
 @dirrmtry share/xfce4/doc
+@dirrmtry share/xfce4/tips
 @dirrmtry share/xfce4
 @dirrmtry lib/xfce4/splash/engines
 @dirrmtry lib/xfce4/splash
 @dirrmtry lib/xfce4/mcs-plugins
 @dirrmtry lib/xfce4
 @dirrmtry lib/pkgconfig
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/nb_NO/LC_MESSAGES
-@dirrmtry share/locale/nb_NO
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
+@dirrmtry share/icons/hicolor/64x64/apps
+@dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor/72x72/apps
+@dirrmtry share/icons/hicolor/72x72
+@dirrmtry share/icons/hicolor/128x128/apps
+@dirrmtry share/icons/hicolor/128x128
+@dirrmtry share/icons/hicolor/scalable/apps
+@dirrmtry share/icons/hicolor/scalable
+