diff -urN /usr/ports/x11-wm/devilspie/Makefile x11-wm/devilspie/Makefile
--- /usr/ports/x11-wm/devilspie/Makefile	2008-04-29 21:57:03.000000000 +0900
+++ x11-wm/devilspie/Makefile	2008-05-07 01:20:40.000000000 +0900
@@ -6,21 +6,24 @@
 #
 
 PORTNAME=	devilspie
-PORTVERSION=	0.20.2
-PORTREVISION=	2
+PORTVERSION=	0.22
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.burtonini.com/computing/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A window manipulation tool
 
-USE_GNOME=	libwnck
-GNU_CONFIGURE=	yes
+USE_GNOME=	gnometarget libwnck
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=		devilspie.1
 PORTDOCS=	AUTHORS NEWS README TODO
+PLIST_FILES=	bin/devilspie \
+		share/locale/de/LC_MESSAGES/devilspie.mo
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-D.*_DISABLE_DEPRECATED||' \
diff -urN /usr/ports/x11-wm/devilspie/distinfo x11-wm/devilspie/distinfo
--- /usr/ports/x11-wm/devilspie/distinfo	2007-03-09 14:11:47.000000000 +0900
+++ x11-wm/devilspie/distinfo	2008-05-07 01:20:05.000000000 +0900
@@ -1,3 +1,3 @@
-MD5 (devilspie-0.20.2.tar.gz) = 2739e4108e64208de4906daf5b2f5ccf
-SHA256 (devilspie-0.20.2.tar.gz) = 5e552c33ef2bc9c794b89ec4d0857d6f7081841c72f2f509bec561c649169329
-SIZE (devilspie-0.20.2.tar.gz) = 158961
+MD5 (devilspie-0.22.tar.gz) = 4190e12f99ab92c0427e457d9fbfe231
+SHA256 (devilspie-0.22.tar.gz) = e06aba1d96889e1b58bd1b0ba4d3015f50adc3ade2824b5cb37a0ee7f2490aaf
+SIZE (devilspie-0.22.tar.gz) = 192646
diff -urN /usr/ports/x11-wm/devilspie/files/patch-src_actions.c x11-wm/devilspie/files/patch-src_actions.c
--- /usr/ports/x11-wm/devilspie/files/patch-src_actions.c	2006-01-25 02:39:55.000000000 +0900
+++ x11-wm/devilspie/files/patch-src_actions.c	1970-01-01 09:00:00.000000000 +0900
@@ -1,19 +0,0 @@
---- src/actions.c.orig	Fri Oct 21 11:58:14 2005
-+++ src/actions.c	Tue Jan 24 18:30:58 2006
-@@ -138,14 +138,14 @@
-   gint xoffset, yoffset, window_width, window_height,
-     workspace_width, workspace_height;
-   int new_xoffset, new_yoffset;
-+  WnckScreen *screen;
-+  WnckWorkspace *workspace;
- 
-   /* read in window geometry */
-   wnck_window_get_geometry (c->window,
-                             &xoffset, &yoffset, &window_width, &window_height);
- 
-   /* read in workspace geometry */
--  WnckScreen *screen;
--  WnckWorkspace *workspace;
-   screen           = wnck_window_get_screen (c->window);
-   workspace        = wnck_screen_get_active_workspace (screen);
-   workspace_width  = wnck_workspace_get_width  (workspace);
diff -urN /usr/ports/x11-wm/devilspie/files/patch-src_logical.c x11-wm/devilspie/files/patch-src_logical.c
--- /usr/ports/x11-wm/devilspie/files/patch-src_logical.c	2005-10-05 10:51:54.000000000 +0900
+++ x11-wm/devilspie/files/patch-src_logical.c	1970-01-01 09:00:00.000000000 +0900
@@ -1,10 +0,0 @@
---- src/logical.c.orig	Wed Oct  5 01:54:14 2005
-+++ src/logical.c	Wed Oct  5 01:54:22 2005
-@@ -17,6 +17,7 @@
-  */
- 
- #include <string.h>
-+#include <sys/types.h>
- #include <regex.h>
- #include <glib.h>
- #include <glib/gi18n.h>
diff -urN /usr/ports/x11-wm/devilspie/pkg-plist x11-wm/devilspie/pkg-plist
--- /usr/ports/x11-wm/devilspie/pkg-plist	2005-10-06 03:03:03.000000000 +0900
+++ x11-wm/devilspie/pkg-plist	1970-01-01 09:00:00.000000000 +0900
@@ -1,2 +0,0 @@
-bin/devilspie
-share/locale/de/LC_MESSAGES/devilspie.mo