Mon Aug 25 09:17:27 2014 UTC ()
Pullup ticket #4485 - requested by tron
lang/perl5: build fix

Revisions pulled up:
- lang/perl5/distinfo                                           1.122
- lang/perl5/patches/patch-hints_netbsd.sh                      1.9

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	mrg
   Date:		Tue Aug 12 05:41:39 UTC 2014

   Modified Files:
   	pkgsrc/lang/perl5: distinfo
   	pkgsrc/lang/perl5/patches: patch-hints_netbsd.sh

   Log Message:
   adjust a pattern to match 0.8 vs everything else.

   fixes build on netbsd-7, which was matching "not everything else"

   To generate a diff of this commit:
   cvs rdiff -u -r1.121 -r1.122 pkgsrc/lang/perl5/distinfo
   cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/perl5/patches/patch-hints_netbsd.sh


(spz)
diff -r1.121 -r1.121.2.1 pkgsrc/lang/perl5/distinfo
diff -r1.8 -r1.8.6.1 pkgsrc/lang/perl5/patches/patch-hints_netbsd.sh
cvs diff -r1.121 -r1.121.2.1 pkgsrc/lang/perl5/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/perl5/distinfo 2014/06/08 23:35:55 1.121
+++ pkgsrc/lang/perl5/distinfo 2014/08/25 09:17:26 1.121.2.1
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1$NetBSD: distinfo,v 1.121 2014/06/08 23:35:55 joerg Exp $ 1$NetBSD: distinfo,v 1.121.2.1 2014/08/25 09:17:26 spz Exp $
2 2
3SHA1 (perl-5.20.0.tar.bz2) = e925e4fc36e90eace19a1ca850f912618ba6788f 3SHA1 (perl-5.20.0.tar.bz2) = e925e4fc36e90eace19a1ca850f912618ba6788f
4RMD160 (perl-5.20.0.tar.bz2) = a14fa854f2d50aa5f16ff3a982244dd6cd0c4730 4RMD160 (perl-5.20.0.tar.bz2) = a14fa854f2d50aa5f16ff3a982244dd6cd0c4730
5Size (perl-5.20.0.tar.bz2) = 13770469 bytes 5Size (perl-5.20.0.tar.bz2) = 13770469 bytes
6SHA1 (patch-Makefile.SH) = 623f32eca930ccb7c5eaa47f28df87ae15149cad 6SHA1 (patch-Makefile.SH) = 623f32eca930ccb7c5eaa47f28df87ae15149cad
7SHA1 (patch-aa) = 441ad4f0d27d9be0fcdce31c9d35d35d98958518 7SHA1 (patch-aa) = 441ad4f0d27d9be0fcdce31c9d35d35d98958518
8SHA1 (patch-ab) = c899b7221a78e74cc9b1480834baba047dd19f38 8SHA1 (patch-ab) = c899b7221a78e74cc9b1480834baba047dd19f38
9SHA1 (patch-ac) = 4baa8f80695687abb53d4f4e1830cf86db5b2bf7 9SHA1 (patch-ac) = 4baa8f80695687abb53d4f4e1830cf86db5b2bf7
10SHA1 (patch-ah) = c1cb4ddb6db49dcfe12bb1d47911668b2318b953 10SHA1 (patch-ah) = c1cb4ddb6db49dcfe12bb1d47911668b2318b953
11SHA1 (patch-aq) = 4bf5a76f0277b0939b2ca7720f4bb045a788b5cc 11SHA1 (patch-aq) = 4bf5a76f0277b0939b2ca7720f4bb045a788b5cc
12SHA1 (patch-ca) = dcd3ab4d69a5a54677894f35b8bc536f48a19c45 12SHA1 (patch-ca) = dcd3ab4d69a5a54677894f35b8bc536f48a19c45
13SHA1 (patch-ch) = 5b6a89c82e158bab0a5f06add48c28e600678099 13SHA1 (patch-ch) = 5b6a89c82e158bab0a5f06add48c28e600678099
14SHA1 (patch-ck) = 5c381db130cdf4c315678e2d65380eaaa3065fee 14SHA1 (patch-ck) = 5c381db130cdf4c315678e2d65380eaaa3065fee
15SHA1 (patch-cn) = d1877383e213a414562b5bb4c1e8aa785926fab7 15SHA1 (patch-cn) = d1877383e213a414562b5bb4c1e8aa785926fab7
16SHA1 (patch-cpan_Socket_Socket.xs) = 9390c42ad456b0ea114c2e57e4d829d630fb698e 16SHA1 (patch-cpan_Socket_Socket.xs) = 9390c42ad456b0ea114c2e57e4d829d630fb698e
17SHA1 (patch-ext_Errno_Errno__pm.PL) = 4f135e267da17de38f8f1e7e03d5209bfd09a323 17SHA1 (patch-ext_Errno_Errno__pm.PL) = 4f135e267da17de38f8f1e7e03d5209bfd09a323
18SHA1 (patch-hints_cygwin.sh) = 1b21d927d6b7379754c4cd64a2b05d3632c35470 18SHA1 (patch-hints_cygwin.sh) = 1b21d927d6b7379754c4cd64a2b05d3632c35470
19SHA1 (patch-hints_darwin.sh) = c561d1862f8ca76652a35741c691394eb8cda70a 19SHA1 (patch-hints_darwin.sh) = c561d1862f8ca76652a35741c691394eb8cda70a
20SHA1 (patch-hints_netbsd.sh) = 027722c47bb01aa8db21e534178432cd26b49cdf 20SHA1 (patch-hints_netbsd.sh) = 16a8b649e23b1d03f4756ec283da44cc08ea9a6b
21SHA1 (patch-hints_sco.sh) = 8d43cdc0632799e1cdb5dc6fdb968052a9ae4216 21SHA1 (patch-hints_sco.sh) = 8d43cdc0632799e1cdb5dc6fdb968052a9ae4216
22SHA1 (patch-install__lib.pl) = 31e9e0fc34386542dd6a60bf6ca0a607babbd4b6 22SHA1 (patch-install__lib.pl) = 31e9e0fc34386542dd6a60bf6ca0a607babbd4b6
23SHA1 (patch-ta) = a9d13eeec22733e4087942f217a0d47a19498a6f 23SHA1 (patch-ta) = a9d13eeec22733e4087942f217a0d47a19498a6f
24SHA1 (patch-zd) = 469602bc04b217f2d9929f5caeab43f77a74076f 24SHA1 (patch-zd) = 469602bc04b217f2d9929f5caeab43f77a74076f
25SHA1 (patch-ze) = d6fb718a1417e37a7d6bee1ae89fe2beec51c81b 25SHA1 (patch-ze) = d6fb718a1417e37a7d6bee1ae89fe2beec51c81b
cvs diff -r1.8 -r1.8.6.1 pkgsrc/lang/perl5/patches/patch-hints_netbsd.sh (expand / switch to unified diff)

--- pkgsrc/lang/perl5/patches/patch-hints_netbsd.sh 2013/11/13 13:36:02 1.8
+++ pkgsrc/lang/perl5/patches/patch-hints_netbsd.sh 2014/08/25 09:17:26 1.8.6.1
@@ -1,65 +1,76 @@ @@ -1,65 +1,76 @@
1$NetBSD: patch-hints_netbsd.sh,v 1.8 2013/11/13 13:36:02 joerg Exp $ 1$NetBSD: patch-hints_netbsd.sh,v 1.8.6.1 2014/08/25 09:17:26 spz Exp $
2 2
3--whole-archive is a linker flag, not a compiler flag 3--whole-archive is a linker flag, not a compiler flag
4Better defaults for paths. 4Better defaults for paths.
5Stop grovelling for functions we don't want to provide (*host*) 5Stop grovelling for functions we don't want to provide (*host*)
6 6
7--- hints/netbsd.sh.orig 2013-05-23 23:38:10.000000000 +0000 7--- hints/netbsd.sh.orig 2014-08-11 22:30:50.000000000 -0700
8+++ hints/netbsd.sh 8+++ hints/netbsd.sh 2014-08-11 22:32:13.000000000 -0700
9@@ -36,16 +36,6 @@ case "$osvers" in 9@@ -36,16 +36,6 @@
10 d_dlerror=$define 10 d_dlerror=$define
11 cccdlflags="-DPIC -fPIC $cccdlflags" 11 cccdlflags="-DPIC -fPIC $cccdlflags"
12 lddlflags="-shared $lddlflags" 12 lddlflags="-shared $lddlflags"
13- cat >UU/cc.cbu <<'EOCBU' 13- cat >UU/cc.cbu <<'EOCBU'
14-# gcc 4.6 doesn't support --whole-archive, but it's required for the 14-# gcc 4.6 doesn't support --whole-archive, but it's required for the
15-# system gcc to build correctly, so check for it 15-# system gcc to build correctly, so check for it
16-echo 'int f(void) { return 0; }' >try.c 16-echo 'int f(void) { return 0; }' >try.c
17-if ${cc:-cc} $cccdlflags -c try.c -otry.o 2>&1 && 17-if ${cc:-cc} $cccdlflags -c try.c -otry.o 2>&1 &&
18- ${cc:-cc} --whole-archive $lddlflags try.o -otry.so 2>&1 ; then 18- ${cc:-cc} --whole-archive $lddlflags try.o -otry.so 2>&1 ; then
19- lddlflags="--whole-archive $lddlflags" 19- lddlflags="--whole-archive $lddlflags"
20-fi 20-fi
21-rm try.c try.o try.so 2>/dev/null 21-rm try.c try.o try.so 2>/dev/null
22-EOCBU 22-EOCBU
23 rpathflag="-Wl,-rpath," 23 rpathflag="-Wl,-rpath,"
24 case "$osvers" in 24 case "$osvers" in
25 1.[0-5]*) 25 1.[0-5]*)
26@@ -100,6 +90,12 @@ case "$osvers" in 26@@ -89,7 +79,9 @@
 27 ;;
 28 esac
 29 case "$osvers" in
 30-0.9*|1.*|2.*|3.*|4.*|5.*|6.*)
 31+0.8*)
 32+ ;;
 33+*)
 34 d_getprotoent_r="$undef"
 35 d_getprotobyname_r="$undef"
 36 d_getprotobynumber_r="$undef"
 37@@ -100,6 +92,12 @@
27 d_getservbyport_r="$undef" 38 d_getservbyport_r="$undef"
28 d_setservent_r="$undef" 39 d_setservent_r="$undef"
29 d_endservent_r="$undef" 40 d_endservent_r="$undef"
30+ d_gethostbyname_r="$undef" 41+ d_gethostbyname_r="$undef"
31+ d_gethostbyaddr2_r="$undef" 42+ d_gethostbyaddr2_r="$undef"
32+ d_gethostbyaddr_r="$undef" 43+ d_gethostbyaddr_r="$undef"
33+ d_sethostent_r="$undef" 44+ d_sethostent_r="$undef"
34+ d_gethostent_r="$undef" 45+ d_gethostent_r="$undef"
35+ d_endhostent_r="$undef" 46+ d_endhostent_r="$undef"
36 d_getprotoent_r_proto="0" 47 d_getprotoent_r_proto="0"
37 d_getprotobyname_r_proto="0" 48 d_getprotobyname_r_proto="0"
38 d_getprotobynumber_r_proto="0" 49 d_getprotobynumber_r_proto="0"
39@@ -110,6 +106,12 @@ case "$osvers" in 50@@ -110,6 +108,12 @@
40 d_getservbyport_r_proto="0" 51 d_getservbyport_r_proto="0"
41 d_setservent_r_proto="0" 52 d_setservent_r_proto="0"
42 d_endservent_r_proto="0" 53 d_endservent_r_proto="0"
43+ d_gethostbyname_r_proto="0" 54+ d_gethostbyname_r_proto="0"
44+ d_gethostbyaddr2_r_proto="0" 55+ d_gethostbyaddr2_r_proto="0"
45+ d_gethostbyaddr_r_proto="0" 56+ d_gethostbyaddr_r_proto="0"
46+ d_sethostent_r_proto="0" 57+ d_sethostent_r_proto="0"
47+ d_endhostent_r_proto="0" 58+ d_endhostent_r_proto="0"
48+ d_gethostent_r_proto="0" 59+ d_gethostent_r_proto="0"
49 ;; 60 ;;
50 esac 61 esac
51  62
52@@ -186,10 +188,12 @@ esac 63@@ -186,10 +190,12 @@
53 EOCBU 64 EOCBU
54  65
55 # Set sensible defaults for NetBSD: look for local software in 66 # Set sensible defaults for NetBSD: look for local software in
56-# /usr/pkg (NetBSD Packages Collection) and in /usr/local. 67-# /usr/pkg (NetBSD Packages Collection) and in /usr/local.
57+# /usr/local, plus the build prefix, which might or might not be 68+# /usr/local, plus the build prefix, which might or might not be
58+# /usr/pkg. 69+# /usr/pkg.
59 # 70 #
60-loclibpth="/usr/pkg/lib /usr/local/lib" 71-loclibpth="/usr/pkg/lib /usr/local/lib"
61-locincpth="/usr/pkg/include /usr/local/include" 72-locincpth="/usr/pkg/include /usr/local/include"
62+loclibpth="/usr/local/lib ${prefix}/lib" 73+loclibpth="/usr/local/lib ${prefix}/lib"
63+locincpth="/usr/local/include ${prefix}/include" 74+locincpth="/usr/local/include ${prefix}/include"
64+ 75+
65 case "$rpathflag" in 76 case "$rpathflag" in