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)

5 files changed, 43 insertions, 34 deletions

diff --git a/misc/xfce4-weather-plugin/Makefile b/misc/xfce4-weather-plugin/Makefile
index 38402259a4ee..f887051f23db 100644
--- a/misc/xfce4-weather-plugin/Makefile
+++ b/misc/xfce4-weather-plugin/Makefile
@@ -6,24 +6,23 @@
 #
 
 PORTNAME=	xfce4-weather-plugin
-PORTVERSION=	0.4.9
-PORTREVISION=	4
+PORTVERSION=	0.6.0
 CATEGORIES=	misc xfce
-MASTER_SITES=	http://download.berlios.de/xfce-goodies/
+MASTER_SITES=	http://goodies.xfce.org/releases/${PORTNAME}/
+DIST_SUBDIR=	xfce4
 
 MAINTAINER=	filippo.natali@gmail.com
 COMMENT=	XFce 4 weather 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
-INSTALLS_SHLIB=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+INSTALLS_ICONS= yes
+USE_BZIP2=	yes
+USE_GETTEXT=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnometarget glib20 gtk20 intltool intlhack libxml2 pkgconfig
+USE_XFCE=	configenv libgui libutil 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/misc/xfce4-weather-plugin/distinfo b/misc/xfce4-weather-plugin/distinfo
index 178d6efa5af4..e2f4a7f413fb 100644
--- a/misc/xfce4-weather-plugin/distinfo
+++ b/misc/xfce4-weather-plugin/distinfo
@@ -1,3 +1,6 @@
-MD5 (xfce4-weather-plugin-0.4.9.tar.gz) = 1d5ba253c8eae5a9ad5e3d7002a0dae0
-SHA256 (xfce4-weather-plugin-0.4.9.tar.gz) = c82044a943f3b43bf0b973c4859a3061e963c8ebd7e61e03342e646523fac669
-SIZE (xfce4-weather-plugin-0.4.9.tar.gz) = 642215
+MD5 (xfce4/xfce4-weather-plugin-0.6.0.tar.bz2) = 6d7ed190950b2cc99c70b9481169f9fa
+SHA256 (xfce4/xfce4-weather-plugin-0.6.0.tar.bz2) = 6dc0f306773273f98ee592e29c366ee9cb37830608d81c60d8ebf5f4b10c6f45
+SIZE (xfce4/xfce4-weather-plugin-0.6.0.tar.bz2) = 537194
+MD5 (xfce4/gcc295-xfce4-weather-plugin-2.patch) = 491a8e97c5fcce7e1e76e7febd346383
+SHA256 (xfce4/gcc295-xfce4-weather-plugin-2.patch) = 82b0cd11de9c5ae9e0ec6c9d7c1bff9dc2073f25face888c427a550d27dfbbc4
+SIZE (xfce4/gcc295-xfce4-weather-plugin-2.patch) = 1186
diff --git a/misc/xfce4-weather-plugin/files/patch-http_client.h b/misc/xfce4-weather-plugin/files/patch-http_client.h
deleted file mode 100644
index ff1d483fa79d..000000000000
--- a/misc/xfce4-weather-plugin/files/patch-http_client.h
+++ /dev/null
@@ -1,7 +0,0 @@
---- panel-plugin/http_client.h.orig	Mon Apr 19 16:15:44 2004
-+++ panel-plugin/http_client.h	Mon Jun  7 15:52:19 2004
-@@ -1,3 +1,4 @@
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <netdb.h>
- #include <netinet/in.h>
diff --git a/misc/xfce4-weather-plugin/pkg-descr b/misc/xfce4-weather-plugin/pkg-descr
index 537ed8869e9e..8b45ee75ed3d 100644
--- a/misc/xfce4-weather-plugin/pkg-descr
+++ b/misc/xfce4-weather-plugin/pkg-descr
@@ -2,4 +2,4 @@ XFce 4 weather module for xfce4-panel. It displays weather situation
 and forecasts. 
 
 Author: Bob Schlaermann <blackhole@atreidis.nl.eu.org>
-WWW:	http://xfce-goodies.berlios.de/
+WWW: http://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin
diff --git a/misc/xfce4-weather-plugin/pkg-plist b/misc/xfce4-weather-plugin/pkg-plist
index 2efe89a211f5..2894d1f08517 100644
--- a/misc/xfce4-weather-plugin/pkg-plist
+++ b/misc/xfce4-weather-plugin/pkg-plist
@@ -1,6 +1,18 @@
-lib/xfce4/panel-plugins/libweather.a
-lib/xfce4/panel-plugins/libweather.la
-lib/xfce4/panel-plugins/libweather.so
+libexec/xfce4/panel-plugins/xfce4-weather-plugin
+share/icons/hicolor/48x48/apps/xfce4-weather.png
+share/locale/ca/LC_MESSAGES/xfce4-weather-plugin.mo
+share/locale/cs/LC_MESSAGES/xfce4-weather-plugin.mo
+share/locale/de/LC_MESSAGES/xfce4-weather-plugin.mo
+share/locale/eu/LC_MESSAGES/xfce4-weather-plugin.mo
+share/locale/fi/LC_MESSAGES/xfce4-weather-plugin.mo
+share/locale/fr/LC_MESSAGES/xfce4-weather-plugin.mo
+share/locale/gl/LC_MESSAGES/xfce4-weather-plugin.mo
+share/locale/hu/LC_MESSAGES/xfce4-weather-plugin.mo
+share/locale/lt/LC_MESSAGES/xfce4-weather-plugin.mo
+share/locale/nl/LC_MESSAGES/xfce4-weather-plugin.mo
+share/locale/sk/LC_MESSAGES/xfce4-weather-plugin.mo
+share/locale/zh_TW/LC_MESSAGES/xfce4-weather-plugin.mo
+share/xfce4/weather/icons/liquid/0.png
 share/xfce4/weather/icons/liquid/1.png
 share/xfce4/weather/icons/liquid/10.png
 share/xfce4/weather/icons/liquid/11.png
@@ -40,7 +52,6 @@ share/xfce4/weather/icons/liquid/41.png
 share/xfce4/weather/icons/liquid/42.png
 share/xfce4/weather/icons/liquid/43.png
 share/xfce4/weather/icons/liquid/44.png
-share/xfce4/weather/icons/liquid/-.png
 share/xfce4/weather/icons/liquid/45.png
 share/xfce4/weather/icons/liquid/46.png
 share/xfce4/weather/icons/liquid/47.png
@@ -49,9 +60,12 @@ share/xfce4/weather/icons/liquid/6.png
 share/xfce4/weather/icons/liquid/7.png
 share/xfce4/weather/icons/liquid/8.png
 share/xfce4/weather/icons/liquid/9.png
-@dirrmtry lib/xfce4/panel-plugins
-@dirrmtry lib/xfce4
-@dirrmtry share/xfce4/weather/icons/liquid
-@dirrmtry share/xfce4/weather/icons
-@dirrmtry share/xfce4/weather
+share/xfce4/weather/icons/liquid/99.png
+share/xfce4/panel-plugins/weather.desktop
+@dirrmtry share/xfce4/panel-plugins
+@dirrm share/xfce4/weather/icons/liquid
+@dirrm share/xfce4/weather/icons
+@dirrm share/xfce4/weather
 @dirrmtry share/xfce4
+@dirrmtry libexec/xfce4/panel-plugins
+@dirrmtry libexec/xfce4