Thu Aug 29 19:45:07 2019 UTC ()
Don't try to detect TERMCAP_LIB, let BROKEN_READLINE_DETECTION tell
us. Fixes at least Ubuntu builds. Tested on Ubuntu 16, NetBSD 8,
macOS 10.14.


(schmonz)
diff -r1.52 -r1.53 pkgsrc/devel/p5-Term-ReadLine/Makefile
diff -r1.21 -r1.22 pkgsrc/devel/p5-Term-ReadLine/distinfo
diff -r0 -r1.1 pkgsrc/devel/p5-Term-ReadLine/patches/patch-Makefile.PL
cvs diff -r1.52 -r1.53 pkgsrc/devel/p5-Term-ReadLine/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/p5-Term-ReadLine/Attic/Makefile 2019/08/11 13:20:25 1.52
+++ pkgsrc/devel/p5-Term-ReadLine/Attic/Makefile 2019/08/29 19:45:07 1.53
@@ -1,24 +1,26 @@ @@ -1,24 +1,26 @@
1# $NetBSD: Makefile,v 1.52 2019/08/11 13:20:25 wiz Exp $ 1# $NetBSD: Makefile,v 1.53 2019/08/29 19:45:07 schmonz Exp $
2 2
3DISTNAME= Term-ReadLine-Gnu-1.36 3DISTNAME= Term-ReadLine-Gnu-1.36
4PKGNAME= p5-${DISTNAME:S/-Gnu//} 4PKGNAME= p5-${DISTNAME:S/-Gnu//}
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= devel perl5 6CATEGORIES= devel perl5
7MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Term/} 7MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Term/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://metacpan.org/release/Term-ReadLine-Gnu 10HOMEPAGE= https://metacpan.org/release/Term-ReadLine-Gnu
11COMMENT= Interface to the GNU Readline Library 11COMMENT= Interface to the GNU Readline Library
12LICENSE= ${PERL5_LICENSE} # see README 12LICENSE= ${PERL5_LICENSE} # see README
13 13
14PERL5_PACKLIST= auto/Term/ReadLine/Gnu/.packlist 14PERL5_PACKLIST= auto/Term/ReadLine/Gnu/.packlist
15 15
16MAKE_PARAMS+= --prefix=${BUILDLINK_PREFIX.readline} 16MAKE_PARAMS+= --prefix=${BUILDLINK_PREFIX.readline}
17 17
18WRKSRC= ${WRKDIR}/${DISTNAME:C/a$//} 18WRKSRC= ${WRKDIR}/${DISTNAME:C/a$//}
19 19
 20BROKEN_READLINE_DETECTION= yes
 21
20REPLACE_PERL+= Gnu/XS.pm 22REPLACE_PERL+= Gnu/XS.pm
21 23
22.include "../../devel/readline/buildlink3.mk" 24.include "../../devel/readline/buildlink3.mk"
23.include "../../lang/perl5/module.mk" 25.include "../../lang/perl5/module.mk"
24.include "../../mk/bsd.pkg.mk" 26.include "../../mk/bsd.pkg.mk"
cvs diff -r1.21 -r1.22 pkgsrc/devel/p5-Term-ReadLine/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/p5-Term-ReadLine/Attic/distinfo 2019/01/26 07:42:00 1.21
+++ pkgsrc/devel/p5-Term-ReadLine/Attic/distinfo 2019/08/29 19:45:07 1.22
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.21 2019/01/26 07:42:00 wen Exp $ 1$NetBSD: distinfo,v 1.22 2019/08/29 19:45:07 schmonz Exp $
2 2
3SHA1 (Term-ReadLine-Gnu-1.36.tar.gz) = 1c79b6b2f9b1256313b5bf262682e42ecf9d13ea 3SHA1 (Term-ReadLine-Gnu-1.36.tar.gz) = 1c79b6b2f9b1256313b5bf262682e42ecf9d13ea
4RMD160 (Term-ReadLine-Gnu-1.36.tar.gz) = 4f7b090100a108e22f763931f334ff6911640c98 4RMD160 (Term-ReadLine-Gnu-1.36.tar.gz) = 4f7b090100a108e22f763931f334ff6911640c98
5SHA512 (Term-ReadLine-Gnu-1.36.tar.gz) = be576c45808744b9e6ae703ba170fc19f8cc4a63e6c8d74486159ff44c6763815bded11c7a414a491553e82041da2e4c5f197785e91a461118b4efa7fde240e9 5SHA512 (Term-ReadLine-Gnu-1.36.tar.gz) = be576c45808744b9e6ae703ba170fc19f8cc4a63e6c8d74486159ff44c6763815bded11c7a414a491553e82041da2e4c5f197785e91a461118b4efa7fde240e9
6Size (Term-ReadLine-Gnu-1.36.tar.gz) = 128336 bytes 6Size (Term-ReadLine-Gnu-1.36.tar.gz) = 128336 bytes
 7SHA1 (patch-Makefile.PL) = 77076432207d0143f9707098ec975d8972de68c5
File Added: pkgsrc/devel/p5-Term-ReadLine/patches/Attic/patch-Makefile.PL
$NetBSD: patch-Makefile.PL,v 1.1 2019/08/29 19:45:07 schmonz Exp $

Don't try to detect TERMCAP_LIB. Fixes at least Ubuntu builds.

--- Makefile.PL.orig	2017-11-25 13:50:24.000000000 +0000
+++ Makefile.PL
@@ -87,7 +87,7 @@ if ($Config{osname} eq 'os2') {
 	|| &search_lib('-lncurses')
 	|| &search_lib('-lcurses');
 
-    unless ($TERMCAP_LIB) {
+    unless (1 || $TERMCAP_LIB) {
 	warn "Could not find neither libtermcap, libtinfo, libncurses, or libcurses.\n";
 	exit $err;
     }