Tue Jun 21 13:23:32 2016 UTC ()
- Add patches/patch-Makefile.PL to give adhoc work around with clang build,

./curlopt-constants.c:19:58: error: non-void function 'constant' should return a value [-Wreturn-type]
if (strEQ(name, "DID_MEMORY_FUNC_TYPEDEFS")) return CURL_DID_MEMORY_FUNC_TYPEDEFS;
                                                    ^


(mef)
diff -r1.34 -r1.35 pkgsrc/www/p5-WWW-Curl/Makefile
diff -r1.14 -r1.15 pkgsrc/www/p5-WWW-Curl/distinfo
diff -r0 -r1.1 pkgsrc/www/p5-WWW-Curl/patches/patch-Makefile.PL
cvs diff -r1.34 -r1.35 pkgsrc/www/p5-WWW-Curl/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/p5-WWW-Curl/Attic/Makefile 2016/06/08 19:25:18 1.34
+++ pkgsrc/www/p5-WWW-Curl/Attic/Makefile 2016/06/21 13:23:32 1.35
@@ -1,25 +1,26 @@ @@ -1,25 +1,26 @@
1# $NetBSD: Makefile,v 1.34 2016/06/08 19:25:18 wiz Exp $ 1# $NetBSD: Makefile,v 1.35 2016/06/21 13:23:32 mef Exp $
2# 2#
3 3
4DISTNAME= WWW-Curl-4.17 4DISTNAME= WWW-Curl-4.17
5PKGNAME= p5-${DISTNAME} 5PKGNAME= p5-${DISTNAME}
6PKGREVISION= 2 6PKGREVISION= 2
7CATEGORIES= www perl5 7CATEGORIES= www perl5
8MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=WWW/} 8MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=WWW/}
9 9
10MAINTAINER= imil@gcu.info 10MAINTAINER= imil@gcu.info
11HOMEPAGE= http://search.cpan.org/dist/WWW-Curl/ 11HOMEPAGE= http://search.cpan.org/dist/WWW-Curl/
12COMMENT= Perl binding interface for curl 12COMMENT= Perl binding interface for curl
13LICENSE= mit 13LICENSE= mit
14 14
15BUILDLINK_API_DEPENDS.curl+= curl>=7.10.8 15BUILDLINK_API_DEPENDS.curl+= curl>=7.10.8
 16CFLAGS= -Wall -Werror -Wreturn-type
16 17
17PERL5_PACKLIST= auto/WWW/Curl/.packlist 18PERL5_PACKLIST= auto/WWW/Curl/.packlist
18PERL5_MODULE_TYPE= Module::Install::Bundled 19PERL5_MODULE_TYPE= Module::Install::Bundled
19 20
20# for make test (t/meta.t . skipped: .... for testing META.yml) 21# for make test (t/meta.t . skipped: .... for testing META.yml)
21BUILD_DEPENDS+= p5-Test-CPAN-Meta-[0-9]*:../../devel/p5-Test-CPAN-Meta 22BUILD_DEPENDS+= p5-Test-CPAN-Meta-[0-9]*:../../devel/p5-Test-CPAN-Meta
22 23
23.include "../../www/curl/buildlink3.mk" 24.include "../../www/curl/buildlink3.mk"
24.include "../../lang/perl5/module.mk" 25.include "../../lang/perl5/module.mk"
25.include "../../mk/bsd.pkg.mk" 26.include "../../mk/bsd.pkg.mk"
cvs diff -r1.14 -r1.15 pkgsrc/www/p5-WWW-Curl/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/www/p5-WWW-Curl/Attic/distinfo 2016/02/01 13:19:36 1.14
+++ pkgsrc/www/p5-WWW-Curl/Attic/distinfo 2016/06/21 13:23:32 1.15
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.14 2016/02/01 13:19:36 mef Exp $ 1$NetBSD: distinfo,v 1.15 2016/06/21 13:23:32 mef Exp $
2 2
3SHA1 (WWW-Curl-4.17.tar.gz) = 8ec7b7b39bd653539671fb02fbb7d0ff4863e636 3SHA1 (WWW-Curl-4.17.tar.gz) = 8ec7b7b39bd653539671fb02fbb7d0ff4863e636
4RMD160 (WWW-Curl-4.17.tar.gz) = 786b6e0461051eae67bdcded046095895ea2a6a2 4RMD160 (WWW-Curl-4.17.tar.gz) = 786b6e0461051eae67bdcded046095895ea2a6a2
5SHA512 (WWW-Curl-4.17.tar.gz) = bc7a75d0e23f5a77578fd7244b56a1e1b81d814993b90ac7132926f0d571232c4c95875bc615cb6239e424ae1d5481d27796efc5376bb0845d1da0ff1137c0d6 5SHA512 (WWW-Curl-4.17.tar.gz) = bc7a75d0e23f5a77578fd7244b56a1e1b81d814993b90ac7132926f0d571232c4c95875bc615cb6239e424ae1d5481d27796efc5376bb0845d1da0ff1137c0d6
6Size (WWW-Curl-4.17.tar.gz) = 50917 bytes 6Size (WWW-Curl-4.17.tar.gz) = 50917 bytes
 7SHA1 (patch-Makefile.PL) = 7abf71d929aff8c764969431790727741fa453b7
File Added: pkgsrc/www/p5-WWW-Curl/patches/Attic/patch-Makefile.PL
$NetBSD: patch-Makefile.PL,v 1.1 2016/06/21 13:23:32 mef Exp $

Adhoc work around not to pick the definition of CURL_DID_MEMORY_FUNC_TYPEDEFS:
./curlopt-constants.c:19:58: error: non-void function 'constant' should return a value [-Wreturn-type]
if (strEQ(name, "DID_MEMORY_FUNC_TYPEDEFS")) return CURL_DID_MEMORY_FUNC_TYPEDEFS;
^

--- Makefile.PL.orig	2016-06-21 21:55:38.000000000 +0900
+++ Makefile.PL	2016-06-21 21:57:43.000000000 +0900
@@ -127,7 +127,7 @@ if (!defined($curl_h)) {
     close H;
 
     for my $e (sort @syms) {
-       if($e =~ /(OBSOLETE|^CURL_EXTERN|_LAST\z|_LASTENTRY\z)/) {
+       if($e =~ /(OBSOLETE|^CURL_EXTERN|_LAST\z|_LASTENTRY\z|CURL_DID_MEMORY_FUNC_TYPEDEFS\z)/) {
           next;
        }
        my ($group) = $e =~ m/^([^_]+_)/;