- Update to 2.10

- Add LICENSE
- Use CONFLICTS_INSTALL instead of CONFLICTS
- Pet stage-qa: use OPTIONS_SUB and PLSIT_FILES instead of BAHS_PLIST_FILES
- Do not silence installation message
- Reformat pkg-descr
- Take maintainership

Changes:	https://github.com/ginatrapani/todo.txt-cli/releases

3 files changed, 26 insertions, 20 deletions

diff --git a/deskutils/todo/Makefile b/deskutils/todo/Makefile
index 09c6cacf9d71..c187425b8c66 100644
--- a/deskutils/todo/Makefile
+++ b/deskutils/todo/Makefile
@@ -2,34 +2,40 @@
 # $FreeBSD$
 
 PORTNAME=	todo
-PORTVERSION=	2.9
+PORTVERSION=	2.10
 CATEGORIES=	deskutils
-MASTER_SITES=	http://cloud.github.com/downloads/ginatrapani/todo.txt-cli/
+MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${GH_TAGNAME}/
 DISTNAME=	todo.txt_cli-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Todo.txt Manager
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+LICENSE=	GPLv3
 
-CONFLICTS=	devtodo-[0-9]*
+RUN_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
+
+CONFLICTS_INSTALL=	devtodo-[0-9]*
 
 OPTIONS_DEFINE=	BASH
+OPTIONS_SUB=	yes
 BASH_DESC=	Install programmable completions for Bash
 
 NO_BUILD=	yes
 USES=		shebangfix
 
-PLIST_FILES=	bin/todo etc/todo.cfg
+PLIST_FILES=	bin/todo etc/todo.cfg \
+		%%BASH%%etc/bash_completion.d/todo
 
-SHEBANG_FILES=	todo.sh todo_completion
+GH_ACCOUNT=	ginatrapani
+GH_PROJECT=	todo.txt-cli
+GH_TAGNAME=	v${PORTVERSION}
 
-BASH_PLIST_FILES=	etc/bash_completion.d/todo
+SHEBANG_FILES=	todo.sh todo_completion
 
 do-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/todo.sh ${STAGEDIR}${PREFIX}/bin/todo
-	@${INSTALL_DATA} ${WRKSRC}/todo.cfg ${STAGEDIR}${PREFIX}/etc/todo.cfg
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
+	${INSTALL_SCRIPT} ${WRKSRC}/todo.sh ${STAGEDIR}${PREFIX}/bin/todo
+	${INSTALL_DATA} ${WRKSRC}/todo.cfg ${STAGEDIR}${PREFIX}/etc/todo.cfg
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d/
 	${INSTALL_DATA} ${WRKSRC}/todo_completion ${STAGEDIR}${PREFIX}/etc/bash_completion.d/todo
 
 .include <bsd.port.mk>
diff --git a/deskutils/todo/distinfo b/deskutils/todo/distinfo
index 23d2c6cd566c..44765519d4fa 100644
--- a/deskutils/todo/distinfo
+++ b/deskutils/todo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (todo.txt_cli-2.9.tar.gz) = 861262f97206056ea3c680e9a9c444ed05b765bb79834d5ad31f51e4520e6731
-SIZE (todo.txt_cli-2.9.tar.gz) = 13359
+SHA256 (todo.txt_cli-2.10.tar.gz) = b59417a26feeafd811e0f1ff17e85e69ac5bcb1a0544b736f539ffb8fe27f6a9
+SIZE (todo.txt_cli-2.10.tar.gz) = 14349
diff --git a/deskutils/todo/pkg-descr b/deskutils/todo/pkg-descr
index 98198dfe6ec5..c63cb2b431b8 100644
--- a/deskutils/todo/pkg-descr
+++ b/deskutils/todo/pkg-descr
@@ -1,11 +1,11 @@
-There are approximately 17 million software applications and web sites out
-there built to manage your to do list. But if you're comfortable at the
-command line and you don't want to depend on someone else's data format or
-someone else's server, there's an age-old method that's perfect for tracking
-your stuff: plain text.
+There are approximately 17 million software applications and web sites out there
+built to manage your to do list. But if you're comfortable at the command line
+and you don't want to depend on someone else's data format or someone else's
+server, there's an age-old method that's perfect for tracking your stuff: plain
+text.
 
 Keep on top of all your tasks and projects in a simple file called todo.txt.
-With a few helper scripts, you can slice, dice, sort, distribute, pipe and
-munge your lists any way you please. As it should be.
+With a few helper scripts, you can slice, dice, sort, distribute, pipe and munge
+your lists any way you please. As it should be.
 
 WWW: http://todotxt.com/