Updating sysutils/p5-Sys-Utmp from 1.6 to 1.6nb1 to remark some fixes:

- Fix Utmp.xs to compile on NetBSD (fixes PR pkg/42082)
- Apply patch from RT#52369 (FreeBSD 7.2: compilation error and host support)
  see https://rt.cpan.org/Ticket/Display.html?id=52369

4 files changed, 60 insertions, 23 deletions

diff --git a/sysutils/p5-Sys-Utmp/Makefile b/sysutils/p5-Sys-Utmp/Makefile
index 19ced35a8a0..5f69049fa60 100644
--- a/sysutils/p5-Sys-Utmp/Makefile
+++ b/sysutils/p5-Sys-Utmp/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/03/22 21:17:03 sno Exp $
+# $NetBSD: Makefile,v 1.2 2010/07/19 12:32:24 sno Exp $
 
 DISTNAME=	Sys-Utmp-1.6
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Sys/}
 
diff --git a/sysutils/p5-Sys-Utmp/distinfo b/sysutils/p5-Sys-Utmp/distinfo
index 77969a171c9..541b866f832 100644
--- a/sysutils/p5-Sys-Utmp/distinfo
+++ b/sysutils/p5-Sys-Utmp/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/03/22 21:17:03 sno Exp $
+$NetBSD: distinfo,v 1.2 2010/07/19 12:32:24 sno Exp $
 
 SHA1 (Sys-Utmp-1.6.tar.gz) = 45548135e888d87f5c8f184b83048e04dadbfa5f
 RMD160 (Sys-Utmp-1.6.tar.gz) = fd3adb315ca2791e22054110127b85e3c54feacf
 Size (Sys-Utmp-1.6.tar.gz) = 8818 bytes
-SHA1 (patch-aa) = 47c20eac627a092f6eed64c0a3061df0a8da7a40
+SHA1 (patch-aa) = 2725e6929ae1c5424c6db284df93dbb402f83592
+SHA1 (patch-ab) = 5a74869b9be0ecb97f8239a1ec7e65f8016e54e7
diff --git a/sysutils/p5-Sys-Utmp/patches/patch-aa b/sysutils/p5-Sys-Utmp/patches/patch-aa
index c06cc53833f..94189589978 100644
--- a/sysutils/p5-Sys-Utmp/patches/patch-aa
+++ b/sysutils/p5-Sys-Utmp/patches/patch-aa
@@ -1,6 +1,8 @@
---- Utmp.xs.orig	2006-10-13 16:10:30.000000000 +0200
-+++ Utmp.xs	2009-02-13 13:45:12.000000000 +0100
-@@ -4,8 +4,11 @@
+$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>
  
@@ -9,29 +11,41 @@
 +#define _HAVE_UT_HOST	1
 +#endif
  
-+#ifdef NOUTFUNCS
- #include <stdlib.h>
- #include <unistd.h>
- #include <time.h>
-@@ -15,6 +18,7 @@
- #include <sys/stat.h>
- #include <fcntl.h>
+-#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
-@@ -42,23 +46,12 @@
- #define ACCOUNTING      9
+ #define _NO_UT_PID
+ #define ut_user ut_name
++#define _HAVE_UT_HOST	1
  #endif
  
--
++
  /*
-     It is almost certain that if these are not defined the fields they are
-     for are not present or this is BSD :)
+    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
@@ -41,11 +55,19 @@
 -#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;
  
- static char _ut_name[] = _PATH_UTMP;
-@@ -207,7 +200,7 @@
+@@ -207,7 +201,7 @@ SV *self
       static SV *ut_ref;
       static char *_ut_id;
       static struct utmp *utent;
@@ -54,7 +76,7 @@
  
       HV *self_hash;
  
-@@ -249,9 +242,9 @@
+@@ -249,9 +243,9 @@ SV *self
         ut_tv = (IV)utent->ut_time;
  #endif
  #ifdef _HAVE_UT_HOST
diff --git a/sysutils/p5-Sys-Utmp/patches/patch-ab b/sysutils/p5-Sys-Utmp/patches/patch-ab
new file mode 100644
index 00000000000..bebf60526d3
--- /dev/null
+++ b/sysutils/p5-Sys-Utmp/patches/patch-ab
@@ -0,0 +1,13 @@
+$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';
+ }