This diff updates taskwarrior to v2.5.1.  This is just a bugfix release
with no new features, but all of our patches were upstreamed and can go
away (yay!).

I've been running this for a week on amd64 without issue, and this diff
is ok MAINTAINER.  Ok?

Index: Makefile
===================================================================
RCS file: /work/cvsroot/ports/productivity/taskwarrior/Makefile,v
retrieving revision 1.19
diff -p -u -r1.19 Makefile
--- Makefile    23 Dec 2015 16:05:20 -0000      1.19
+++ Makefile    25 Feb 2016 18:09:23 -0000
@@ -2,7 +2,7 @@
 
 COMMENT =      command line todo list manager
 
-VERSION =      2.5.0
+VERSION =      2.5.1
 DISTNAME =     task-${VERSION}
 PKGNAME =      taskwarrior-${VERSION}
 CATEGORIES =   productivity
Index: distinfo
===================================================================
RCS file: /work/cvsroot/ports/productivity/taskwarrior/distinfo,v
retrieving revision 1.10
diff -p -u -r1.10 distinfo
--- distinfo    23 Dec 2015 16:05:20 -0000      1.10
+++ distinfo    25 Feb 2016 18:09:29 -0000
@@ -1,2 +1,2 @@
-SHA256 (task-2.5.0.tar.gz) = TY5nQVppkxCMEbju75m3apka8Rsih0rbt642fgkzRjY=
-SIZE (task-2.5.0.tar.gz) = 900285
+SHA256 (task-2.5.1.tar.gz) = 2HvO5YEG64p5uFDpq8FT2Yt54A1Q6t4NY5FxVJhPKhU=
+SIZE (task-2.5.1.tar.gz) = 903428
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt        21 May 2015 15:06:09 -0000      1.3
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.3 2015/05/21 15:06:09 czarkoff Exp $
---- CMakeLists.txt.orig        Tue May 19 18:41:21 2015
-+++ CMakeLists.txt     Tue May 19 18:41:23 2015
-@@ -124,10 +124,10 @@ check_struct_has_member ("struct tm" tm_gmtoff time.h 
- check_struct_has_member ("struct stat" st_birthtime "sys/types.h;sys/stat.h" 
HAVE_ST_BIRTHTIME)
- 
- message ("-- Looking for libuuid")
--if (DARWIN OR FREEBSD)
-+if (DARWIN OR FREEBSD OR OPENBSD)
-   # Apple and FreeBSD include the uuid functions in their libc, rather than 
libuuid
-   check_function_exists (uuid_unparse_lower HAVE_UUID_UNPARSE_LOWER)
--else (DARWIN OR FREEBSD)
-+else (DARWIN OR FREEBSD OR OPENBSD)
-   find_path    (UUID_INCLUDE_DIR   uuid/uuid.h)
-   find_library (UUID_LIBRARY NAMES uuid)
-   if (UUID_INCLUDE_DIR AND UUID_LIBRARY)
-@@ -140,7 +140,7 @@ else (DARWIN OR FREEBSD)
-   else (UUID_INCLUDE_DIR AND UUID_LIBRARY)
-     message (FATAL_ERROR "-- libuuid not found.")
-   endif (UUID_INCLUDE_DIR AND UUID_LIBRARY)
--endif (DARWIN OR FREEBSD)
-+endif (DARWIN OR FREEBSD OR OPENBSD)
- 
- if (HAVE_UUID_UNPARSE_LOWER)
-   message ("-- Found libuuid")
Index: patches/patch-src_util_cpp
===================================================================
RCS file: patches/patch-src_util_cpp
diff -N patches/patch-src_util_cpp
--- patches/patch-src_util_cpp  21 May 2015 15:06:09 -0000      1.3
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-src_util_cpp,v 1.3 2015/05/21 15:06:09 czarkoff Exp $
---- src/util.cpp.orig  Sun May 10 22:57:49 2015
-+++ src/util.cpp       Wed May 20 16:31:35 2015
-@@ -27,7 +27,7 @@
- #include <cmake.h>
- // If <iostream> is included, put it after <stdio.h>, because it includes
- // <stdio.h>, and therefore would ignore the _WITH_GETLINE.
--#ifdef FREEBSD
-+#if defined (FREEBSD) || defined (OPENBSD)
- #define _WITH_GETLINE
- #endif
- #include <stdio.h>
-@@ -185,7 +185,7 @@ int autoComplete (
- // representation is always lowercase anyway.
- // For the implementation details, refer to
- // http://svnweb.freebsd.org/base/head/sys/kern/kern_uuid.c
--#ifdef FREEBSD
-+#if defined (FREEBSD) || defined (OPENBSD)
- const std::string uuid ()
- {
-   uuid_t id;
Index: patches/patch-src_util_h
===================================================================
RCS file: patches/patch-src_util_h
diff -N patches/patch-src_util_h
--- patches/patch-src_util_h    21 May 2015 15:06:09 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_util_h,v 1.1 2015/05/21 15:06:09 czarkoff Exp $
---- src/util.h.orig    Tue May 19 23:36:56 2015
-+++ src/util.h Tue May 19 23:37:41 2015
-@@ -32,7 +32,7 @@
- #include <vector>
- #include <map>
- #include <sys/types.h>
--#ifdef FREEBSD
-+#if defined (FREEBSD) || defined (OPENBSD)
- #include <uuid.h>
- #else
- #include <uuid/uuid.h>
Index: pkg/PLIST
===================================================================
RCS file: /work/cvsroot/ports/productivity/taskwarrior/pkg/PLIST,v
retrieving revision 1.8
diff -p -u -r1.8 PLIST
--- pkg/PLIST   23 Dec 2015 16:05:22 -0000      1.8
+++ pkg/PLIST   25 Feb 2016 18:23:01 -0000
@@ -10,6 +10,7 @@ share/taskwarrior/AUTHORS
 @comment share/taskwarrior/COPYING
 @comment share/taskwarrior/ChangeLog
 @comment share/taskwarrior/INSTALL
+@comment share/taskwarrior/LICENSE
 @comment share/taskwarrior/NEWS
 share/taskwarrior/README.md
 share/taskwarrior/rc/
@@ -35,6 +36,7 @@ share/taskwarrior/rc/holidays.en-CA.rc
 share/taskwarrior/rc/holidays.en-GB.rc
 share/taskwarrior/rc/holidays.en-GL.rc
 share/taskwarrior/rc/holidays.en-HK.rc
+share/taskwarrior/rc/holidays.en-IN.rc
 share/taskwarrior/rc/holidays.en-NZ.rc
 share/taskwarrior/rc/holidays.en-US.rc
 share/taskwarrior/rc/holidays.en-ZA.rc

Reply via email to