aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--deskutils/dstask/Makefile16
-rw-r--r--deskutils/dstask/distinfo8
-rw-r--r--deskutils/dstask/files/patch-vendor_modules.txt11
-rw-r--r--deskutils/dstask/pkg-plist7
4 files changed, 24 insertions, 18 deletions
diff --git a/deskutils/dstask/Makefile b/deskutils/dstask/Makefile
index 80406879754c..9d8581c1cab8 100644
--- a/deskutils/dstask/Makefile
+++ b/deskutils/dstask/Makefile
@@ -2,13 +2,9 @@
PORTNAME= dstask
DISTVERSIONPREFIX= v
-DISTVERSION= 0.23.2
+DISTVERSION= 0.24.1
CATEGORIES= deskutils
-# Temporary patch to fix a build issue in released version
-PATCHFILES= 947deb069256bcec020756ce052ccc718e68cfb5.diff:-p1
-PATCH_SITES= https://github.com/naggie/dstask/commit/
-
MAINTAINER= ashish@FreeBSD.org
COMMENT= Single binary terminal-based TODO manager with git-based sync
@@ -18,21 +14,15 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= git:devel/git
USES= go:modules
-GO_TARGET= cmd/dstask/main.go
+GO_TARGET= ./cmd/dstask ./cmd/dstask-import
USE_GITHUB= yes
GH_ACCOUNT= naggie
-PLIST_FILES= bin/${PORTNAME} \
- ${DOCSDIR_REL}/README.md \
- etc/bash_completion.d/${PORTNAME}.sh \
- share/zsh/site-functions/_${PORTNAME}
-
post-install:
- @${MV} ${STAGEDIR}${PREFIX}/bin/${GO_TARGET:T} \
- ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
+ cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}/${DOCSDIR}
@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
${INSTALL_DATA} ${WRKSRC}/.${PORTNAME}-zsh-completions.sh \
${STAGEDIR}${PREFIX}/share/zsh/site-functions/_${PORTNAME}
diff --git a/deskutils/dstask/distinfo b/deskutils/dstask/distinfo
index 2c161b70d38b..4a11977e9635 100644
--- a/deskutils/dstask/distinfo
+++ b/deskutils/dstask/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1605977365
-SHA256 (naggie-dstask-v0.23.2_GH0.tar.gz) = 30665d3f0f1e268af6eff681e331557f56273bf6ac7491b489c50725b55ef293
-SIZE (naggie-dstask-v0.23.2_GH0.tar.gz) = 2537726
-SHA256 (947deb069256bcec020756ce052ccc718e68cfb5.diff) = 74583b543ff10465c85258e3235a918ac2de387d06b2c5cbbc6bd5a2d219d8b1
-SIZE (947deb069256bcec020756ce052ccc718e68cfb5.diff) = 463671
+TIMESTAMP = 1615092691
+SHA256 (naggie-dstask-v0.24.1_GH0.tar.gz) = 35d46ade97f7b68e2bfb719b8bdb0db65e4b66b97e368849ecdecab1d58ef3d0
+SIZE (naggie-dstask-v0.24.1_GH0.tar.gz) = 3288912
diff --git a/deskutils/dstask/files/patch-vendor_modules.txt b/deskutils/dstask/files/patch-vendor_modules.txt
new file mode 100644
index 000000000000..4dc50a864fb8
--- /dev/null
+++ b/deskutils/dstask/files/patch-vendor_modules.txt
@@ -0,0 +1,11 @@
+--- vendor/modules.txt.orig 2021-03-07 04:55:30 UTC
++++ vendor/modules.txt
+@@ -36,7 +36,7 @@ golang.org/x/net/context/ctxhttp
+ # golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58
+ golang.org/x/oauth2
+ golang.org/x/oauth2/internal
+-# golang.org/x/sys v0.0.0-20201117222635-ba5294a509c7
++# golang.org/x/sys@v0.0.0-20210119212857-b64e53b001e4
+ golang.org/x/sys/internal/unsafeheader
+ golang.org/x/sys/unix
+ golang.org/x/sys/windows
diff --git a/deskutils/dstask/pkg-plist b/deskutils/dstask/pkg-plist
new file mode 100644
index 000000000000..f2a1028a3093
--- /dev/null
+++ b/deskutils/dstask/pkg-plist
@@ -0,0 +1,7 @@
+bin/dstask
+bin/dstask-import
+etc/bash_completion.d/dstask.sh
+%%DOCSDIR%%/README.md
+%%DOCSDIR%%/dstask-import.md
+%%DOCSDIR%%/taskwarrior-migration.md
+share/zsh/site-functions/_dstask