diff -ruNa x-tile.orig/Makefile x-tile/Makefile
--- x-tile.orig/Makefile	2010-11-18 19:12:37.000000000 +0300
+++ x-tile/Makefile	2011-08-22 17:22:05.000000000 +0400
@@ -6,19 +6,34 @@
 #
 
 PORTNAME=	x-tile
-PORTVERSION=	1.8.1
+PORTVERSION=	2.1
 CATEGORIES=	deskutils devel python
-MASTER_SITES=	http://www.sawp.com.br/share/xtile/
+MASTER_SITES=	http://www.giuspen.com/software/ \
+		http://www.sawp.com.br/share/xtile/
 
 MAINTAINER=	sawp@sawp.com.br
 COMMENT=	A GNOME applet to tile the opened windows
 
+LICENSE=	GPLv2
+
 USE_GNOME=	pygtk2
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
-PYDISTUTILS_EGGINFO=	X_Tile-${PYDISTUTILS_PKGVERSION}-${PYTHON_VERSION:S/thon//}.egg-info
+PYDISTUTILS_PKGNAME=	X_Tile
 
 post-patch:
-	@${REINPLACE_CMD} -i "" -e 's|: docfiles|: []|g' ${WRKSRC}/setup.py
+	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|g' \
+		${WRKSRC}/x-tile ${WRKSRC}/linux/x-tile.desktop \
+		${WRKSRC}/modules/cons.py
+
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.else
+PYDISTUTILS_BUILD_TARGET=	--without-gettext build
+PYDISTUTILS_INSTALL_TARGET=	--without-gettext install
+PLIST_SUB+=	NLS="@comment "
+.endif
 
 .include <bsd.port.mk>
diff -ruNa x-tile.orig/distinfo x-tile/distinfo
--- x-tile.orig/distinfo	2010-11-18 19:12:37.000000000 +0300
+++ x-tile/distinfo	2011-08-22 14:05:20.000000000 +0400
@@ -1,2 +1,2 @@
-SHA256 (x-tile-1.8.1.tar.gz) = e828ad4b918d0bfddce1ddfd6648c297b91edfa65ab08ac5c8a402180f57483b
-SIZE (x-tile-1.8.1.tar.gz) = 171631
+SHA256 (x-tile-2.1.tar.gz) = 1355909079c5d640b545f5bb00052b27c0e22d9414a468edfca356f410595e79
+SIZE (x-tile-2.1.tar.gz) = 175189
diff -ruNa x-tile.orig/pkg-plist x-tile/pkg-plist
--- x-tile.orig/pkg-plist	2010-11-18 19:12:37.000000000 +0300
+++ x-tile/pkg-plist	2011-08-22 16:44:59.000000000 +0400
@@ -1,48 +1,47 @@
 bin/x-tile
-lib/bonobo/servers/x-tile.server
 share/applications/x-tile.desktop
-share/locale/de/LC_MESSAGES/x-tile.mo
-share/locale/es/LC_MESSAGES/x-tile.mo
-share/locale/fr/LC_MESSAGES/x-tile.mo
-share/locale/it/LC_MESSAGES/x-tile.mo
-share/locale/ja/LC_MESSAGES/x-tile.mo
-share/locale/pt_BR/LC_MESSAGES/x-tile.mo
-share/locale/ru/LC_MESSAGES/x-tile.mo
-share/locale/zh_TW/LC_MESSAGES/x-tile.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/x-tile.mo
+%%NLS%%share/locale/de/LC_MESSAGES/x-tile.mo
+%%NLS%%share/locale/es_AR/LC_MESSAGES/x-tile.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/x-tile.mo
+%%NLS%%share/locale/it/LC_MESSAGES/x-tile.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/x-tile.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/x-tile.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/x-tile.mo
 share/pixmaps/x-tile.svg
-share/x-tile/glade/checkbox_checked.svg
-share/x-tile/glade/checkbox_unchecked.svg
-share/x-tile/glade/close-checked-windows.svg
-share/x-tile/glade/help-contents.svg
-share/x-tile/glade/maximize-checked-windows.svg
-share/x-tile/glade/reload-windows-list.svg
-share/x-tile/glade/tile-custom-1-exe.svg
-share/x-tile/glade/tile-custom-1-set.svg
-share/x-tile/glade/tile-custom-2-exe.svg
-share/x-tile/glade/tile-custom-2-set.svg
-share/x-tile/glade/tile-custom-exe.svg
-share/x-tile/glade/tile-custom-set.svg
-share/x-tile/glade/tile-horizontally.svg
-share/x-tile/glade/tile-quad.svg
-share/x-tile/glade/tile-triangle-down.svg
-share/x-tile/glade/tile-triangle-left.svg
-share/x-tile/glade/tile-triangle-right.svg
-share/x-tile/glade/tile-triangle-up.svg
-share/x-tile/glade/tile-vertically.svg
-share/x-tile/glade/toolbar.png
-share/x-tile/glade/unmaximize-checked-windows.svg
-share/x-tile/glade/vbuttonbox.png
-share/x-tile/glade/x-tile.glade
-share/x-tile/glade/x-tile.glade.h
-share/x-tile/glade/x-tile.svg
-share/x-tile/modules/cons.py
-share/x-tile/modules/core.py
-share/x-tile/modules/globs.py
-share/x-tile/modules/support.py
-share/x-tile/modules/tilings.py
-@dirrm share/x-tile/modules
-@dirrm share/x-tile/glade
-@dirrm share/x-tile
+%%DATADIR%%/glade/checkbox_checked.svg
+%%DATADIR%%/glade/checkbox_unchecked.svg
+%%DATADIR%%/glade/close-checked-windows.svg
+%%DATADIR%%/glade/help-contents.svg
+%%DATADIR%%/glade/invert-tiling.svg
+%%DATADIR%%/glade/maximize-checked-windows.svg
+%%DATADIR%%/glade/quit-app.svg
+%%DATADIR%%/glade/reload-windows-list.svg
+%%DATADIR%%/glade/tile-custom-1-exe.svg
+%%DATADIR%%/glade/tile-custom-1-set.svg
+%%DATADIR%%/glade/tile-custom-2-exe.svg
+%%DATADIR%%/glade/tile-custom-2-set.svg
+%%DATADIR%%/glade/tile-grid.svg
+%%DATADIR%%/glade/tile-horizontally.svg
+%%DATADIR%%/glade/tile-quad.svg
+%%DATADIR%%/glade/tile-triangle-down.svg
+%%DATADIR%%/glade/tile-triangle-left.svg
+%%DATADIR%%/glade/tile-triangle-right.svg
+%%DATADIR%%/glade/tile-triangle-up.svg
+%%DATADIR%%/glade/tile-vertically.svg
+%%DATADIR%%/glade/toolbar.png
+%%DATADIR%%/glade/unmaximize-checked-windows.svg
+%%DATADIR%%/glade/x-tile.glade
+%%DATADIR%%/glade/x-tile.glade.h
+%%DATADIR%%/glade/x-tile.svg
+%%DATADIR%%/modules/cons.py
+%%DATADIR%%/modules/core.py
+%%DATADIR%%/modules/globs.py
+%%DATADIR%%/modules/support.py
+%%DATADIR%%/modules/tilings.py
+@dirrm %%DATADIR%%/modules
+@dirrm %%DATADIR%%/glade
+@dirrm %%DATADIR%%
+%%NLS%%@dirrmtry share/locale/es_AR/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/es_AR
 @dirrmtry share/applications
-@dirrmtry lib/bonobo/servers
-@dirrmtry lib/bonobo