- Update to 1.9.4

  Announcement: http://taskwarrior.org/news/show/68

4 files changed, 42 insertions, 56 deletions

diff --git a/deskutils/taskwarrior/Makefile b/deskutils/taskwarrior/Makefile
index e20da7aa59f..1b4c001c545 100644
--- a/deskutils/taskwarrior/Makefile
+++ b/deskutils/taskwarrior/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	taskwarrior
-PORTVERSION=	1.9.3
+PORTVERSION=	1.9.4
 CATEGORIES=	deskutils
 MASTER_SITES=	http://taskwarrior.org/download/
 DISTNAME=	task-${PORTVERSION}
@@ -16,20 +16,14 @@ COMMENT=	A framework for supercharged task and contact management
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
-GNU_CONFIGURE=	yes
+USE_LUA=	5.1
+USE_CMAKE=	yes
+CMAKE_OUTSOURCE=yes
+CMAKE_ARGS+=	-DTASK_DOCDIR:STRING=${DATADIR:S/${PREFIX}\///} \
+   		-DTASK_MAN1DIR:STRING=man/man1 \
+		-DTASK_MAN5DIR:STRING=man/man5
 
-MAN1=	task.1
-MAN5=	taskrc.5 task-faq.5 task-color.5 task-sync.5 task-tutorial.5
+MAN1=		task.1
+MAN5=		taskrc.5 task-faq.5 task-color.5 task-sync.5 task-tutorial.5
 
-CONFIGURE_ARGS+=--datadir=${DATADIR} --docdir=${DOCSDIR}
-
-PLIST_SUB+=	DISTVERSION=${DISTVERSION}
-
-.include <bsd.port.pre.mk>
-
-post-patch:
-.if defined(NOPORTDOCS)
-	${REINPLACE_CMD} -e '396,406d' ${WRKSRC}/Makefile.in
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/deskutils/taskwarrior/distinfo b/deskutils/taskwarrior/distinfo
index 6cb1b2db252..74f269d6599 100644
--- a/deskutils/taskwarrior/distinfo
+++ b/deskutils/taskwarrior/distinfo
@@ -1,2 +1,2 @@
-SHA256 (task-1.9.3.tar.gz) = 66f3a85475984a54a457d2aefefb0896710cd656853fc3fc46455753958dbeca
-SIZE (task-1.9.3.tar.gz) = 314687
+SHA256 (task-1.9.4.tar.gz) = 1020621c9bf885c3216a5c11cacced3c916b6495e0d09846b7438a152618d34a
+SIZE (task-1.9.4.tar.gz) = 479079
diff --git a/deskutils/taskwarrior/files/patch-Makefile.in b/deskutils/taskwarrior/files/patch-Makefile.in
deleted file mode 100644
index 4ef7bb33321..00000000000
--- a/deskutils/taskwarrior/files/patch-Makefile.in
+++ /dev/null
@@ -1,23 +0,0 @@
---- Makefile.in.orig	2010-11-09 07:37:48.000000000 +0000
-+++ Makefile.in	2010-11-09 07:38:40.000000000 +0000
-@@ -189,15 +189,15 @@
- #docdir = $(datadir)/doc/${PACKAGE}-${VERSION}
- doc_DATA = AUTHORS ChangeLog COPYING NEWS README
- EXTRA_DIST = INSTALL README.build
--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 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-CA.rc doc/rc/holidays-DE.rc doc/rc/holidays-ES.rc doc/rc/holidays-FR.rc doc/rc/holidays-NL.rc doc/rc/holidays-SE.rc doc/rc/holidays-UK.rc doc/rc/holidays-US.rc doc/rc/dark-16.theme doc/rc/dark-256.theme doc/rc/light-16.theme doc/rc/light-256.theme doc/rc/dark-blue-256.theme doc/rc/dark-green-256.theme doc/rc/dark-red-256.theme doc/rc/dark-violets-256.theme doc/rc/dark-yellow-green.theme
- all: auto.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/deskutils/taskwarrior/pkg-plist b/deskutils/taskwarrior/pkg-plist
index 0f28de20c57..e22ae5b7198 100644
--- a/deskutils/taskwarrior/pkg-plist
+++ b/deskutils/taskwarrior/pkg-plist
@@ -1,49 +1,64 @@
 bin/task
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
+%%DATADIR%%/AUTHORS
+%%DATADIR%%/ChangeLog
+%%DATADIR%%/COPYING
+%%DATADIR%%/INSTALL
+%%DATADIR%%/NEWS
+%%DATADIR%%/README
+%%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
 %%DATADIR%%/rc/dark-16.theme
 %%DATADIR%%/rc/dark-256.theme
 %%DATADIR%%/rc/dark-blue-256.theme
+%%DATADIR%%/rc/dark-gray-256.theme
 %%DATADIR%%/rc/dark-green-256.theme
 %%DATADIR%%/rc/dark-red-256.theme
 %%DATADIR%%/rc/dark-violets-256.theme
 %%DATADIR%%/rc/dark-yellow-green.theme
+%%DATADIR%%/rc/holidays-AT.rc
 %%DATADIR%%/rc/holidays-CA.rc
 %%DATADIR%%/rc/holidays-DE.rc
+%%DATADIR%%/rc/holidays-DK.rc
 %%DATADIR%%/rc/holidays-ES.rc
 %%DATADIR%%/rc/holidays-FR.rc
+%%DATADIR%%/rc/holidays-IT.rc
 %%DATADIR%%/rc/holidays-NL.rc
+%%DATADIR%%/rc/holidays-NO.rc
+%%DATADIR%%/rc/holidays-NZ.rc
 %%DATADIR%%/rc/holidays-SE.rc
 %%DATADIR%%/rc/holidays-UK.rc
 %%DATADIR%%/rc/holidays-US.rc
 %%DATADIR%%/rc/light-16.theme
 %%DATADIR%%/rc/light-256.theme
+%%DATADIR%%/scripts/add-ons/export-csv.pl
+%%DATADIR%%/scripts/add-ons/export-ical.pl
+%%DATADIR%%/scripts/add-ons/export-xml.pl
+%%DATADIR%%/scripts/add-ons/export-xml.py
+%%DATADIR%%/scripts/add-ons/export-xml.rb
+%%DATADIR%%/scripts/add-ons/export-yaml.pl
 %%DATADIR%%/scripts/bash/task_completion.sh
+%%DATADIR%%/scripts/fish/task.fish
 %%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
-%%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
 @dirrm %%DATADIR%%/scripts/zsh
 @dirrm %%DATADIR%%/scripts/vim/syntax
 @dirrm %%DATADIR%%/scripts/vim/ftdetect
 @dirrm %%DATADIR%%/scripts/vim
+@dirrm %%DATADIR%%/scripts/fish
 @dirrm %%DATADIR%%/scripts/bash
+@dirrm %%DATADIR%%/scripts/add-ons
 @dirrm %%DATADIR%%/scripts
 @dirrm %%DATADIR%%/i18n
 @dirrm %%DATADIR%%/rc
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%