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)

7 files changed, 33 insertions, 116 deletions

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
+