- Update to 1.9.0

  ChangeLog: http://taskwarrior.org/wiki/taskwarrior/Changelog

Feature safe:	yes

4 files changed, 36 insertions, 35 deletions

diff --git a/deskutils/taskwarrior/Makefile b/deskutils/taskwarrior/Makefile
index bca8d3073319..d06f966f3462 100644
--- a/deskutils/taskwarrior/Makefile
+++ b/deskutils/taskwarrior/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	taskwarrior
-PORTVERSION=	1.8.5
+PORTVERSION=	1.9.0
 CATEGORIES=	deskutils
 MASTER_SITES=	http://taskwarrior.org/download/
 DISTNAME=	task-${PORTVERSION}
@@ -19,15 +19,17 @@ WRKSRC=		${WRKDIR}/${DISTNAME}
 GNU_CONFIGURE=	yes
 
 MAN1=	task.1
-MAN5=	taskrc.5 task-tutorial.5
+MAN5=	taskrc.5 task-faq.5 task-color.5 task-tutorial.5
+
+CONFIGURE_ARGS+=--datadir=${DATADIR} --docdir=${DOCSDIR}
+
+PLIST_SUB+=	DISTVERSION=${DISTVERSION}
 
 .include <bsd.port.pre.mk>
 
 post-patch:
-	${REINPLACE_CMD} -e 's|%%DOCSDIR%%|${DOCSDIR}|; s|%%DATADIR%%|${DATADIR}|' \
-	    ${WRKSRC}/Makefile.in
 .if defined(NOPORTDOCS)
-	${REINPLACE_CMD} -e '342,349d' ${WRKSRC}/Makefile.in
+	${REINPLACE_CMD} -e '396,406d' ${WRKSRC}/Makefile.in
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/deskutils/taskwarrior/distinfo b/deskutils/taskwarrior/distinfo
index c11e9e36a609..912add704007 100644
--- a/deskutils/taskwarrior/distinfo
+++ b/deskutils/taskwarrior/distinfo
@@ -1,3 +1,3 @@
-MD5 (task-1.8.5.tar.gz) = b7e5ab3abf624027068d9a01bf684035
-SHA256 (task-1.8.5.tar.gz) = f43670b4267d98d48a344ab9ded4fc12c8e4150a85eb8416083d477c1af58f01
-SIZE (task-1.8.5.tar.gz) = 212961
+MD5 (task-1.9.0.tar.gz) = b9c12f60ff509c1ce5c6292041789baa
+SHA256 (task-1.9.0.tar.gz) = a0e5e77767abc01b05fc6723c0bec2ecfb771d69293e19256f4c3fac9711a501
+SIZE (task-1.9.0.tar.gz) = 251049
diff --git a/deskutils/taskwarrior/files/patch-Makefile.in b/deskutils/taskwarrior/files/patch-Makefile.in
index aee1196cf879..2f46c6597fcf 100644
--- a/deskutils/taskwarrior/files/patch-Makefile.in
+++ b/deskutils/taskwarrior/files/patch-Makefile.in
@@ -1,21 +1,9 @@
---- Makefile.in.orig	2009-07-21 22:49:24.000000000 +0200
-+++ Makefile.in	2009-07-22 12:01:39.000000000 +0200
-@@ -153,9 +153,9 @@
- bindir = @bindir@
- build_alias = @build_alias@
- builddir = @builddir@
--datadir = @datadir@
-+datadir = %%DATADIR%%
- datarootdir = @datarootdir@
--docdir = $(datadir)/doc/${PACKAGE}-${VERSION}
-+docdir = %%DOCSDIR%%
- dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host_alias = @host_alias@
-@@ -185,13 +185,13 @@
- dist_man_MANS = doc/man/task.1 doc/man/taskrc.5 doc/man/task-tutorial.5
+--- Makefile.in.orig	2010-02-23 08:39:56.000000000 +0100
++++ Makefile.in	2010-02-23 08:40:39.000000000 +0100
+@@ -231,15 +231,15 @@
+ #docdir = $(datadir)/doc/${PACKAGE}-${VERSION}
  doc_DATA = AUTHORS ChangeLog COPYING NEWS README
- EXTRA_DIST = INSTALL
+ EXTRA_DIST = INSTALL README.build
 -bashscriptsdir = $(docdir)
 +bashscriptsdir = $(datadir)
  nobase_dist_bashscripts_DATA = scripts/bash/task_completion.sh
@@ -24,9 +12,12 @@
  nobase_dist_zshscripts_DATA = scripts/zsh/_task
 -vimscriptsdir = $(docdir)
 +vimscriptsdir = $(datadir)
- nobase_dist_vimscripts_DATA = scripts/vim/README scripts/vim/ftdetect/task.vim scripts/vim/syntax/taskdata.vim scripts/vim/syntax/taskedit.vim
+ nobase_dist_vimscripts_DATA = scripts/vim/README scripts/vim/ftdetect/task.vim scripts/vim/syntax/taskdata.vim scripts/vim/syntax/taskedit.vim scripts/vim/syntax/taskrc.vim
 -i18ndir = $(docdir)
 +i18ndir = $(datadir)
  nobase_dist_i18n_DATA = i18n/strings.de-DE i18n/strings.en-US i18n/strings.es-ES i18n/strings.fr-FR i18n/strings.nl-NL i18n/strings.sv-SE i18n/tips.de-DE i18n/tips.en-US i18n/tips.sv-SE
+-rcfiledir = $(docdir)/rc
++rcfiledir = $(datadir)/rc
+ dist_rcfile_DATA = doc/rc/holidays-US.rc doc/rc/holidays-SE.rc doc/rc/dark-16.theme doc/rc/dark-256.theme doc/rc/light-16.theme doc/rc/light-256.theme
  all: auto.h
  	$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/deskutils/taskwarrior/pkg-plist b/deskutils/taskwarrior/pkg-plist
index 1c18e8bce8c6..8ef0de08a5cc 100644
--- a/deskutils/taskwarrior/pkg-plist
+++ b/deskutils/taskwarrior/pkg-plist
@@ -1,9 +1,21 @@
 bin/task
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%DATADIR%%/rc/holidays-US.rc
+%%DATADIR%%/rc/holidays-SE.rc
+%%DATADIR%%/rc/dark-16.theme
+%%DATADIR%%/rc/dark-256.theme
+%%DATADIR%%/rc/light-16.theme
+%%DATADIR%%/rc/light-256.theme
 %%DATADIR%%/scripts/bash/task_completion.sh
-%%DATADIR%%/scripts/vim/ftdetect/task.vim
 %%DATADIR%%/scripts/vim/README
+%%DATADIR%%/scripts/vim/ftdetect/task.vim
 %%DATADIR%%/scripts/vim/syntax/taskdata.vim
 %%DATADIR%%/scripts/vim/syntax/taskedit.vim
+%%DATADIR%%/scripts/vim/syntax/taskrc.vim
 %%DATADIR%%/scripts/zsh/_task
 %%DATADIR%%/i18n/strings.de-DE
 %%DATADIR%%/i18n/strings.en-US
@@ -14,17 +26,13 @@ bin/task
 %%DATADIR%%/i18n/tips.de-DE
 %%DATADIR%%/i18n/tips.en-US
 %%DATADIR%%/i18n/tips.sv-SE
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%/scripts/bash
+@dirrm %%DATADIR%%/scripts/zsh
 @dirrm %%DATADIR%%/scripts/vim/syntax
 @dirrm %%DATADIR%%/scripts/vim/ftdetect
 @dirrm %%DATADIR%%/scripts/vim
-@dirrm %%DATADIR%%/scripts/zsh
+@dirrm %%DATADIR%%/scripts/bash
 @dirrm %%DATADIR%%/scripts
 @dirrm %%DATADIR%%/i18n
+@dirrm %%DATADIR%%/rc
 @dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%