5 files changed, 80 insertions, 7 deletions

diff --git a/deskutils/timewarrior/Makefile b/deskutils/timewarrior/Makefile
index f2341b13b6c4..a03d3877ef25 100644
--- a/deskutils/timewarrior/Makefile
+++ b/deskutils/timewarrior/Makefile
@@ -1,11 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	timewarrior
-PORTVERSION=	1.1.1
-PORTREVISION=	3
+PORTVERSION=	1.3.0
+DISTVERSIONPREFIX=	v
 CATEGORIES=	deskutils
-MASTER_SITES=	https://taskwarrior.org/download/
-DISTNAME=	timew-${PORTVERSION}
 
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Track time from the command line
@@ -13,6 +11,10 @@ COMMENT=	Track time from the command line
 LICENSE=	MIT
 
 USES=		cmake compiler:c++11-lang
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	GothenburgBitFactory
+GH_TUPLE=	GothenburgBitFactory:libshared:0d4e31d:libshared/src/libshared
 CMAKE_ARGS+=	-DTIMEW_DOCDIR=${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/deskutils/timewarrior/distinfo b/deskutils/timewarrior/distinfo
index 8309b73e1b25..72df6b78d891 100644
--- a/deskutils/timewarrior/distinfo
+++ b/deskutils/timewarrior/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1529603473
-SHA256 (timew-1.1.1.tar.gz) = 1f7d9a62e55fc5a3126433654ccb1fd7d2d135f06f05697f871897c9db77ccc9
-SIZE (timew-1.1.1.tar.gz) = 166484
+TIMESTAMP = 1595964414
+SHA256 (GothenburgBitFactory-timewarrior-v1.3.0_GH0.tar.gz) = 6199304fc9697a2eb78c542357aec984924bc2ecad90f3bedf1f6299fe345484
+SIZE (GothenburgBitFactory-timewarrior-v1.3.0_GH0.tar.gz) = 165036
+SHA256 (GothenburgBitFactory-libshared-0d4e31d_GH0.tar.gz) = 254ebd19889ec077ce5f48ce4c014e768bf96c2f7928956c1e3b1a55b605c621
+SIZE (GothenburgBitFactory-libshared-0d4e31d_GH0.tar.gz) = 148753
diff --git a/deskutils/timewarrior/files/patch-src_commands_CmdHelp.cpp b/deskutils/timewarrior/files/patch-src_commands_CmdHelp.cpp
new file mode 100644
index 000000000000..1f647efe3bfd
--- /dev/null
+++ b/deskutils/timewarrior/files/patch-src_commands_CmdHelp.cpp
@@ -0,0 +1,10 @@
+--- src/commands/CmdHelp.cpp.orig	2020-07-28 19:41:05 UTC
++++ src/commands/CmdHelp.cpp
+@@ -30,6 +30,7 @@
+ #include <FS.h>
+ #include <shared.h>
+ #include <additional-help.h>
++#include <sys/wait.h>
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ int CmdHelpUsage (const Extensions& extensions)
diff --git a/deskutils/timewarrior/files/patch-src_libshared_src_FS.cpp b/deskutils/timewarrior/files/patch-src_libshared_src_FS.cpp
new file mode 100644
index 000000000000..8b74832e716a
--- /dev/null
+++ b/deskutils/timewarrior/files/patch-src_libshared_src_FS.cpp
@@ -0,0 +1,20 @@
+--- src/libshared/src/FS.cpp.orig	2020-07-28 19:40:14 UTC
++++ src/libshared/src/FS.cpp
+@@ -478,7 +478,7 @@ bool File::lock ()
+ #ifdef DARWIN
+                     // l_start l_len l_pid l_type   l_whence
+     struct flock fl = {0,      0,    0,    F_WRLCK, SEEK_SET};
+-#elif FREEBSD
++#elif defined FREEBSD
+                     // l_type   l_whence  l_start  l_len  l_pid  l_sysid
+     struct flock fl = {F_WRLCK, SEEK_SET, 0,       0,     0,     0 };
+ #else
+@@ -501,7 +501,7 @@ void File::unlock ()
+ #ifdef DARWIN
+                     // l_start l_len l_pid l_type   l_whence
+     struct flock fl = {0,      0,    0,    F_WRLCK, SEEK_SET};
+-#elif FREEBSD
++#elif defined FREEBSD
+                     // l_type   l_whence  l_start  l_len  l_pid  l_sysid
+     struct flock fl = {F_WRLCK, SEEK_SET, 0,       0,     0,     0 };
+ #else
diff --git a/deskutils/timewarrior/pkg-plist b/deskutils/timewarrior/pkg-plist
index 550e27dcc0bc..75eceb1cb89e 100644
--- a/deskutils/timewarrior/pkg-plist
+++ b/deskutils/timewarrior/pkg-plist
@@ -1,5 +1,44 @@
 bin/timew
 man/man1/timew.1.gz
+man/man1/timew-annotate.1.gz
+man/man1/timew-cancel.1.gz
+man/man1/timew-chart.1.gz
+man/man1/timew-config.1.gz
+man/man1/timew-continue.1.gz
+man/man1/timew-day.1.gz
+man/man1/timew-delete.1.gz
+man/man1/timew-diagnostics.1.gz
+man/man1/timew-export.1.gz
+man/man1/timew-extensions.1.gz
+man/man1/timew-fill.1.gz
+man/man1/timew-gaps.1.gz
+man/man1/timew-get.1.gz
+man/man1/timew-help.1.gz
+man/man1/timew-join.1.gz
+man/man1/timew-lengthen.1.gz
+man/man1/timew-modify.1.gz
+man/man1/timew-month.1.gz
+man/man1/timew-move.1.gz
+man/man1/timew-report.1.gz
+man/man1/timew-resize.1.gz
+man/man1/timew-shorten.1.gz
+man/man1/timew-show.1.gz
+man/man1/timew-split.1.gz
+man/man1/timew-start.1.gz
+man/man1/timew-stop.1.gz
+man/man1/timew-summary.1.gz
+man/man1/timew-tag.1.gz
+man/man1/timew-tags.1.gz
+man/man1/timew-track.1.gz
+man/man1/timew-undo.1.gz
+man/man1/timew-untag.1.gz
+man/man1/timew-week.1.gz
+man/man7/timew-config.7.gz
+man/man7/timew-dates.7.gz
+man/man7/timew-dom.7.gz
+man/man7/timew-durations.7.gz
+man/man7/timew-hints.7.gz
+man/man7/timew-ranges.7.gz
 %%DOCSDIR%%/AUTHORS
 %%DOCSDIR%%/COPYING
 %%DOCSDIR%%/ChangeLog