[pkgsrc/trunk]: pkgsrc/devel/libtai Remove patches that seem unnecessary with...

[schmonz <schmonz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3c6ca20b9d35
branches:  trunk
changeset: 364480:3c6ca20b9d35
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Mon Jun 26 00:45:54 2017 +0000

description:
Remove patches that seem unnecessary with present-day clang. Add patch
with new leap seconds since this software was written. Specify LICENSE
explicitly. Bump PKGREVISION.

diffstat:

 devel/libtai/Makefile                   |   7 +++++--
 devel/libtai/distinfo                   |   6 ++----
 devel/libtai/patches/patch-aa           |  28 ----------------------------
 devel/libtai/patches/patch-leapsecs.txt |  14 ++++++++++++++
 devel/libtai/patches/patch-trycpp_c     |  12 ------------
 devel/libtai/patches/patch-yearcal_c    |  15 ---------------
 6 files changed, 21 insertions(+), 61 deletions(-)

diffs (130 lines):

diff -r 0f4f118415f2 -r 3c6ca20b9d35 devel/libtai/Makefile
--- a/devel/libtai/Makefile     Sun Jun 25 23:24:04 2017 +0000
+++ b/devel/libtai/Makefile     Mon Jun 26 00:45:54 2017 +0000
@@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.11 2012/10/31 11:17:22 asau Exp $
+# $NetBSD: Makefile,v 1.12 2017/06/26 00:45:54 schmonz Exp $
 #
 
 DISTNAME=              libtai-0.60
-PKGREVISION=           4
+PKGREVISION=           5
 CATEGORIES=            devel
 MASTER_SITES=          http://cr.yp.to/libtai/
 
 MAINTAINER=            schmonz%NetBSD.org@localhost
 HOMEPAGE=              http://cr.yp.to/libtai.html
 COMMENT=               Library for storing and manipulating dates and times
+LICENSE=               djb-nonlicense
 
 CONFLICTS=             libowfat-[0-9]*
 
@@ -19,6 +20,8 @@
 EGDIR=                 share/examples/${PKGBASE}
 CONF_FILES+=           ${EGDIR}/leapsecs.dat ${PKG_SYSCONFDIR}/leapsecs.dat
 
+SUBST_FILES.djbware+=  leapsecs_read.c
+
 INSTALLATION_DIRS=     bin include lib ${EGDIR}
 INSTALLATION_DIRS+=    ${PKGMANDIR}/man3
 
diff -r 0f4f118415f2 -r 3c6ca20b9d35 devel/libtai/distinfo
--- a/devel/libtai/distinfo     Sun Jun 25 23:24:04 2017 +0000
+++ b/devel/libtai/distinfo     Mon Jun 26 00:45:54 2017 +0000
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.4 2015/11/03 03:27:45 agc Exp $
+$NetBSD: distinfo,v 1.5 2017/06/26 00:45:54 schmonz Exp $
 
 SHA1 (libtai-0.60.tar.gz) = f4682fb2a98dd7d434aa0cecd9254a58a0bfd9fb
 RMD160 (libtai-0.60.tar.gz) = 706111781e5e5bd7ae888e3cdc169d1d8d29de6f
 SHA512 (libtai-0.60.tar.gz) = e3e6e3e46f3cb869bcd661b0c87aa63116fb0c795078a4e194cffa7fd5425ae322af2c17e8ef37799dad7bac93a72b2e458e9dbd80d825857403060e71ad26b7
 Size (libtai-0.60.tar.gz) = 17300 bytes
-SHA1 (patch-aa) = cc47ecdcbb4ac5259bfc7a3b05ed6c9560cbba17
-SHA1 (patch-trycpp_c) = 1bb21fc210ea713b0729ff92b09b6bd9e56e90ac
-SHA1 (patch-yearcal_c) = 3935f1c00a2dacfb56f6eb0956c194e115d498dd
+SHA1 (patch-leapsecs.txt) = 957c257bf41fcc50fb8ff7f975bcdbf1d07c6fd9
diff -r 0f4f118415f2 -r 3c6ca20b9d35 devel/libtai/patches/patch-aa
--- a/devel/libtai/patches/patch-aa     Sun Jun 25 23:24:04 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2011/08/01 05:37:12 dholland Exp $
-
-Use malloc correctly.
-Don't declare own errno.
-Needs unistd.h.
-
---- leapsecs_read.c.orig       1998-10-13 16:52:20.000000000 +0000
-+++ leapsecs_read.c
-@@ -2,7 +2,9 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <errno.h>
--extern int errno;
-+#include <stdlib.h>
-+#include <unistd.h>
-+
- #include "tai.h"
- #include "leapsecs.h"
- 
-@@ -29,7 +31,7 @@ int leapsecs_read()
- 
-   if (fstat(fd,&st) == -1) { close(fd); return -1; }
- 
--  t = (struct tai *) malloc(st.st_size);
-+  t = malloc(st.st_size);
-   if (!t) { close(fd); return -1; }
- 
-   n = read(fd,(char *) t,st.st_size);
diff -r 0f4f118415f2 -r 3c6ca20b9d35 devel/libtai/patches/patch-leapsecs.txt
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/libtai/patches/patch-leapsecs.txt   Mon Jun 26 00:45:54 2017 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-leapsecs.txt,v 1.1 2017/06/26 00:45:54 schmonz Exp $
+
+Add leap seconds since this software was written.
+
+--- leapsecs.txt.orig  1998-10-13 16:52:20.000000000 +0000
++++ leapsecs.txt
+@@ -35,3 +35,7 @@
+ +1995-12-31
+ +1997-06-30
+ +1998-12-31
+++2005-12-31
+++2008-12-31
+++2012-06-30
+++2015-06-30
diff -r 0f4f118415f2 -r 3c6ca20b9d35 devel/libtai/patches/patch-trycpp_c
--- a/devel/libtai/patches/patch-trycpp_c       Sun Jun 25 23:24:04 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-trycpp_c,v 1.1 2011/08/01 05:37:12 dholland Exp $
-
-Fix illegal C.
-
---- trycpp.c~  1998-10-13 16:52:20.000000000 +0000
-+++ trycpp.c
-@@ -1,4 +1,4 @@
--void main()
-+int main()
- {
- #ifdef NeXT
-   printf("nextstep\n"); exit(0);
diff -r 0f4f118415f2 -r 3c6ca20b9d35 devel/libtai/patches/patch-yearcal_c
--- a/devel/libtai/patches/patch-yearcal_c      Sun Jun 25 23:24:04 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-yearcal_c,v 1.1 2011/08/01 05:37:12 dholland Exp $
-
-Fix illegal C.
-
---- yearcal.c~ 1998-10-13 16:52:20.000000000 +0000
-+++ yearcal.c
-@@ -16,7 +16,7 @@ char *montab[] = {
- , "December"
- } ;
- 
--void main(argc,argv)
-+int main(argc,argv)
- int argc;
- char **argv;
- {