diff -u /usr/ports/x11-clocks/xfce4-timer-out-plugin/Makefile xfce4-timer-out-plugin/Makefile
--- /usr/ports/x11-clocks/xfce4-timer-out-plugin/Makefile	2010-05-31 17:27:29.000000000 +0200
+++ xfce4-timer-out-plugin/Makefile	2010-12-27 22:08:50.000000000 +0100
@@ -6,21 +6,37 @@
 #
 
 PORTNAME=	xfce4-time-out-plugin
-PORTVERSION=	0.1.1
-PORTREVISION=	11
+PORTVERSION=	1.0.0
 CATEGORIES=	x11-clocks xfce
-MASTER_SITES=	http://goodies.xfce.org/releases/${PORTNAME}/
+MASTER_SITES=	${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=	src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	A timer out plugin for xfce
 
+USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 INSTALLS_ICONS=	yes
-USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	gnometarget gtk20 intltool intlhack pkgconfig
+USE_GNOME=	gnomehack gtk20 intltool intlhack pkgconfig
 USE_XFCE=	configenv libgui libutil panel
+USE_XORG=	x11
+
+CONFIGURE_ARGS=	--disable-debug
+
+OPTIONS=	NLS "Enable Native Language Support" on
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
+PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -u /usr/ports/x11-clocks/xfce4-timer-out-plugin/distinfo xfce4-timer-out-plugin/distinfo
--- /usr/ports/x11-clocks/xfce4-timer-out-plugin/distinfo	2007-09-07 16:25:29.000000000 +0200
+++ xfce4-timer-out-plugin/distinfo	2010-12-27 22:08:50.000000000 +0100
@@ -1,3 +1,2 @@
-MD5 (xfce4/xfce4-time-out-plugin-0.1.1.tar.bz2) = d2f5b157cf47c754d8dd007c73a4d1e6
-SHA256 (xfce4/xfce4-time-out-plugin-0.1.1.tar.bz2) = b06c2ae768b47af5a550995218bb6f24f561c11c4fc091bbca83921998f47ea6
-SIZE (xfce4/xfce4-time-out-plugin-0.1.1.tar.bz2) = 201413
+SHA256 (xfce4/xfce4-time-out-plugin-1.0.0.tar.bz2) = 3e8f26ab54444d706e54b6cefc92bbe87941abe472273e8d1e845010672c0461
+SIZE (xfce4/xfce4-time-out-plugin-1.0.0.tar.bz2) = 336046
diff -u /usr/ports/x11-clocks/xfce4-timer-out-plugin/pkg-plist xfce4-timer-out-plugin/pkg-plist
--- /usr/ports/x11-clocks/xfce4-timer-out-plugin/pkg-plist	2007-09-07 16:25:29.000000000 +0200
+++ xfce4-timer-out-plugin/pkg-plist	2010-12-27 22:08:50.000000000 +0100
@@ -1,10 +1,49 @@
 libexec/xfce4/panel-plugins/xfce4-time-out-plugin
 share/icons/hicolor/48x48/apps/xfce4-time-out-plugin.png
 share/icons/hicolor/scalable/apps/xfce4-time-out-plugin.svg
-share/locale/de/LC_MESSAGES/xfce4-time-out-plugin.mo
-share/locale/hu/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/ast/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/da/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/de/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/el/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/es/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/he/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/id/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/it/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/ur/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-time-out-plugin.mo
 share/xfce4/panel-plugins/xfce4-time-out-plugin.desktop
-@dirrm share/xfce4/panel-plugins
-@dirrm share/xfce4
-@dirrm libexec/xfce4/panel-plugins
-@dirrm libexec/xfce4
+@dirrmtry share/xfce4/panel-plugins
+@dirrmtry share/xfce4
+%%NLS%%@dirrmtry share/locale/ur_PK/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ur_PK
+%%NLS%%@dirrmtry share/locale/ur/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ur
+%%NLS%%@dirrmtry share/locale/ug/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ug
+%%NLS%%@dirrmtry share/locale/kk/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/kk
+%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ast
+@dirrmtry libexec/xfce4/panel-plugins
+@dirrmtry libexec/xfce4