Index: head/deskutils/deforaos-todo/Makefile
===================================================================
--- head/deskutils/deforaos-todo/Makefile
+++ head/deskutils/deforaos-todo/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	todo
-PORTVERSION=	0.1.2
-PORTREVISION=	2
+PORTVERSION=	0.2.1
 CATEGORIES=	deskutils
-MASTER_SITES=	http://www.defora.org/os/download/download/3506/
+MASTER_SITES=	http://www.defora.org/os/download/download/4429/
 PKGNAMEPREFIX=	deforaos-
 DISTNAME=	Todo-${PORTVERSION}
 
@@ -16,10 +15,36 @@
 
 LIB_DEPENDS=	libSystem.so:${PORTSDIR}/devel/deforaos-libsystem \
 		libDesktop.so:${PORTSDIR}/x11/deforaos-libdesktop
+BUILD_DEPENDS=	${LOCALBASE}/include/Desktop/Mailer/plugin.h:${PORTSDIR}/mail/deforaos-mailer
 
-USES=		desktop-file-utils gettext pkgconfig
+USES=		desktop-file-utils pkgconfig
 USE_GNOME=	gtk20
 INSTALLS_ICONS=	yes
 MAKE_ARGS+=	PREFIX=${PREFIX}
 
+MAKE_ENV=	MANDIR=${STAGEDIR}${MANPREFIX}/man
+
+OPTIONS_DEFINE=	DOCS NLS
+OPTIONS_SUB=	yes
+NLS_USES=	gettext
+DOCS_BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt \
+		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
+
+post-patch-DOCS-off:
+	${REINPLACE_CMD} 's|= data doc|= data|' \
+		${WRKSRC}/Makefile
+
+post-patch-NLS-off:
+	${REINPLACE_CMD} 's|po src tools|src tools|' \
+		${WRKSRC}/Makefile
+
+post-patch:
+	${REINPLACE_CMD} 's|-Wl,-pie||g' \
+		${WRKSRC}/tools/Makefile \
+		${WRKSRC}/src/Makefile
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/todo \
+		${STAGEDIR}${PREFIX}/lib/Mailer/plugins/todo.so
+
 .include <bsd.port.mk>
Index: head/deskutils/deforaos-todo/distinfo
===================================================================
--- head/deskutils/deforaos-todo/distinfo
+++ head/deskutils/deforaos-todo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Todo-0.1.2.tar.gz) = febf0191e55b7b28447d4f2b9199a23b09ffa1ead10953f081f418edf84301f1
-SIZE (Todo-0.1.2.tar.gz) = 33195
+SHA256 (Todo-0.2.1.tar.gz) = 08bbe78cbce11944af962f728463bee3c1dc001e1ebefda19431fa5f258e2a8e
+SIZE (Todo-0.2.1.tar.gz) = 29369
Index: head/deskutils/deforaos-todo/files/patch-doc_Makefile
===================================================================
--- head/deskutils/deforaos-todo/files/patch-doc_Makefile
+++ head/deskutils/deforaos-todo/files/patch-doc_Makefile
@@ -0,0 +1,11 @@
+--- doc/Makefile.orig	2016-03-05 17:04:57 UTC
++++ doc/Makefile
+@@ -30,8 +30,6 @@ distclean: clean
+ 
+ install: $(TARGETS)
+ 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)todo.1"
+-	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)todo.html"
+-	../tools/subst.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)todo.xml"
+ 
+ uninstall:
+ 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "todo.1"
Index: head/deskutils/deforaos-todo/pkg-plist
===================================================================
--- head/deskutils/deforaos-todo/pkg-plist
+++ head/deskutils/deforaos-todo/pkg-plist
@@ -1,6 +1,9 @@
 bin/todo
-share/applications/todo.desktop
+%%PORTDOCS%%man/man1/todo.1.gz
+share/applications/deforaos-todo.desktop
 share/icons/hicolor/16x16/apps/todo.png
 share/icons/hicolor/24x24/apps/todo.png
 share/icons/hicolor/48x48/apps/todo.png
-share/locale/fr/LC_MESSAGES/Todo.mo
+lib/Mailer/plugins/todo.so
+%%NLS%%share/locale/fr/LC_MESSAGES/Todo.mo
+%%NLS%%share/locale/es/LC_MESSAGES/Todo.mo