diff --git a/productivity/taskwarrior/Makefile b/productivity/taskwarrior/Makefile index 944fea38d58..e49863da5d6 100644 --- a/productivity/taskwarrior/Makefile +++ b/productivity/taskwarrior/Makefile @@ -1,11 +1,10 @@ -# $OpenBSD: Makefile,v 1.2 2011/06/04 12:10:43 kili Exp $ +# $OpenBSD: Makefile,v 1.3 2012/05/11 09:44:13 jasper Exp $ COMMENT = command line todo list manager -VERSION = 1.9.4 +VERSION = 2.0.0 DISTNAME = task-${VERSION} PKGNAME = taskwarrior-${VERSION} -REVISION = 0 CATEGORIES = productivity HOMEPAGE = http://www.taskwarrior.org/ @@ -32,7 +31,9 @@ CONFIGURE_ARGS += -DTASK_DOCDIR=share/taskwarrior \ -DTASK_MAN5DIR=man/man5 CONFIGURE_ENV += CFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -le2fs-uuid" + LDFLAGS="-L${LOCALBASE}/lib" + +NO_REGRESS = Yes pre-configure: @perl -pi -e 's|share/doc/task/|share/taskwarrior/|g' \ diff --git a/productivity/taskwarrior/distinfo b/productivity/taskwarrior/distinfo index 2b47f09f013..5a6859220d6 100644 --- a/productivity/taskwarrior/distinfo +++ b/productivity/taskwarrior/distinfo @@ -1,5 +1,5 @@ -MD5 (task-1.9.4.tar.gz) = DF2d7bHq1pWQr4ldFnCAcA== -RMD160 (task-1.9.4.tar.gz) = Txe/0I2U/CycLadKL+CnMi0VYj0= -SHA1 (task-1.9.4.tar.gz) = ubriVfT6A5cOztOsCHaTUnHR16E= -SHA256 (task-1.9.4.tar.gz) = ECBiHJv4hcMhalwRysztPJFrZJXg0JhGt0OKFSYY00o= -SIZE (task-1.9.4.tar.gz) = 479079 +MD5 (task-2.0.0.tar.gz) = uFC0n4tpu0BJwH0JFKD3rw== +RMD160 (task-2.0.0.tar.gz) = naAiX+wjRbH/0Fw9ENjl5Y0lvSc= +SHA1 (task-2.0.0.tar.gz) = 3FhzY/vcHcrH9+B7G8z9H7VrJDU= +SHA256 (task-2.0.0.tar.gz) = eJceNmwjld4cxLDE/EHdlQwwnTvC9ulZS0xYIa1ndb0= +SIZE (task-2.0.0.tar.gz) = 4474676 diff --git a/productivity/taskwarrior/patches/patch-CMakeLists_txt b/productivity/taskwarrior/patches/patch-CMakeLists_txt new file mode 100644 index 00000000000..7b81eabbb17 --- /dev/null +++ b/productivity/taskwarrior/patches/patch-CMakeLists_txt @@ -0,0 +1,15 @@ +$OpenBSD: patch-CMakeLists_txt,v 1.1 2012/05/11 09:44:14 jasper Exp $ + +Make sure the correct uuid (from e2fsprogs) is used. + +--- CMakeLists.txt.orig Fri May 11 11:40:38 2012 ++++ CMakeLists.txt Fri May 11 11:40:41 2012 +@@ -73,7 +73,7 @@ if (DARWIN) + check_function_exists (uuid_unparse_lower HAVE_UUID_UNPARSE_LOWER) + else (DARWIN) + find_path (UUID_INCLUDE_DIR uuid/uuid.h) +- find_library (UUID_LIBRARY NAMES uuid) ++ find_library (UUID_LIBRARY NAMES e2fs-uuid) + if (UUID_INCLUDE_DIR AND UUID_LIBRARY) + set (HAVE_UUID true) + set (TASK_INCLUDE_DIRS ${TASK_INCLUDE_DIRS} ${UUID_INCLUDE_DIR}) diff --git a/productivity/taskwarrior/patches/patch-src_CMakeLists_txt b/productivity/taskwarrior/patches/patch-src_CMakeLists_txt index e5a9c597838..6b28ef5f309 100644 --- a/productivity/taskwarrior/patches/patch-src_CMakeLists_txt +++ b/productivity/taskwarrior/patches/patch-src_CMakeLists_txt @@ -1,11 +1,13 @@ -$OpenBSD: patch-src_CMakeLists_txt,v 1.1.1.1 2011/06/03 21:07:10 kili Exp $ ---- src/CMakeLists.txt.orig Fri Mar 4 00:09:59 2011 -+++ src/CMakeLists.txt Fri Jun 3 20:13:44 2011 -@@ -25,7 +25,3 @@ target_link_libraries (task_executable task ${TASK_LIB - set_property (TARGET task_executable PROPERTY OUTPUT_NAME "task") +$OpenBSD: patch-src_CMakeLists_txt,v 1.2 2012/05/11 09:44:14 jasper Exp $ +--- src/CMakeLists.txt.orig Fri May 11 11:21:15 2012 ++++ src/CMakeLists.txt Fri May 11 11:22:13 2012 +@@ -55,9 +55,6 @@ set_property (TARGET task_executable PROPERTY OUTPUT_N install (TARGETS task_executable DESTINATION ${TASK_BINDIR}) -- + -set (CMAKE_BUILD_TYPE debug) --set (CMAKE_C_FLAGS_DEBUG "-ggdb3") --set (CMAKE_C_FLAGS_RELEASE "-O3") +-set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -Wall") +-set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -Wall") + + #SET(CMAKE_BUILD_TYPE gcov) + #SET(CMAKE_CXX_FLAGS_GCOV "--coverage") diff --git a/productivity/taskwarrior/patches/patch-src_Transport_cpp b/productivity/taskwarrior/patches/patch-src_Transport_cpp deleted file mode 100644 index d79ee8c3416..00000000000 --- a/productivity/taskwarrior/patches/patch-src_Transport_cpp +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_Transport_cpp,v 1.1 2011/06/04 12:10:43 kili Exp $ ---- src/Transport.cpp.orig Fri Mar 4 00:10:00 2011 -+++ src/Transport.cpp Sat Jun 4 13:58:13 2011 -@@ -78,7 +78,7 @@ int Transport::execute() - if (child_pid == 0) - { - // this is done by the child process -- char shell[] = "bash"; -+ char shell[] = "sh"; - char opt[] = "-c"; - - std::string cmdline = executable; diff --git a/productivity/taskwarrior/pkg/PLIST b/productivity/taskwarrior/pkg/PLIST index 6803e9e87bc..5889a0a124d 100644 --- a/productivity/taskwarrior/pkg/PLIST +++ b/productivity/taskwarrior/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2011/06/03 21:07:10 kili Exp $ +@comment $OpenBSD: PLIST,v 1.2 2012/05/11 09:44:14 jasper Exp $ @bin bin/task @man man/man1/task.1 @man man/man5/task-color.5 @@ -14,14 +14,10 @@ share/taskwarrior/AUTHORS @comment share/taskwarrior/NEWS @comment share/taskwarrior/README share/taskwarrior/i18n/ -share/taskwarrior/i18n/strings.de-DE -share/taskwarrior/i18n/strings.en-US -share/taskwarrior/i18n/strings.es-ES -share/taskwarrior/i18n/strings.fr-FR -share/taskwarrior/i18n/strings.nl-NL -share/taskwarrior/i18n/strings.sv-SE share/taskwarrior/i18n/tips.de-DE share/taskwarrior/i18n/tips.en-US +share/taskwarrior/i18n/tips.it-IT +share/taskwarrior/i18n/tips.ja-JP share/taskwarrior/i18n/tips.sv-SE share/taskwarrior/rc/ share/taskwarrior/rc/dark-16.theme @@ -32,31 +28,50 @@ share/taskwarrior/rc/dark-green-256.theme share/taskwarrior/rc/dark-red-256.theme share/taskwarrior/rc/dark-violets-256.theme share/taskwarrior/rc/dark-yellow-green.theme -share/taskwarrior/rc/holidays-AT.rc -share/taskwarrior/rc/holidays-CA.rc -share/taskwarrior/rc/holidays-DE.rc -share/taskwarrior/rc/holidays-DK.rc -share/taskwarrior/rc/holidays-ES.rc -share/taskwarrior/rc/holidays-FR.rc -share/taskwarrior/rc/holidays-IT.rc -share/taskwarrior/rc/holidays-NL.rc -share/taskwarrior/rc/holidays-NO.rc -share/taskwarrior/rc/holidays-NZ.rc -share/taskwarrior/rc/holidays-SE.rc -share/taskwarrior/rc/holidays-UK.rc -share/taskwarrior/rc/holidays-US.rc +share/taskwarrior/rc/holidays.be-BY.rc +share/taskwarrior/rc/holidays.cs-CZ.rc +share/taskwarrior/rc/holidays.da-DK.rc +share/taskwarrior/rc/holidays.de-AT.rc +share/taskwarrior/rc/holidays.de-DE.rc +share/taskwarrior/rc/holidays.en-CA.rc +share/taskwarrior/rc/holidays.en-GB.rc +share/taskwarrior/rc/holidays.en-NZ.rc +share/taskwarrior/rc/holidays.en-US.rc +share/taskwarrior/rc/holidays.es-ES.rc +share/taskwarrior/rc/holidays.fr-FR.rc +share/taskwarrior/rc/holidays.it-IT.rc +share/taskwarrior/rc/holidays.jp-JP.rc +share/taskwarrior/rc/holidays.nb-NO.rc +share/taskwarrior/rc/holidays.nl-NL.rc +share/taskwarrior/rc/holidays.sv-SE.rc share/taskwarrior/rc/light-16.theme share/taskwarrior/rc/light-256.theme +share/taskwarrior/rc/refresh +share/taskwarrior/rc/solarized-dark-256.theme +share/taskwarrior/rc/solarized-light-256.theme share/taskwarrior/scripts/ share/taskwarrior/scripts/add-ons/ share/taskwarrior/scripts/add-ons/export-csv.pl +share/taskwarrior/scripts/add-ons/export-html.pl share/taskwarrior/scripts/add-ons/export-ical.pl +share/taskwarrior/scripts/add-ons/export-sql.py share/taskwarrior/scripts/add-ons/export-xml.pl share/taskwarrior/scripts/add-ons/export-xml.py share/taskwarrior/scripts/add-ons/export-xml.rb +share/taskwarrior/scripts/add-ons/export-yad.pl share/taskwarrior/scripts/add-ons/export-yaml.pl +share/taskwarrior/scripts/add-ons/import-todo.sh.pl +share/taskwarrior/scripts/add-ons/import-yaml.pl +share/taskwarrior/scripts/add-ons/update-holidays.pl share/taskwarrior/scripts/bash/ share/taskwarrior/scripts/bash/task_completion.sh +share/taskwarrior/scripts/extensions/ +share/taskwarrior/scripts/extensions/command.lua +share/taskwarrior/scripts/extensions/dom.lua +share/taskwarrior/scripts/extensions/format.lua +share/taskwarrior/scripts/extensions/program_hook.lua +share/taskwarrior/scripts/extensions/task_hook.lua +share/taskwarrior/scripts/extensions/uda.lua share/taskwarrior/scripts/fish/ share/taskwarrior/scripts/fish/task.fish share/taskwarrior/scripts/vim/ @@ -69,3 +84,4 @@ share/taskwarrior/scripts/vim/syntax/taskedit.vim share/taskwarrior/scripts/vim/syntax/taskrc.vim share/taskwarrior/scripts/zsh/ share/taskwarrior/scripts/zsh/_task +share/taskwarrior/task-ref.pdf