- Update to 1.8.0

4 files changed, 64 insertions, 10 deletions

diff --git a/deskutils/taskwarrior/Makefile b/deskutils/taskwarrior/Makefile
index 586bf02f9c10..dbae78cd2102 100644
--- a/deskutils/taskwarrior/Makefile
+++ b/deskutils/taskwarrior/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	taskwarrior
-PORTVERSION=	1.7.1
+PORTVERSION=	1.8.0
 CATEGORIES=	deskutils
 MASTER_SITES=	http://taskwarrior.org/download/
 DISTNAME=	task-${PORTVERSION}
@@ -15,16 +15,17 @@ MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	A framework for supercharged task and contact management
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
-DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
 
 GNU_CONFIGURE=	yes
 
 MAN1=	task.1
-MAN5=	taskrc.5
+MAN5=	taskrc.5 task-tutorial.5
 
-.if defined(NOPORTDOCS)
 post-patch:
-	${REINPLACE_CMD} -e '326,333d' ${WRKSRC}/Makefile.in
+	${REINPLACE_CMD} -e 's|%%DOCSDIR%%|${DOCSDIR}|; s|%%DATADIR%%|${DATADIR}|' \
+	    ${WRKSRC}/Makefile.in
+.if defined(NOPORTDOCS)
+	${REINPLACE_CMD} -e '341,348d' ${WRKSRC}/Makefile.in
 .endif
 
 .include <bsd.port.mk>
diff --git a/deskutils/taskwarrior/distinfo b/deskutils/taskwarrior/distinfo
index cac066213709..0052fd9da6e5 100644
--- a/deskutils/taskwarrior/distinfo
+++ b/deskutils/taskwarrior/distinfo
@@ -1,3 +1,3 @@
-MD5 (task-1.7.1.tar.gz) = 393baac71ab282d567e1fe4a66cae5bb
-SHA256 (task-1.7.1.tar.gz) = 93f67aad6aaec83d652a63ca07e6b0e0f752596b8505b7496833c8e3837eb95c
-SIZE (task-1.7.1.tar.gz) = 170621
+MD5 (task-1.8.0.tar.gz) = a50d7a143c8a15ae3d33bb2041840da6
+SHA256 (task-1.8.0.tar.gz) = 8fd37f0afe27a5cce2cb7f95c7694a89987bbaee2366afe3da4decc0ea6d5882
+SIZE (task-1.8.0.tar.gz) = 203472
diff --git a/deskutils/taskwarrior/files/patch-Makefile.in b/deskutils/taskwarrior/files/patch-Makefile.in
new file mode 100644
index 000000000000..aee1196cf879
--- /dev/null
+++ b/deskutils/taskwarrior/files/patch-Makefile.in
@@ -0,0 +1,32 @@
+--- 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
+ doc_DATA = AUTHORS ChangeLog COPYING NEWS README
+ EXTRA_DIST = INSTALL
+-bashscriptsdir = $(docdir)
++bashscriptsdir = $(datadir)
+ nobase_dist_bashscripts_DATA = scripts/bash/task_completion.sh
+-zshscriptsdir = $(docdir)
++zshscriptsdir = $(datadir)
+ 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
+-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
+ all: auto.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/deskutils/taskwarrior/pkg-plist b/deskutils/taskwarrior/pkg-plist
index 1059d365ccc9..1c18e8bce8c6 100644
--- a/deskutils/taskwarrior/pkg-plist
+++ b/deskutils/taskwarrior/pkg-plist
@@ -1,9 +1,30 @@
 bin/task
+%%DATADIR%%/scripts/bash/task_completion.sh
+%%DATADIR%%/scripts/vim/ftdetect/task.vim
+%%DATADIR%%/scripts/vim/README
+%%DATADIR%%/scripts/vim/syntax/taskdata.vim
+%%DATADIR%%/scripts/vim/syntax/taskedit.vim
+%%DATADIR%%/scripts/zsh/_task
+%%DATADIR%%/i18n/strings.de-DE
+%%DATADIR%%/i18n/strings.en-US
+%%DATADIR%%/i18n/strings.es-ES
+%%DATADIR%%/i18n/strings.fr-FR
+%%DATADIR%%/i18n/strings.nl-NL
+%%DATADIR%%/i18n/strings.sv-SE
+%%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%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/task_completion.sh
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%/scripts/bash
+@dirrm %%DATADIR%%/scripts/vim/syntax
+@dirrm %%DATADIR%%/scripts/vim/ftdetect
+@dirrm %%DATADIR%%/scripts/vim
+@dirrm %%DATADIR%%/scripts/zsh
+@dirrm %%DATADIR%%/scripts
+@dirrm %%DATADIR%%/i18n
+@dirrm %%DATADIR%%