Hi ports@, This is an update for productivity/taskwarrior to its latest version 2.6.1
Changes on the software are many, specially on the 2.6.0 version. You can find them all here: https://github.com/GothenburgBitFactory/taskwarrior/blob/e0f598f91c9734789d4423fe01255a3332d157da/ChangeLog On the port itself, the only significant changes are a patch to CMakeLists.txt where I remove the previous hunk, which is now present upstream and created a new one that removes 2 ninja targets that were throwing an error about an unscaped '$'. We're never going to use them, as they execute docker commands, so I just removed them. Also the zsh completion goes now to the folder we expect, so no need to copy it on post-install. I took maintainer while here. comments ? OK to commit ? diff d177c63db698305b6a07cd120d9723e031124a60 /usr/ports blob - 49cfdcc7499b10d6ee53e11ee66c7c4acac91bec file + productivity/taskwarrior/Makefile --- productivity/taskwarrior/Makefile +++ productivity/taskwarrior/Makefile @@ -2,13 +2,13 @@ COMMENT = command line todo list manager -VERSION = 2.5.3 +VERSION = 2.6.1 DISTNAME = task-${VERSION} PKGNAME = taskwarrior-${VERSION} CATEGORIES = productivity -REVISION = 0 HOMEPAGE = https://www.taskwarrior.org/ +MAINTAINER = Paco Esteban <p...@openbsd.org> MASTER_SITES = https://www.taskwarrior.org/download/ @@ -41,10 +41,6 @@ CONFIGURE_ENV += CFLAGS="-I${LOCALBASE}/include" \ NO_TEST = Yes pre-configure: - sed -i 's,/usr/local/share/doc/task/,${PREFIX}/share/doc/taskwarrior/,g' \ - ${WRKSRC}/cmake.h \ - ${WRKSRC}/doc/man/task-color.5.in \ - ${WRKSRC}/doc/man/taskrc.5.in sed -i 's,/usr/local/share/doc/task-VERSION/,${PREFIX}/share/doc/taskwarrior/,g' \ ${WRKSRC}/scripts/vim/README @@ -53,13 +49,10 @@ post-install: ${PREFIX}/share/taskwarrior/scripts/add-ons ${INSTALL_DATA_DIR} ${PREFIX}/share/bash-completion/completions ${INSTALL_DATA_DIR} ${PREFIX}/share/fish/vendor_completions.d - ${INSTALL_DATA_DIR} ${PREFIX}/share/zsh/site-functions ${INSTALL_DATA} ${PREFIX}/share/doc/taskwarrior/scripts/bash/task.sh \ ${PREFIX}/share/bash-completion/completions/task ${INSTALL_DATA} ${PREFIX}/share/doc/taskwarrior/scripts/fish/task.fish \ ${PREFIX}/share/fish/vendor_completions.d/ - ${INSTALL_DATA} ${PREFIX}/share/doc/taskwarrior/scripts/zsh/_task \ - ${PREFIX}/share/zsh/site-functions/ ${INSTALL_DATA_DIR} ${PREFIX}/share/vim/vimfiles/{ftdetect,syntax} ${INSTALL_DATA} ${PREFIX}/share/doc/taskwarrior/scripts/vim/ftdetect/task.vim \ ${PREFIX}/share/vim/vimfiles/ftdetect/ blob - 193cf715e61934537f5737a7ffa8ddbb03efaa7b file + productivity/taskwarrior/distinfo --- productivity/taskwarrior/distinfo +++ productivity/taskwarrior/distinfo @@ -1,2 +1,2 @@ -SHA256 (task-2.5.3.tar.gz) = ckPXXgkR2eLJEZrZSmGofwQeQFPhl/coDEJBCqHuljs= -SIZE (task-2.5.3.tar.gz) = 788760 +SHA256 (task-2.6.1.tar.gz) = AKpgMrPYN5pc+imvtm0rBwOmnj0f6nM9Il1lTbywCE8= +SIZE (task-2.6.1.tar.gz) = 836830 blob - 738279101015ff59e43d741b9028e1cec3642cac file + productivity/taskwarrior/patches/patch-CMakeLists_txt --- productivity/taskwarrior/patches/patch-CMakeLists_txt +++ productivity/taskwarrior/patches/patch-CMakeLists_txt @@ -1,14 +1,26 @@ -$OpenBSD: patch-CMakeLists_txt,v 1.5 2018/06/03 11:20:18 jasper Exp $ +$OpenBSD$ +remove targets that run docker + Index: CMakeLists.txt --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -193,7 +193,7 @@ if (EXISTS performance) - add_subdirectory (performance EXCLUDE_FROM_ALL) - endif (EXISTS performance) - --set (doc_FILES NEWS ChangeLog README.md INSTALL AUTHORS COPYING LICENSE) -+set (doc_FILES NEWS README.md) - foreach (doc_FILE ${doc_FILES}) +@@ -165,18 +165,6 @@ foreach (doc_FILE ${doc_FILES}) install (FILES ${doc_FILE} DESTINATION ${TASK_DOCDIR}) endforeach (doc_FILE) + +-add_custom_command(OUTPUT run-review +- COMMAND docker build -q --build-arg PR=$(PR) --build-arg LIBPR=$(LIBPR) -t taskwarrior-review:$(PR)s$(LIBPR) - < scripts/review-dockerfile +- COMMAND docker run --rm --memory 1g --hostname pr-$(PR)s$(LIBPR) -it taskwarrior-review:$(PR)s$(LIBPR) bash || : +-) +-add_custom_target(review DEPENDS run-review) +- +-add_custom_command(OUTPUT run-reproduce +- COMMAND docker build -q --build-arg RELEASE=$(RELEASE) -t taskwarrior-reproduce:$(RELEASE) - < scripts/reproduce-dockerfile +- COMMAND docker run --rm --memory 1g --hostname tw-$(RELEASE) -it taskwarrior-reproduce:$(RELEASE) bash || : +-) +-add_custom_target(reproduce DEPENDS run-reproduce) +- + # --- + + set (CPACK_SOURCE_GENERATOR "TGZ") blob - 62d2cd593cf00b2f29dee5383b05153c4e7d0dcf file + productivity/taskwarrior/pkg/PLIST --- productivity/taskwarrior/pkg/PLIST +++ productivity/taskwarrior/pkg/PLIST @@ -4,10 +4,13 @@ @man man/man5/task-color.5 @man man/man5/task-sync.5 @man man/man5/taskrc.5 -share/bash-completion/ -share/bash-completion/completions/ share/bash-completion/completions/task share/doc/taskwarrior/ +share/doc/taskwarrior/AUTHORS +share/doc/taskwarrior/COPYING +share/doc/taskwarrior/ChangeLog +share/doc/taskwarrior/INSTALL +share/doc/taskwarrior/LICENSE share/doc/taskwarrior/NEWS share/doc/taskwarrior/README.md share/doc/taskwarrior/rc/ @@ -36,8 +39,10 @@ share/doc/taskwarrior/rc/holidays.es-ES.rc share/doc/taskwarrior/rc/holidays.es-US.rc share/doc/taskwarrior/rc/holidays.fi-FI.rc share/doc/taskwarrior/rc/holidays.fr-BE.rc +share/doc/taskwarrior/rc/holidays.fr-CA.rc share/doc/taskwarrior/rc/holidays.fr-FR.rc share/doc/taskwarrior/rc/holidays.hr-HR.rc +share/doc/taskwarrior/rc/holidays.hu-HU.rc share/doc/taskwarrior/rc/holidays.is-IS.rc share/doc/taskwarrior/rc/holidays.it-IT.rc share/doc/taskwarrior/rc/holidays.nb-NO.rc @@ -45,8 +50,11 @@ share/doc/taskwarrior/rc/holidays.nl-BE.rc share/doc/taskwarrior/rc/holidays.nl-NL.rc share/doc/taskwarrior/rc/holidays.pl-PL.rc share/doc/taskwarrior/rc/holidays.por-PRT.rc +share/doc/taskwarrior/rc/holidays.pt-BR.rc share/doc/taskwarrior/rc/holidays.pt-PT.rc share/doc/taskwarrior/rc/holidays.ru-RU.rc +share/doc/taskwarrior/rc/holidays.sk-SK.rc +share/doc/taskwarrior/rc/holidays.sv-FI.rc share/doc/taskwarrior/rc/holidays.sv-SE.rc share/doc/taskwarrior/rc/holidays.tr-TR.rc share/doc/taskwarrior/rc/light-16.theme @@ -67,8 +75,6 @@ share/doc/taskwarrior/scripts/hooks/on-exit share/doc/taskwarrior/scripts/hooks/on-exit.shadow-file share/doc/taskwarrior/scripts/hooks/on-launch share/doc/taskwarrior/scripts/hooks/on-modify -share/doc/taskwarrior/scripts/zsh/ -share/doc/taskwarrior/scripts/zsh/_task share/doc/taskwarrior/task-ref.pdf share/fish/ share/fish/vendor_completions.d/ -- Paco Esteban. 0x5818130B8A6DBC03
