Update to v2.4.1

4 files changed, 43 insertions, 28 deletions

diff --git a/deskutils/taskwarrior/Makefile b/deskutils/taskwarrior/Makefile
index 6f56f382effa..d52ac01a341b 100644
--- a/deskutils/taskwarrior/Makefile
+++ b/deskutils/taskwarrior/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	taskwarrior
-PORTVERSION=	2.3.0
-PORTREVISION=	1
+PORTVERSION=	2.4.1
 CATEGORIES=	deskutils
 MASTER_SITES=	http://taskwarrior.org/download/
 DISTNAME=	task-${PORTVERSION}
diff --git a/deskutils/taskwarrior/distinfo b/deskutils/taskwarrior/distinfo
index 46d411302e52..e900381e8a8a 100644
--- a/deskutils/taskwarrior/distinfo
+++ b/deskutils/taskwarrior/distinfo
@@ -1,2 +1,2 @@
-SHA256 (task-2.3.0.tar.gz) = 2b9a289109e691e305b84631622299853134cf195d4c9af962759b640176ac73
-SIZE (task-2.3.0.tar.gz) = 1238592
+SHA256 (task-2.4.1.tar.gz) = d90e48c64639957b02f6e9a33cddd5411169003ca3b1f9351d0fcf3c3597c2e2
+SIZE (task-2.4.1.tar.gz) = 860973
diff --git a/deskutils/taskwarrior/files/patch-src_Nibbler.h b/deskutils/taskwarrior/files/patch-src_Nibbler.h
deleted file mode 100644
index e5c27abdb36c..000000000000
--- a/deskutils/taskwarrior/files/patch-src_Nibbler.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/Nibbler.h.orig	2013-09-17 10:58:23.000000000 +0200
-+++ src/Nibbler.h	2013-09-17 10:58:33.000000000 +0200
-@@ -37,6 +37,7 @@
- 
- #include <string>
- #include <vector>
-+#include <sys/time.h>
- 
- class Nibbler
- {
diff --git a/deskutils/taskwarrior/pkg-plist b/deskutils/taskwarrior/pkg-plist
index dc10b1faf3b5..080fc4c70ca1 100644
--- a/deskutils/taskwarrior/pkg-plist
+++ b/deskutils/taskwarrior/pkg-plist
@@ -1,29 +1,19 @@
 bin/task
-bin/tasksh
 man/man1/task.1.gz
-man/man1/tasksh.1.gz
-man/man5/taskrc.5.gz
-man/man5/task-faq.5.gz
 man/man5/task-color.5.gz
 man/man5/task-sync.5.gz
-man/man5/task-tutorial.5.gz
+man/man5/taskrc.5.gz
 %%DATADIR%%/AUTHORS
 %%DATADIR%%/COPYING
 %%DATADIR%%/ChangeLog
 %%DATADIR%%/INSTALL
 %%DATADIR%%/NEWS
-%%DATADIR%%/README
-%%DATADIR%%/i18n/tips.de-DE
-%%DATADIR%%/i18n/tips.en-US
-%%DATADIR%%/i18n/tips.es-ES
-%%DATADIR%%/i18n/tips.fr-FR
-%%DATADIR%%/i18n/tips.it-IT
-%%DATADIR%%/i18n/tips.ja-JP
-%%DATADIR%%/i18n/tips.sv-SE
+%%DATADIR%%/README.md
 %%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-gray-blue-256.theme
 %%DATADIR%%/rc/dark-green-256.theme
 %%DATADIR%%/rc/dark-red-256.theme
 %%DATADIR%%/rc/dark-violets-256.theme
@@ -32,20 +22,46 @@ man/man5/task-tutorial.5.gz
 %%DATADIR%%/rc/holidays.cs-CZ.rc
 %%DATADIR%%/rc/holidays.da-DK.rc
 %%DATADIR%%/rc/holidays.de-AT.rc
+%%DATADIR%%/rc/holidays.de-BE.rc
+%%DATADIR%%/rc/holidays.de-CH.rc
 %%DATADIR%%/rc/holidays.de-DE.rc
+%%DATADIR%%/rc/holidays.el-GR.rc
+%%DATADIR%%/rc/holidays.en-AU.rc
 %%DATADIR%%/rc/holidays.en-CA.rc
 %%DATADIR%%/rc/holidays.en-GB.rc
+%%DATADIR%%/rc/holidays.en-GL.rc
+%%DATADIR%%/rc/holidays.en-HK.rc
 %%DATADIR%%/rc/holidays.en-NZ.rc
 %%DATADIR%%/rc/holidays.en-US.rc
+%%DATADIR%%/rc/holidays.en-ZA.rc
 %%DATADIR%%/rc/holidays.es-ES.rc
+%%DATADIR%%/rc/holidays.es-MX.rc
+%%DATADIR%%/rc/holidays.es-US.rc
+%%DATADIR%%/rc/holidays.et-EE.rc
+%%DATADIR%%/rc/holidays.fi-FI.rc
+%%DATADIR%%/rc/holidays.fr-BE.rc
 %%DATADIR%%/rc/holidays.fr-FR.rc
+%%DATADIR%%/rc/holidays.ga-IE.rc
+%%DATADIR%%/rc/holidays.hr-HR.rc
+%%DATADIR%%/rc/holidays.is-IS.rc
 %%DATADIR%%/rc/holidays.it-IT.rc
 %%DATADIR%%/rc/holidays.jp-JP.rc
+%%DATADIR%%/rc/holidays.lt-LT.rc
+%%DATADIR%%/rc/holidays.lv-LV.rc
 %%DATADIR%%/rc/holidays.nb-NO.rc
+%%DATADIR%%/rc/holidays.nb-SJ.rc
+%%DATADIR%%/rc/holidays.nl-BE.rc
 %%DATADIR%%/rc/holidays.nl-NL.rc
+%%DATADIR%%/rc/holidays.pl-PL.rc
+%%DATADIR%%/rc/holidays.por-PRT.rc
+%%DATADIR%%/rc/holidays.pt-BR.rc
+%%DATADIR%%/rc/holidays.pt-PT.rc
+%%DATADIR%%/rc/holidays.ru-RU.rc
 %%DATADIR%%/rc/holidays.sv-SE.rc
+%%DATADIR%%/rc/holidays.tr-TR.rc
 %%DATADIR%%/rc/light-16.theme
 %%DATADIR%%/rc/light-256.theme
+%%DATADIR%%/rc/no-color.theme
 %%DATADIR%%/rc/refresh
 %%DATADIR%%/rc/solarized-dark-256.theme
 %%DATADIR%%/rc/solarized-light-256.theme
@@ -61,9 +77,19 @@ man/man5/task-tutorial.5.gz
 %%DATADIR%%/scripts/add-ons/export-yaml.pl
 %%DATADIR%%/scripts/add-ons/import-todo.sh.pl
 %%DATADIR%%/scripts/add-ons/import-yaml.pl
-%%DATADIR%%/scripts/bash/task.sh
 %%DATADIR%%/scripts/add-ons/update-holidays.pl
+%%DATADIR%%/scripts/bash/context
+%%DATADIR%%/scripts/bash/focus
+%%DATADIR%%/scripts/bash/task.sh
+%%DATADIR%%/scripts/bash/task_functions.sh
 %%DATADIR%%/scripts/fish/task.fish
+%%DATADIR%%/scripts/hooks/README
+%%DATADIR%%/scripts/hooks/on-add
+%%DATADIR%%/scripts/hooks/on-add.the
+%%DATADIR%%/scripts/hooks/on-exit
+%%DATADIR%%/scripts/hooks/on-exit.shadow-file
+%%DATADIR%%/scripts/hooks/on-launch
+%%DATADIR%%/scripts/hooks/on-modify
 %%DATADIR%%/scripts/vim/README
 %%DATADIR%%/scripts/vim/ftdetect/task.vim
 %%DATADIR%%/scripts/vim/syntax/taskdata.vim