p5-Sys-Utmp: update to 1.7.

Changes not documented.

6 files changed, 45 insertions, 113 deletions

diff --git a/sysutils/p5-Sys-Utmp/Makefile b/sysutils/p5-Sys-Utmp/Makefile
index 6dd28c50924..e79a483f523 100644
--- a/sysutils/p5-Sys-Utmp/Makefile
+++ b/sysutils/p5-Sys-Utmp/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.12 2017/06/05 14:24:37 ryoon Exp $
+# $NetBSD: Makefile,v 1.13 2017/09/28 04:45:11 wiz Exp $
 
-DISTNAME=	Sys-Utmp-1.6
+DISTNAME=	Sys-Utmp-1.7
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	9
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Sys/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/dist/Sys-Utmp
 COMMENT=	Object(ish) Interface to UTMP files
+LICENSE=	${PERL5_LICENSE}
 
 PERL5_PACKLIST=		auto/Sys/Utmp/.packlist
 
diff --git a/sysutils/p5-Sys-Utmp/distinfo b/sysutils/p5-Sys-Utmp/distinfo
index 4f6947b62e6..ea5cd4ba997 100644
--- a/sysutils/p5-Sys-Utmp/distinfo
+++ b/sysutils/p5-Sys-Utmp/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2015/11/04 01:32:25 agc Exp $
+$NetBSD: distinfo,v 1.5 2017/09/28 04:45:11 wiz Exp $
 
-SHA1 (Sys-Utmp-1.6.tar.gz) = 45548135e888d87f5c8f184b83048e04dadbfa5f
-RMD160 (Sys-Utmp-1.6.tar.gz) = fd3adb315ca2791e22054110127b85e3c54feacf
-SHA512 (Sys-Utmp-1.6.tar.gz) = 82124288f51947360c11bd944b754b22a21474352961cd522196cc3594302bcaa193a9350a9e8e152a6ddb12d105538da2dd9333c1ee2b46bbe19ed3cf3bd92c
-Size (Sys-Utmp-1.6.tar.gz) = 8818 bytes
-SHA1 (patch-aa) = fe8261da919ba380da862f47999f71fea6d9e983
-SHA1 (patch-ab) = 5a74869b9be0ecb97f8239a1ec7e65f8016e54e7
+SHA1 (Sys-Utmp-1.7.tar.gz) = 529fb6af2071a264142e1e4dad1ad2e31469530b
+RMD160 (Sys-Utmp-1.7.tar.gz) = 4dab0b8bdebb4f32cbad7d9caeeba8c2cb4e040f
+SHA512 (Sys-Utmp-1.7.tar.gz) = bf6180a452ad1d5a1d9c22ff5e2ed2048eec2bc311b741a47b09a07a0dc1e74ef2ce97d32189689790f3530b2211c66cf907ce227e4d8e4e51f4fff50b3076bb
+Size (Sys-Utmp-1.7.tar.gz) = 9169 bytes
+SHA1 (patch-Makefile.PL) = 3d29edb0431f1e997aeb0f21d0cd6ef988e8e363
+SHA1 (patch-Utmp.xs) = 3a173cf927b10e02a79d3c4fa94463f1e5bc7bf7
diff --git a/sysutils/p5-Sys-Utmp/patches/patch-Makefile.PL b/sysutils/p5-Sys-Utmp/patches/patch-Makefile.PL
new file mode 100644
index 00000000000..1877af86ea4
--- /dev/null
+++ b/sysutils/p5-Sys-Utmp/patches/patch-Makefile.PL
@@ -0,0 +1,16 @@
+$NetBSD: patch-Makefile.PL,v 1.1 2017/09/28 04:45:11 wiz Exp $
+
+Fix build on NetBSD.
+https://github.com/jonathanstowe/Sys-Utmp/issues/1
+
+--- Makefile.PL.orig	2013-10-27 08:58:56.000000000 +0000
++++ Makefile.PL
+@@ -8,7 +8,7 @@ my (
+ # This may require some refinement
+ if ( $^O =~ /netbsd/i )
+ {
+-    $defined = "";
++   $define = '-DNOUTFUNCS';
+ }
+ elsif ( $^O =~ /bsd/i )
+ {
diff --git a/sysutils/p5-Sys-Utmp/patches/patch-Utmp.xs b/sysutils/p5-Sys-Utmp/patches/patch-Utmp.xs
new file mode 100644
index 00000000000..896b673aeaf
--- /dev/null
+++ b/sysutils/p5-Sys-Utmp/patches/patch-Utmp.xs
@@ -0,0 +1,19 @@
+$NetBSD: patch-Utmp.xs,v 1.1 2017/09/28 04:45:11 wiz Exp $
+
+Fix build on NetBSD.
+https://github.com/jonathanstowe/Sys-Utmp/issues/1
+
+--- Utmp.xs.orig	2013-10-27 08:34:17.000000000 +0000
++++ Utmp.xs
+@@ -57,11 +57,6 @@ static int ut_fd = -1;
+ 
+ static char _ut_name[] = _PATH_UTMP;
+ 
+-void utmpname(char *filename)
+-{
+-   strcpy(_ut_name, filename);
+-}
+-
+ void setutent(void)
+ {
+     if (ut_fd < 0)
diff --git a/sysutils/p5-Sys-Utmp/patches/patch-aa b/sysutils/p5-Sys-Utmp/patches/patch-aa
deleted file mode 100644
index 94189589978..00000000000
--- a/sysutils/p5-Sys-Utmp/patches/patch-aa
+++ /dev/null
@@ -1,90 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2010/07/19 12:32:24 sno Exp $
-
---- Utmp.xs.orig	2006-10-13 14:10:30.000000000 +0000
-+++ Utmp.xs
-@@ -4,24 +4,24 @@
- 
- #include <utmp.h>
- 
--#ifdef NOUTFUNCS
-+#ifdef _AIX
-+#define _HAVE_UT_HOST	1
-+#endif
- 
--#include <stdlib.h>
--#include <unistd.h>
--#include <time.h>
--#include <string.h>
--#include <stdio.h>
--#include <sys/types.h>
--#include <sys/stat.h>
--#include <fcntl.h>
-+/*
-+    It is almost certain that if these are not defined the fields they are
-+    for are not present or this is BSD :)
-+*/
- 
- #ifdef BSD
- #define _NO_UT_ID
- #define _NO_UT_TYPE
- #define _NO_UT_PID
- #define ut_user ut_name
-+#define _HAVE_UT_HOST	1
- #endif
- 
-+
- /*
-    define these so it still works as documented :)
- */
-@@ -43,21 +43,15 @@
- #endif
- 
- 
--/*
--    It is almost certain that if these are not defined the fields they are
--    for are not present or this is BSD :)
--*/
--
--
--#ifndef UT_LINESIZE
--# define UT_LINESIZE 32
--#endif
--#ifndef UT_NAMESIZE
--# define UT_NAMESIZE 32
--#endif 
--#ifndef UT_HOSTSIZE
--# define UT_HOSTSIZE
--#endif
-+#ifdef NOUTFUNCS
-+#include <stdlib.h>
-+#include <unistd.h>
-+#include <time.h>
-+#include <string.h>
-+#include <stdio.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <fcntl.h>
- 
- static int ut_fd = -1;
- 
-@@ -207,7 +201,7 @@ SV *self
-      static SV *ut_ref;
-      static char *_ut_id;
-      static struct utmp *utent;
--     static char ut_host[UT_HOSTSIZE];
-+     static char ut_host[sizeof(utent->ut_host)];
- 
-      HV *self_hash;
- 
-@@ -249,9 +243,9 @@ SV *self
-        ut_tv = (IV)utent->ut_time;
- #endif
- #ifdef _HAVE_UT_HOST
--       strncpy(ut_host, utent->ut_host,UT_HOSTSIZE);
-+       strncpy(ut_host, utent->ut_host,sizeof(utent->ut_host));
- #else
--       strcpy(ut_host, "",1);
-+       strncpy(ut_host, "",1);
- #endif
- 
- 
diff --git a/sysutils/p5-Sys-Utmp/patches/patch-ab b/sysutils/p5-Sys-Utmp/patches/patch-ab
deleted file mode 100644
index bebf60526d3..00000000000
--- a/sysutils/p5-Sys-Utmp/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2010/07/19 12:32:24 sno Exp $
-
---- Makefile.PL.orig	2006-10-13 12:39:33.000000000 +0000
-+++ Makefile.PL
-@@ -5,7 +5,7 @@ my (
-     $libs
-    );
- 
--if ( $^O =~ /bsd/i )
-+if ( $^O =~ m/bsd/i && $^O ne 'netbsd' )
- {
-    $define = '-DNOUTFUNCS';
- }