Index: head/deskutils/taskwarrior/files/patch-src_Task.cpp =================================================================== --- head/deskutils/taskwarrior/files/patch-src_Task.cpp (revision 425217) +++ head/deskutils/taskwarrior/files/patch-src_Task.cpp (nonexistent) @@ -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; - } Property changes on: head/deskutils/taskwarrior/files/patch-src_Task.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/deskutils/taskwarrior/files/patch-src_ISO8601.h =================================================================== --- head/deskutils/taskwarrior/files/patch-src_ISO8601.h (revision 425217) +++ head/deskutils/taskwarrior/files/patch-src_ISO8601.h (nonexistent) @@ -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 Property changes on: head/deskutils/taskwarrior/files/patch-src_ISO8601.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/deskutils/taskwarrior/files/patch-src_recur.cpp =================================================================== --- head/deskutils/taskwarrior/files/patch-src_recur.cpp (revision 425217) +++ head/deskutils/taskwarrior/files/patch-src_recur.cpp (nonexistent) @@ -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; - } - - //////////////////////////////////////////////////////////////////////////////// Property changes on: head/deskutils/taskwarrior/files/patch-src_recur.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/deskutils/taskwarrior/files/patch-src_ISO8601.cpp =================================================================== --- head/deskutils/taskwarrior/files/patch-src_ISO8601.cpp (revision 425217) +++ head/deskutils/taskwarrior/files/patch-src_ISO8601.cpp (nonexistent) @@ -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 (), Property changes on: head/deskutils/taskwarrior/files/patch-src_ISO8601.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/deskutils/taskwarrior/files/patch-src_commands_CmdEdit.cpp =================================================================== --- head/deskutils/taskwarrior/files/patch-src_commands_CmdEdit.cpp (revision 425217) +++ head/deskutils/taskwarrior/files/patch-src_commands_CmdEdit.cpp (nonexistent) @@ -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 - #include - #include -+#include - - extern Context context; - Property changes on: head/deskutils/taskwarrior/files/patch-src_commands_CmdEdit.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/deskutils/taskwarrior/files/patch-src_commands_CmdTimesheet.cpp =================================================================== --- head/deskutils/taskwarrior/files/patch-src_commands_CmdTimesheet.cpp (revision 425217) +++ head/deskutils/taskwarrior/files/patch-src_commands_CmdTimesheet.cpp (nonexistent) @@ -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; Property changes on: head/deskutils/taskwarrior/files/patch-src_commands_CmdTimesheet.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/deskutils/taskwarrior/Makefile =================================================================== --- head/deskutils/taskwarrior/Makefile (revision 425217) +++ head/deskutils/taskwarrior/Makefile (revision 425218) @@ -1,36 +1,36 @@ # Created by: gahr # $FreeBSD$ PORTNAME= taskwarrior -PORTVERSION= 2.5.0 -PORTREVISION= 1 +PORTVERSION= 2.5.1 CATEGORIES= deskutils DISTNAME= task-${PORTVERSION} MAINTAINER= skreuzer@FreeBSD.org COMMENT= Feature-rich command-line todo list manager 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 USE_GITHUB= yes GH_ACCOUNT= taskwarrior GH_PROJECT= task CMAKE_ARGS+= -DTASK_DOCDIR:STRING=${DATADIR:S/${PREFIX}\///} \ -DTASK_MAN1DIR:STRING=man/man1 \ -DTASK_MAN5DIR:STRING=man/man5 SHEBANG_FILES= scripts/*/*.pl \ doc/rc/refresh \ do-test: @cd ${WRKSRC}/test && \ ${PYTHON_CMD} run_all --verbose && \ ${PYTHON_CMD} problems .include Index: head/deskutils/taskwarrior/distinfo =================================================================== --- head/deskutils/taskwarrior/distinfo (revision 425217) +++ head/deskutils/taskwarrior/distinfo (revision 425218) @@ -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 Index: head/deskutils/taskwarrior/pkg-plist =================================================================== --- head/deskutils/taskwarrior/pkg-plist (revision 425217) +++ head/deskutils/taskwarrior/pkg-plist (revision 425218) @@ -1,88 +1,90 @@ bin/task man/man1/task.1.gz 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 %%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 %%DATADIR%%/rc/dark-yellow-green.theme %%DATADIR%%/rc/holidays.be-BY.rc %%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-IN.rc %%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 %%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 +%%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 %%DATADIR%%/scripts/zsh/_task %%DATADIR%%/task-ref.pdf