CVS commit: pkgsrc/devel/libtai

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Mon Jun 26 01:06:08 UTC 2017

Modified Files:
        pkgsrc/devel/libtai: Makefile distinfo
        pkgsrc/devel/libtai/patches: patch-leapsecs__read.c
Added Files:
        pkgsrc/devel/libtai/patches: patch-leapsecs.3

Log Message:
Actually, this code is public-domain. Respect PKG_SYSCONFDIR.
Ride previous PKGREVISION bump.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/libtai/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/libtai/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/libtai/patches/patch-leapsecs.3
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/libtai/patches/patch-leapsecs__read.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/libtai/Makefile
diff -u pkgsrc/devel/libtai/Makefile:1.12 pkgsrc/devel/libtai/Makefile:1.13
--- pkgsrc/devel/libtai/Makefile:1.12   Mon Jun 26 00:45:54 2017
+++ pkgsrc/devel/libtai/Makefile        Mon Jun 26 01:06:07 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2017/06/26 00:45:54 schmonz Exp $
+# $NetBSD: Makefile,v 1.13 2017/06/26 01:06:07 schmonz Exp $
 #
 
 DISTNAME=              libtai-0.60
@@ -9,7 +9,7 @@ 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
+LICENSE=               public-domain
 
 CONFLICTS=             libowfat-[0-9]*
 
@@ -22,6 +22,11 @@ CONF_FILES+=         ${EGDIR}/leapsecs.dat ${PK
 
 SUBST_FILES.djbware+=  leapsecs_read.c
 
+SUBST_CLASSES+=                paths
+SUBST_STAGE.paths=     do-configure
+SUBST_FILES.paths=     leapsecs.3 leapsecs_read.c
+SUBST_SED.paths=       -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR:Q},g'
+
 INSTALLATION_DIRS=     bin include lib ${EGDIR}
 INSTALLATION_DIRS+=    ${PKGMANDIR}/man3
 

Index: pkgsrc/devel/libtai/distinfo
diff -u pkgsrc/devel/libtai/distinfo:1.6 pkgsrc/devel/libtai/distinfo:1.7
--- pkgsrc/devel/libtai/distinfo:1.6    Mon Jun 26 00:53:48 2017
+++ pkgsrc/devel/libtai/distinfo        Mon Jun 26 01:06:07 2017
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.6 2017/06/26 00:53:48 schmonz Exp $
+$NetBSD: distinfo,v 1.7 2017/06/26 01:06:07 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-leapsecs.3) = 537c8c8a03a89b0f8af8d2ecc539e60c7cf15560
 SHA1 (patch-leapsecs.txt) = 957c257bf41fcc50fb8ff7f975bcdbf1d07c6fd9
-SHA1 (patch-leapsecs__read.c) = 0539f385b689c7e7e7e46d734912361c11c276e6
+SHA1 (patch-leapsecs__read.c) = 064ba81ef40d9dd4bd18f9e1064ce2737517f45b

Index: pkgsrc/devel/libtai/patches/patch-leapsecs__read.c
diff -u pkgsrc/devel/libtai/patches/patch-leapsecs__read.c:1.1 pkgsrc/devel/libtai/patches/patch-leapsecs__read.c:1.2
--- pkgsrc/devel/libtai/patches/patch-leapsecs__read.c:1.1      Mon Jun 26 00:53:48 2017
+++ pkgsrc/devel/libtai/patches/patch-leapsecs__read.c  Mon Jun 26 01:06:08 2017
@@ -1,6 +1,7 @@
-$NetBSD: patch-leapsecs__read.c,v 1.1 2017/06/26 00:53:48 schmonz Exp $
+$NetBSD: patch-leapsecs__read.c,v 1.2 2017/06/26 01:06:08 schmonz Exp $
 
 #include <unistd.h> in leapsecs_read.c so we can read leapsecs.dat.
+Respect PKG_SYSCONFDIR.
 
 --- leapsecs_read.c.orig       1998-10-13 16:52:20.000000000 +0000
 +++ leapsecs_read.c
@@ -12,3 +13,12 @@ $NetBSD: patch-leapsecs__read.c,v 1.1 20
  extern int errno;
  #include "tai.h"
  #include "leapsecs.h"
+@@ -18,7 +19,7 @@ int leapsecs_read()
+   int i;
+   struct tai u;
+ 
+-  fd = open("/etc/leapsecs.dat",O_RDONLY | O_NDELAY);
++  fd = open("@PKG_SYSCONFDIR@/leapsecs.dat",O_RDONLY | O_NDELAY);
+   if (fd == -1) {
+     if (errno != ENOENT) return -1;
+     if (leapsecs) free(leapsecs);

Added files:

Index: pkgsrc/devel/libtai/patches/patch-leapsecs.3
diff -u /dev/null pkgsrc/devel/libtai/patches/patch-leapsecs.3:1.1
--- /dev/null   Mon Jun 26 01:06:08 2017
+++ pkgsrc/devel/libtai/patches/patch-leapsecs.3        Mon Jun 26 01:06:08 2017
@@ -0,0 +1,19 @@
+$NetBSD: patch-leapsecs.3,v 1.1 2017/06/26 01:06:08 schmonz Exp $
+
+Respect PKG_SYSCONFDIR.
+
+--- leapsecs.3.orig    1998-10-13 16:52:20.000000000 +0000
++++ leapsecs.3
+@@ -52,10 +52,10 @@ uses a leap-second table read from disk.
+ 
+ .B leapsecs_read
+ reads the leap-second table from
+-.BR /etc/leapsecs.dat .
++.BR @PKG_SYSCONFDIR@/leapsecs.dat .
+ It returns 0 on success, -1 on error.
+ If
+-.B /etc/leapsecs.dat
++.B @PKG_SYSCONFDIR@/leapsecs.dat
+ does not exist,
+ .B leapsecs_read
+ treats it as an empty file.