deskutils/taskwarrior: Update to 2.5.1

- Update PORTVERSION and distinfo checksum (2.5.1)
- Add TEST_DEPENDS
- Remove patches (upstream)
- Update pkg-plist


  https://github.com/taskwarrior/task/blob/2.5.1/ChangeLog

Reviewed by:		skreuzer (maintainer)
Approved by:		skreuzer (maintainer)
Differential Revision:	D8380

9 files changed, 12 insertions, 158 deletions

diff --git a/deskutils/taskwarrior/Makefile b/deskutils/taskwarrior/Makefile
index 66a4806ff842..81e8e98f67eb 100644
--- a/deskutils/taskwarrior/Makefile
+++ b/deskutils/taskwarrior/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	taskwarrior
-PORTVERSION=	2.5.0
-PORTREVISION=	1
+PORTVERSION=	2.5.1
 CATEGORIES=	deskutils
 DISTNAME=	task-${PORTVERSION}
 
@@ -14,6 +13,7 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libgnutls.so:security/gnutls
+TEST_DEPENDS=	faketime:devel/libfaketime
 
 USES=		compiler:c++11-lib cmake python:test shebangfix
 
diff --git a/deskutils/taskwarrior/distinfo b/deskutils/taskwarrior/distinfo
index 453767ae171e..906f736cbe6b 100644
--- a/deskutils/taskwarrior/distinfo
+++ b/deskutils/taskwarrior/distinfo
@@ -1,2 +1,3 @@
-SHA256 (task-2.5.0_GH0.tar.gz) = 98acb709a4b62390fc5afbe2ba852cf4caebca1dc090575a0f098e001e12cebf
-SIZE (task-2.5.0_GH0.tar.gz) = 1524446
+TIMESTAMP = 1477559559
+SHA256 (task-2.5.1_GH0.tar.gz) = 494533860a0137ce49551b29b43c3962ec59e7664133fc16a8d5945439a81c6a
+SIZE (task-2.5.1_GH0.tar.gz) = 1522281
diff --git a/deskutils/taskwarrior/files/patch-src_ISO8601.cpp b/deskutils/taskwarrior/files/patch-src_ISO8601.cpp
deleted file mode 100644
index 793f778858ab..000000000000
--- a/deskutils/taskwarrior/files/patch-src_ISO8601.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
---- src/ISO8601.cpp.orig	2015-10-21 20:50:42 UTC
-+++ src/ISO8601.cpp
-@@ -1535,34 +1535,28 @@ bool ISO8601d::sameYear (const ISO8601d&
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--ISO8601d ISO8601d::operator+ (time_t delta)
--{
--  return ISO8601d (_date + delta);
--}
--
--////////////////////////////////////////////////////////////////////////////////
--ISO8601d ISO8601d::operator+ (const int delta)
-+ISO8601d ISO8601d::operator+ (const time_t delta)
- {
-   return ISO8601d (_date + delta);
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--ISO8601d ISO8601d::operator- (const int delta)
-+ISO8601d ISO8601d::operator- (const time_t delta)
- {
-   return ISO8601d (_date - delta);
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--ISO8601d& ISO8601d::operator+= (const int delta)
-+ISO8601d& ISO8601d::operator+= (const time_t delta)
- {
--  _date += (time_t) delta;
-+  _date += delta;
-   return *this;
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--ISO8601d& ISO8601d::operator-= (const int delta)
-+ISO8601d& ISO8601d::operator-= (const time_t delta)
- {
--  _date -= (time_t) delta;
-+  _date -= delta;
-   return *this;
- }
- 
-@@ -1576,7 +1570,7 @@ time_t ISO8601d::operator- (const ISO860
- // Prefix decrement by one day.
- void ISO8601d::operator-- ()
- {
--  ISO8601d yesterday = startOfDay () - 1;
-+  ISO8601d yesterday = startOfDay () - (time_t) 1;
-   yesterday = ISO8601d (yesterday.month (),
-                         yesterday.day (),
-                         yesterday.year (),
-@@ -1590,7 +1584,7 @@ void ISO8601d::operator-- ()
- // Postfix decrement by one day.
- void ISO8601d::operator-- (int)
- {
--  ISO8601d yesterday = startOfDay () - 1;
-+  ISO8601d yesterday = startOfDay () - (time_t) 1;
-   yesterday = ISO8601d (yesterday.month (),
-                         yesterday.day (),
-                         yesterday.year (),
-@@ -1604,7 +1598,7 @@ void ISO8601d::operator-- (int)
- // Prefix increment by one day.
- void ISO8601d::operator++ ()
- {
--  ISO8601d tomorrow = (startOfDay () + 90001).startOfDay ();
-+  ISO8601d tomorrow = (startOfDay () + (time_t) 90001).startOfDay ();
-   tomorrow = ISO8601d (tomorrow.month (),
-                        tomorrow.day (),
-                        tomorrow.year (),
-@@ -1618,7 +1612,7 @@ void ISO8601d::operator++ ()
- // Postfix increment by one day.
- void ISO8601d::operator++ (int)
- {
--  ISO8601d tomorrow = (startOfDay () + 90001).startOfDay ();
-+  ISO8601d tomorrow = (startOfDay () + (time_t) 90001).startOfDay ();
-   tomorrow = ISO8601d (tomorrow.month (),
-                        tomorrow.day (),
-                        tomorrow.year (),
diff --git a/deskutils/taskwarrior/files/patch-src_ISO8601.h b/deskutils/taskwarrior/files/patch-src_ISO8601.h
deleted file mode 100644
index 7bfa9723b4d3..000000000000
--- a/deskutils/taskwarrior/files/patch-src_ISO8601.h
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/ISO8601.h.orig	2015-10-21 20:50:42 UTC
-+++ src/ISO8601.h
-@@ -96,11 +96,10 @@ public:
-   bool sameWeek   (const ISO8601d&) const;
-   bool sameMonth  (const ISO8601d&) const;
-   bool sameYear   (const ISO8601d&) const;
--  ISO8601d operator+  (time_t);
--  ISO8601d operator+  (const int);
--  ISO8601d operator-  (const int);
--  ISO8601d& operator+= (const int);
--  ISO8601d& operator-= (const int);
-+  ISO8601d operator+  (const time_t);
-+  ISO8601d operator-  (const time_t);
-+  ISO8601d& operator+= (const time_t);
-+  ISO8601d& operator-= (const time_t);
-   time_t operator- (const ISO8601d&);
-   void operator-- ();    // Prefix
-   void operator-- (int); // Postfix
diff --git a/deskutils/taskwarrior/files/patch-src_Task.cpp b/deskutils/taskwarrior/files/patch-src_Task.cpp
deleted file mode 100644
index 19430ba84258..000000000000
--- a/deskutils/taskwarrior/files/patch-src_Task.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Task.cpp.orig	2015-10-21 20:50:42 UTC
-+++ src/Task.cpp
-@@ -359,7 +359,7 @@ Task::dateState Task::getDateState (cons
-     if (imminentperiod == 0)
-       return dateAfterToday;
- 
--    ISO8601d imminentDay = today + imminentperiod * 86400;
-+    ISO8601d imminentDay = today + imminentperiod * (time_t) 86400;
-     if (reference < imminentDay)
-       return dateAfterToday;
-   }
diff --git a/deskutils/taskwarrior/files/patch-src_commands_CmdEdit.cpp b/deskutils/taskwarrior/files/patch-src_commands_CmdEdit.cpp
deleted file mode 100644
index 7e141fe6c035..000000000000
--- a/deskutils/taskwarrior/files/patch-src_commands_CmdEdit.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/commands/CmdEdit.cpp.orig	2016-01-20 20:16:08 UTC
-+++ src/commands/CmdEdit.cpp
-@@ -42,6 +42,7 @@
- #include <main.h>
- #include <CmdEdit.h>
- #include <JSON.h>
-+#include <cerrno>
- 
- extern Context context;
- 
diff --git a/deskutils/taskwarrior/files/patch-src_commands_CmdTimesheet.cpp b/deskutils/taskwarrior/files/patch-src_commands_CmdTimesheet.cpp
deleted file mode 100644
index c76eda17be57..000000000000
--- a/deskutils/taskwarrior/files/patch-src_commands_CmdTimesheet.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/commands/CmdTimesheet.cpp.orig	2015-10-21 20:50:42 UTC
-+++ src/commands/CmdTimesheet.cpp
-@@ -75,7 +75,7 @@ int CmdTimesheet::execute (std::string& 
- 
-   // Roll back to midnight.
-   start = ISO8601d (start.month (), start.day (), start.year ());
--  ISO8601d end = start + (7 * 86400);
-+  ISO8601d end = start + (time_t)(7 * 86400);
- 
-   // Determine how many reports to run.
-   int quantity = 1;
diff --git a/deskutils/taskwarrior/files/patch-src_recur.cpp b/deskutils/taskwarrior/files/patch-src_recur.cpp
deleted file mode 100644
index d2bbf09cabfd..000000000000
--- a/deskutils/taskwarrior/files/patch-src_recur.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/recur.cpp.orig	2015-10-21 20:50:42 UTC
-+++ src/recur.cpp
-@@ -241,7 +241,7 @@ ISO8601d getNextRecurrence (ISO8601d& cu
-     else if (dow == 6) days = 2;
-     else               days = 1;
- 
--    return current + (days * 86400);
-+    return current + (time_t)(days * 86400);
-   }
- 
-   else if (Lexer::isDigit (period[0]) &&
-@@ -377,7 +377,7 @@ ISO8601d getNextRecurrence (ISO8601d& cu
-     throw std::string (format (STRING_TASK_VALID_RECUR, period));
- 
-   secs = (time_t) p;
--  return current + secs;
-+  return current + (time_t) secs;
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
diff --git a/deskutils/taskwarrior/pkg-plist b/deskutils/taskwarrior/pkg-plist
index eeadaeb92e34..a7c924a99ea9 100644
--- a/deskutils/taskwarrior/pkg-plist
+++ b/deskutils/taskwarrior/pkg-plist
@@ -4,11 +4,11 @@ man/man5/task-color.5.gz
 man/man5/task-sync.5.gz
 man/man5/taskrc.5.gz
 %%DATADIR%%/AUTHORS
-%%DATADIR%%/COPYING
 %%DATADIR%%/ChangeLog
+%%DATADIR%%/COPYING
 %%DATADIR%%/INSTALL
+%%DATADIR%%/LICENSE
 %%DATADIR%%/NEWS
-%%DATADIR%%/README.md
 %%DATADIR%%/rc/dark-16.theme
 %%DATADIR%%/rc/dark-256.theme
 %%DATADIR%%/rc/dark-blue-256.theme
@@ -31,6 +31,7 @@ man/man5/taskrc.5.gz
 %%DATADIR%%/rc/holidays.en-GB.rc
 %%DATADIR%%/rc/holidays.en-GL.rc
 %%DATADIR%%/rc/holidays.en-HK.rc
+%%DATADIR%%/rc/holidays.en-IN.rc
 %%DATADIR%%/rc/holidays.en-NZ.rc
 %%DATADIR%%/rc/holidays.en-US.rc
 %%DATADIR%%/rc/holidays.en-ZA.rc
@@ -67,20 +68,21 @@ man/man5/taskrc.5.gz
 %%DATADIR%%/rc/refresh
 %%DATADIR%%/rc/solarized-dark-256.theme
 %%DATADIR%%/rc/solarized-light-256.theme
+%%DATADIR%%/README.md
 %%DATADIR%%/scripts/add-ons/README
 %%DATADIR%%/scripts/add-ons/update-holidays.pl
-%%DATADIR%%/scripts/bash/task.sh
 %%DATADIR%%/scripts/bash/task_functions.sh
+%%DATADIR%%/scripts/bash/task.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/hooks/README
 %%DATADIR%%/scripts/vim/ftdetect/task.vim
+%%DATADIR%%/scripts/vim/README
 %%DATADIR%%/scripts/vim/syntax/taskdata.vim
 %%DATADIR%%/scripts/vim/syntax/taskedit.vim
 %%DATADIR%%/scripts/vim/syntax/taskrc.vim