8 files changed, 159 insertions, 39 deletions

diff --git a/deskutils/taskwarrior/Makefile b/deskutils/taskwarrior/Makefile
index 552a6ff66f5b..6c31cbcdca8e 100644
--- a/deskutils/taskwarrior/Makefile
+++ b/deskutils/taskwarrior/Makefile
@@ -2,42 +2,34 @@
 # $FreeBSD$
 
 PORTNAME=	taskwarrior
-PORTVERSION=	2.4.4
-PORTREVISION=	1
+PORTVERSION=	2.5.0
 CATEGORIES=	deskutils
-MASTER_SITES=	http://taskwarrior.org/download/
 DISTNAME=	task-${PORTVERSION}
 
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Feature-rich command-line todo list manager
 
 LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-OPTIONS_DEFINE=GNUTLS
-OPTIONS_DEFAULT=GNUTLS
+LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
 
-GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
-GNUTLS_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_GnuTLS=TRUE
+USES=		compiler:c++11-lib cmake python:test shebangfix
 
-.include <bsd.port.options.mk>
+USE_GITHUB=	yes
+GH_ACCOUNT=	taskwarrior
+GH_PROJECT=	task
 
-.if ${OSVERSION} < 1000000
-BUILD_DEPENDS+=	${LOCALBASE}/bin/clang36:${PORTSDIR}/lang/clang36
-CPP=	${LOCALBASE}/bin/clang-cpp36
-CC=	${LOCALBASE}/bin/clang36
-CXX=	${LOCALBASE}/bin/clang++36
-.endif
-
-WRKSRC=		${WRKDIR}/task-${PORTVERSION}
+CMAKE_ARGS+=	-DTASK_DOCDIR:STRING=${DATADIR:S/${PREFIX}\///} \
+		-DTASK_MAN1DIR:STRING=man/man1 \
+		-DTASK_MAN5DIR:STRING=man/man5
 
-USES=		cmake:outsource shebangfix
 SHEBANG_FILES=	scripts/*/*.pl \
-		scripts/*/*.rb \
-		scripts/*/*.py \
 		doc/rc/refresh \
-		scripts/bash/context
-CMAKE_ARGS+=	-DTASK_DOCDIR:STRING=${DATADIR:S/${PREFIX}\///} \
-   		-DTASK_MAN1DIR:STRING=man/man1 \
-		-DTASK_MAN5DIR:STRING=man/man5
+
+do-test:
+	@cd ${WRKSRC}/test && \
+	${PYTHON_CMD} run_all --verbose && \
+	${PYTHON_CMD} problems
 
 .include <bsd.port.mk>
diff --git a/deskutils/taskwarrior/distinfo b/deskutils/taskwarrior/distinfo
index cd2621d40061..453767ae171e 100644
--- a/deskutils/taskwarrior/distinfo
+++ b/deskutils/taskwarrior/distinfo
@@ -1,2 +1,2 @@
-SHA256 (task-2.4.4.tar.gz) = 7ff406414e0be480f91981831507ac255297aab33d8246f98dbfd2b1b2df8e3b
-SIZE (task-2.4.4.tar.gz) = 2352265
+SHA256 (task-2.5.0_GH0.tar.gz) = 98acb709a4b62390fc5afbe2ba852cf4caebca1dc090575a0f098e001e12cebf
+SIZE (task-2.5.0_GH0.tar.gz) = 1524446
diff --git a/deskutils/taskwarrior/files/patch-src_ISO8601.cpp b/deskutils/taskwarrior/files/patch-src_ISO8601.cpp
new file mode 100644
index 000000000000..793f778858ab
--- /dev/null
+++ b/deskutils/taskwarrior/files/patch-src_ISO8601.cpp
@@ -0,0 +1,79 @@
+--- 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
new file mode 100644
index 000000000000..7bfa9723b4d3
--- /dev/null
+++ b/deskutils/taskwarrior/files/patch-src_ISO8601.h
@@ -0,0 +1,18 @@
+--- 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
new file mode 100644
index 000000000000..19430ba84258
--- /dev/null
+++ b/deskutils/taskwarrior/files/patch-src_Task.cpp
@@ -0,0 +1,11 @@
+--- 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_CmdTimesheet.cpp b/deskutils/taskwarrior/files/patch-src_commands_CmdTimesheet.cpp
new file mode 100644
index 000000000000..c76eda17be57
--- /dev/null
+++ b/deskutils/taskwarrior/files/patch-src_commands_CmdTimesheet.cpp
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..d2bbf09cabfd
--- /dev/null
+++ b/deskutils/taskwarrior/files/patch-src_recur.cpp
@@ -0,0 +1,20 @@
+--- 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 080fc4c70ca1..eeadaeb92e34 100644
--- a/deskutils/taskwarrior/pkg-plist
+++ b/deskutils/taskwarrior/pkg-plist
@@ -34,6 +34,8 @@ man/man5/taskrc.5.gz
 %%DATADIR%%/rc/holidays.en-NZ.rc
 %%DATADIR%%/rc/holidays.en-US.rc
 %%DATADIR%%/rc/holidays.en-ZA.rc
+%%DATADIR%%/rc/holidays.es-CO.rc
+%%DATADIR%%/rc/holidays.es-EC.rc
 %%DATADIR%%/rc/holidays.es-ES.rc
 %%DATADIR%%/rc/holidays.es-MX.rc
 %%DATADIR%%/rc/holidays.es-US.rc
@@ -65,21 +67,8 @@ man/man5/taskrc.5.gz
 %%DATADIR%%/rc/refresh
 %%DATADIR%%/rc/solarized-dark-256.theme
 %%DATADIR%%/rc/solarized-light-256.theme
-%%DATADIR%%/scripts/add-ons/export-csv.pl
-%%DATADIR%%/scripts/add-ons/export-html.pl
-%%DATADIR%%/scripts/add-ons/export-ical.pl
-%%DATADIR%%/scripts/add-ons/export-sql.py
-%%DATADIR%%/scripts/add-ons/export-tsv.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-yad.pl
-%%DATADIR%%/scripts/add-ons/export-yaml.pl
-%%DATADIR%%/scripts/add-ons/import-todo.sh.pl
-%%DATADIR%%/scripts/add-ons/import-yaml.pl
+%%DATADIR%%/scripts/add-ons/README
 %%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