[pkgsrc/trunk]: pkgsrc/devel/libowfat Install a few manpages to alternate nam...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3009773b38df
branches:  trunk
changeset: 336520:3009773b38df
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Tue Jul 16 21:39:11 2019 +0000

description:
Install a few manpages to alternate names to avoid conflicting with libtai.

diffstat:

 devel/libowfat/Makefile                                  |  12 ++++++++--
 devel/libowfat/PLIST                                     |  10 ++++----
 devel/libowfat/distinfo                                  |   6 ++++-
 devel/libowfat/patches/patch-tai_tai__now__libowfat.3    |  18 ++++++++++++++++
 devel/libowfat/patches/patch-tai_tai__pack__libowfat.3   |  18 ++++++++++++++++
 devel/libowfat/patches/patch-taia_taia__now__libowfat.3  |  18 ++++++++++++++++
 devel/libowfat/patches/patch-taia_taia__pack__libowfat.3 |  18 ++++++++++++++++
 7 files changed, 91 insertions(+), 9 deletions(-)

diffs (166 lines):

diff -r 101024d2e7c4 -r 3009773b38df devel/libowfat/Makefile
--- a/devel/libowfat/Makefile   Tue Jul 16 21:38:15 2019 +0000
+++ b/devel/libowfat/Makefile   Tue Jul 16 21:39:11 2019 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2018/10/07 12:13:46 schmonz Exp $
+# $NetBSD: Makefile,v 1.8 2019/07/16 21:39:11 schmonz Exp $
 #
 
 DISTNAME=      libowfat-0.32
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ${HOMEPAGE}
 EXTRACT_SUFX=  .tar.xz
@@ -11,9 +12,14 @@
 COMMENT=       Library of general purpose APIs
 LICENSE=       gnu-gpl-v2
 
-CONFLICTS=     libtai-[0-9]*
-
 MAKE_FILE=     GNUmakefile
 USE_TOOLS+=    gmake
 
+post-extract:
+       cd ${WRKSRC}; \
+       ${MV} tai/tai_now.3 tai/tai_now_libowfat.3; \
+       ${MV} tai/tai_pack.3 tai/tai_pack_libowfat.3; \
+       ${MV} taia/taia_now.3 taia/taia_now_libowfat.3; \
+       ${MV} taia/taia_pack.3 taia/taia_pack_libowfat.3
+
 .include "../../mk/bsd.pkg.mk"
diff -r 101024d2e7c4 -r 3009773b38df devel/libowfat/PLIST
--- a/devel/libowfat/PLIST      Tue Jul 16 21:38:15 2019 +0000
+++ b/devel/libowfat/PLIST      Tue Jul 16 21:39:11 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2018/10/07 12:13:46 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.6 2019/07/16 21:39:11 schmonz Exp $
 include/libowfat/array.h
 include/libowfat/buffer.h
 include/libowfat/byte.h
@@ -379,8 +379,8 @@
 man/man3/tai_add.3
 man/man3/tai_approx.3
 man/man3/tai_less.3
-man/man3/tai_now.3
-man/man3/tai_pack.3
+man/man3/tai_now_libowfat.3
+man/man3/tai_pack_libowfat.3
 man/man3/tai_sub.3
 man/man3/tai_unpack.3
 man/man3/taia_add.3
@@ -388,8 +388,8 @@
 man/man3/taia_approx.3
 man/man3/taia_frac.3
 man/man3/taia_less.3
-man/man3/taia_now.3
-man/man3/taia_pack.3
+man/man3/taia_now_libowfat.3
+man/man3/taia_pack_libowfat.3
 man/man3/taia_sub.3
 man/man3/taia_tai.3
 man/man3/taia_uint.3
diff -r 101024d2e7c4 -r 3009773b38df devel/libowfat/distinfo
--- a/devel/libowfat/distinfo   Tue Jul 16 21:38:15 2019 +0000
+++ b/devel/libowfat/distinfo   Tue Jul 16 21:39:11 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2018/10/07 12:13:46 schmonz Exp $
+$NetBSD: distinfo,v 1.7 2019/07/16 21:39:11 schmonz Exp $
 
 SHA1 (libowfat-0.32.tar.xz) = 7b66caa576e9ce2d789e230a5a42c63e4f103471
 RMD160 (libowfat-0.32.tar.xz) = 2338a3f31d55c3f6a97c3073664e6aeec198f28c
@@ -6,3 +6,7 @@
 Size (libowfat-0.32.tar.xz) = 195820 bytes
 SHA1 (patch-aa) = 5f7cbfd30e151957b18439bb3bacabe17c292d47
 SHA1 (patch-io_iom__wait.c) = a458e96b0b2cf27c92e8aafc8ea6d5199b389baf
+SHA1 (patch-tai_tai__now__libowfat.3) = cd51600b7c0da29ccca3c649039f8fe07f7276c9
+SHA1 (patch-tai_tai__pack__libowfat.3) = 8dd463a76d289773827793538373a7a029617a0a
+SHA1 (patch-taia_taia__now__libowfat.3) = 0d9aa54facfc7b26d952a952a431c65b62db95ed
+SHA1 (patch-taia_taia__pack__libowfat.3) = 8298df8d3101a2567ba4933f09b789efe0c2bb7b
diff -r 101024d2e7c4 -r 3009773b38df devel/libowfat/patches/patch-tai_tai__now__libowfat.3
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/libowfat/patches/patch-tai_tai__now__libowfat.3     Tue Jul 16 21:39:11 2019 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-tai_tai__now__libowfat.3,v 1.1 2019/07/16 21:39:11 schmonz Exp $
+
+Avoid conflict with libtai's manpages.
+
+--- tai/tai_now_libowfat.3.orig        2017-05-13 22:51:52.000000000 +0000
++++ tai/tai_now_libowfat.3
+@@ -1,4 +1,4 @@
+-.TH tai_now 3
++.TH tai_now_libowfat 3
+ .SH NAME
+ tai_now \- get current time
+ .SH SYNTAX
+@@ -15,4 +15,4 @@ time function represents the number of T
+ 00:00:10 TAI. This matches the convention used by the Olson tz library
+ in ``right'' mode.
+ .SH "SEE ALSO"
+-taia_now(3)
++taia_now_libowfat(3)
diff -r 101024d2e7c4 -r 3009773b38df devel/libowfat/patches/patch-tai_tai__pack__libowfat.3
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/libowfat/patches/patch-tai_tai__pack__libowfat.3    Tue Jul 16 21:39:11 2019 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-tai_tai__pack__libowfat.3,v 1.1 2019/07/16 21:39:11 schmonz Exp $
+
+Avoid conflict with libtai's manpages.
+
+--- tai/tai_pack_libowfat.3.orig       2017-05-13 22:51:52.000000000 +0000
++++ tai/tai_pack_libowfat.3
+@@ -1,4 +1,4 @@
+-.TH tai_pack 3
++.TH tai_pack_libowfat 3
+ .SH NAME
+ tai_pack \- convert to external TAI64 format
+ .SH SYNTAX
+@@ -11,4 +11,4 @@ TAI64 format in \fIbuf\fR.
+ 
+ See http://cr.yp.to/libtai/tai64.html
+ .SH "SEE ALSO"
+-taia_pack(3), tai_unpack(3)
++taia_pack_libowfat(3), tai_unpack(3)
diff -r 101024d2e7c4 -r 3009773b38df devel/libowfat/patches/patch-taia_taia__now__libowfat.3
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/libowfat/patches/patch-taia_taia__now__libowfat.3   Tue Jul 16 21:39:11 2019 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-taia_taia__now__libowfat.3,v 1.1 2019/07/16 21:39:11 schmonz Exp $
+
+Avoid conflict with libtai's manpages.
+
+--- taia/taia_now_libowfat.3.orig      2017-05-13 22:51:53.000000000 +0000
++++ taia/taia_now_libowfat.3
+@@ -1,4 +1,4 @@
+-.TH taia_now 3
++.TH taia_now_libowfat 3
+ .SH NAME
+ taia_now \- get current time
+ .SH SYNTAX
+@@ -19,4 +19,4 @@ Beware that many clocks are not set accu
+ scientific clocks are nowhere near 1-attosecond accuracy; however, an
+ inaccurate clock may still produce reasonably accurate time differences.
+ .SH "SEE ALSO"
+-tai_now(3)
++tai_now_libowfat(3)
diff -r 101024d2e7c4 -r 3009773b38df devel/libowfat/patches/patch-taia_taia__pack__libowfat.3
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/libowfat/patches/patch-taia_taia__pack__libowfat.3  Tue Jul 16 21:39:11 2019 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-taia_taia__pack__libowfat.3,v 1.1 2019/07/16 21:39:11 schmonz Exp $
+
+Avoid conflict with libtai's manpages.
+
+--- taia/taia_pack_libowfat.3.orig     2017-05-13 22:51:53.000000000 +0000
++++ taia/taia_pack_libowfat.3
+@@ -1,4 +1,4 @@
+-.TH taia_pack 3
++.TH taia_pack_libowfat 3
+ .SH NAME
+ taia_pack \- convert to external TAI64NA format
+ .SH SYNTAX
+@@ -11,4 +11,4 @@ TAI64NA format in \fIbuf\fR.
+ 
+ See http://cr.yp.to/libtai/tai64.html
+ .SH "SEE ALSO"
+-tai_pack(3), taia_unpack(3)
++tai_pack_libowfat(3), taia_unpack(3)