Index: head/deskutils/xpad3/Makefile
===================================================================
--- head/deskutils/xpad3/Makefile	(revision 475444)
+++ head/deskutils/xpad3/Makefile	(revision 475445)
@@ -1,40 +1,41 @@
 # Created by: Guillaume Paquet <amyfoub@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	xpad
 PORTVERSION=	3.1
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	deskutils
 MASTER_SITES=	http://launchpad.net/xpad/stable/${PORTVERSION}/+download/
 PKGNAMESUFFIX=	3
 
 MAINTAINER=	jgh@FreeBSD.org
 COMMENT=	Virtual note-pad system for your X11 desktop
 
 LICENSE=	GPLv3
 
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2
+
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
 CONFLICTS_INSTALL=	xpad-[0-9]*
 
-USE_XORG=	x11 sm
-USE_GNOME=	gtk20 intltool
 USES=	pkgconfig gmake tar:bzip2
+USE_XORG=	x11 sm ice
+USE_GNOME=	gtk20 intltool cairo
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 
 NLS_USES=		gettext
 NLS_CPPFLAGS=		${CXXFLAGS} -I${LOCALBASE}/include
 NLS_LDFLAGS=		-L${LOCALBASE}/lib
 NLS_CONFIGURE_ENABLE=	nls
 
 .include <bsd.port.options.mk>
 
-post-patch:
-.if ! ${PORT_OPTIONS:MNLS}
+post-patch-NLS-off:
 	@${REINPLACE_CMD} -e 's|SUBDIRS = autopackage doc src images po|SUBDIRS = autopackage doc src images|' \
 		${WRKSRC}/Makefile.in
-.endif
 
 .include <bsd.port.mk>
Index: head/deskutils/xpad3/files/patch-src-xpad-pad.c
===================================================================
--- head/deskutils/xpad3/files/patch-src-xpad-pad.c	(revision 475444)
+++ head/deskutils/xpad3/files/patch-src-xpad-pad.c	(revision 475445)
@@ -1,11 +1,11 @@
---- src/xpad-pad.c.orig	2010-06-05 15:18:08.000000000 +0200
-+++ src/xpad-pad.c	2010-06-05 15:18:28.000000000 +0200
-@@ -274,7 +274,7 @@
+--- src/xpad-pad.c.orig	2009-01-11 16:27:39 UTC
++++ src/xpad-pad.c
+@@ -274,7 +274,7 @@ xpad_pad_init (XpadPad *pad)
  		"gravity", GDK_GRAVITY_STATIC, /* static gravity makes saving pad x,y work */
  		"skip-pager-hint", !xpad_settings_get_has_decorations (xpad_settings ()),
  		"skip-taskbar-hint", !xpad_settings_get_has_decorations (xpad_settings ()),
 -		"type", GTK_WINDOW_TOPLEVEL,
 +		/*"type", GTK_WINDOW_TOPLEVEL,*/
  		"type-hint", GDK_WINDOW_TYPE_HINT_NORMAL,
  		"window-position", GTK_WIN_POS_MOUSE,
  		"child", vbox,