Mon Jun 2 02:14:10 2014 UTC ()
Fix perl5.20 build on some versions of OS X, NetBSD, OpenBSD. Patch
from <https://github.com/toddr/IO-Tty/pull/3/commits>.


(schmonz)
diff -r1.29 -r1.30 pkgsrc/devel/p5-IO-Tty/Makefile
diff -r1.10 -r1.11 pkgsrc/devel/p5-IO-Tty/distinfo
diff -r0 -r1.1 pkgsrc/devel/p5-IO-Tty/patches/patch-Tty.xs
cvs diff -r1.29 -r1.30 pkgsrc/devel/p5-IO-Tty/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/p5-IO-Tty/Makefile 2014/05/29 23:35:59 1.29
+++ pkgsrc/devel/p5-IO-Tty/Makefile 2014/06/02 02:14:10 1.30
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.29 2014/05/29 23:35:59 wiz Exp $ 1# $NetBSD: Makefile,v 1.30 2014/06/02 02:14:10 schmonz Exp $
2# 2#
3 3
4DISTNAME= IO-Tty-1.10 4DISTNAME= IO-Tty-1.11
5PKGNAME= p5-${DISTNAME:C/T/t/} 5PKGNAME= p5-${DISTNAME:C/T/t/}
6PKGREVISION= 4 
7SVR4_PKGNAME= p5itt 6SVR4_PKGNAME= p5itt
8CATEGORIES= devel perl5 7CATEGORIES= devel perl5
9MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=IO/} 8MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=IO/}
10 9
11MAINTAINER= rhaen@NetBSD.org 10MAINTAINER= rhaen@NetBSD.org
12COMMENT= Another Perl class for I/O on tty and pseudo-tty devices 11COMMENT= Another Perl class for I/O on tty and pseudo-tty devices
 12LICENSE= ${PERL5_LICENSE}
13 13
14PKG_INSTALLATION_TYPES= overwrite pkgviews 14PKG_INSTALLATION_TYPES= overwrite pkgviews
15 15
16PERL5_PACKLIST= auto/IO/Tty/.packlist 16PERL5_PACKLIST= auto/IO/Tty/.packlist
17 17
18.include "../../lang/perl5/module.mk" 18.include "../../lang/perl5/module.mk"
19.include "../../mk/bsd.pkg.mk" 19.include "../../mk/bsd.pkg.mk"
cvs diff -r1.10 -r1.11 pkgsrc/devel/p5-IO-Tty/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/p5-IO-Tty/distinfo 2010/12/17 18:20:18 1.10
+++ pkgsrc/devel/p5-IO-Tty/distinfo 2014/06/02 02:14:10 1.11
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.10 2010/12/17 18:20:18 rhaen Exp $ 1$NetBSD: distinfo,v 1.11 2014/06/02 02:14:10 schmonz Exp $
2 2
3SHA1 (IO-Tty-1.10.tar.gz) = 9eaad631cde8f49cc20757f4b1e81247ce67f333 3SHA1 (IO-Tty-1.11.tar.gz) = 0704a100ae87eae1837df8a872dcd202961af8ce
4RMD160 (IO-Tty-1.10.tar.gz) = 80a1efbf3936875f6de9210d772f8d532ca90d5b 4RMD160 (IO-Tty-1.11.tar.gz) = e9b2083d34cb5939adda9e355b96c1f8255e7c88
5Size (IO-Tty-1.10.tar.gz) = 23291 bytes 5Size (IO-Tty-1.11.tar.gz) = 24206 bytes
 6SHA1 (patch-Tty.xs) = a79de78989fc36af51c425b354b1355f462226f9
File Added: pkgsrc/devel/p5-IO-Tty/patches/Attic/patch-Tty.xs
$NetBSD: patch-Tty.xs,v 1.1 2014/06/02 02:14:10 schmonz Exp $

Fix perl5.20 build on some versions of OS X, NetBSD, OpenBSD.

From <https://github.com/toddr/IO-Tty/pull/3/commits>.

--- Tty.xs.orig	2012-01-14 06:34:50.000000000 +0000
+++ Tty.xs
@@ -58,7 +58,9 @@ typedef FILE * InOutStream;
 #endif /* HAVE_UTIL_H */
 
 #ifdef HAVE_UTIL_H
-# include <util.h>
+# if ((PATCHLEVEL < 19) && (SUBVERSION < 4))
+#  include <util.h>
+# endif
 #endif /* HAVE_UTIL_H */
 
 #ifdef HAVE_PTY_H