Thu Jan 3 10:11:34 2013 UTC ()
Don't hardwire /usr/pkg; use $PREFIX instead. This fixes various
problems with linking and rpaths, such as the NetBSD manifestation of
PR 47187, and probably others; I haven't tried yet but I suspect at
least my manifestation of PR 44985 will be fixed too.


(dholland)
diff -r1.192 -r1.193 pkgsrc/lang/perl5/Makefile
diff -r1.89 -r1.90 pkgsrc/lang/perl5/distinfo
diff -r0 -r1.3 pkgsrc/lang/perl5/patches/patch-hints_netbsd.sh
cvs diff -r1.192 -r1.193 pkgsrc/lang/perl5/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/perl5/Makefile 2012/12/12 10:13:47 1.192
+++ pkgsrc/lang/perl5/Makefile 2013/01/03 10:11:34 1.193
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.192 2012/12/12 10:13:47 spz Exp $ 1# $NetBSD: Makefile,v 1.193 2013/01/03 10:11:34 dholland Exp $
2 2
3.include "license.mk" 3.include "license.mk"
4.include "Makefile.common" 4.include "Makefile.common"
5 5
6COMMENT= Practical Extraction and Report Language 6COMMENT= Practical Extraction and Report Language
7PKGREVISION= 1 7PKGREVISION= 2
8 8
9CONFLICTS= perl-base-[0-9]* perl-thread-[0-9]* \ 9CONFLICTS= perl-base-[0-9]* perl-thread-[0-9]* \
10 p5-CGI-2.66{,nb*} p5-CGI-2.75{,nb*} p5-CGI-2.75.[0-2] \ 10 p5-CGI-2.66{,nb*} p5-CGI-2.75{,nb*} p5-CGI-2.75.[0-2] \
11 p5-Tie-File-0.96{,nb*} \ 11 p5-Tie-File-0.96{,nb*} \
12 p5-Memoize-1.01{,nb*} \ 12 p5-Memoize-1.01{,nb*} \
13 p5-I18N-LangTags<0.35 \ 13 p5-I18N-LangTags<0.35 \
14 p5-Locale-Maketext-1.[0-9]*{,nb*} \ 14 p5-Locale-Maketext-1.[0-9]*{,nb*} \
15 p5-Locale-Maketext-Simple<0.21 \ 15 p5-Locale-Maketext-Simple<0.21 \
16 p5-Digest<=1.16 \ 16 p5-Digest<=1.16 \
17 p5-Digest-MD5<=2.39 \ 17 p5-Digest-MD5<=2.39 \
18 p5-Digest-SHA<2.48 18 p5-Digest-SHA<2.48
19 19
20SUPERSEDES+= p5-Tie-File<0.97 20SUPERSEDES+= p5-Tie-File<0.97
cvs diff -r1.89 -r1.90 pkgsrc/lang/perl5/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/perl5/distinfo 2012/12/12 10:13:47 1.89
+++ pkgsrc/lang/perl5/distinfo 2013/01/03 10:11:34 1.90
@@ -1,21 +1,22 @@ @@ -1,21 +1,22 @@
1$NetBSD: distinfo,v 1.89 2012/12/12 10:13:47 spz Exp $ 1$NetBSD: distinfo,v 1.90 2013/01/03 10:11:34 dholland Exp $
2 2
3SHA1 (perl-5.16.2.tar.gz) = 9e20e38e3460ebbac895341fd70a02189d03a490 3SHA1 (perl-5.16.2.tar.gz) = 9e20e38e3460ebbac895341fd70a02189d03a490
4RMD160 (perl-5.16.2.tar.gz) = 84f0233ac48059b4636661b023dd8a3389f9ae64 4RMD160 (perl-5.16.2.tar.gz) = 84f0233ac48059b4636661b023dd8a3389f9ae64
5Size (perl-5.16.2.tar.gz) = 16933974 bytes 5Size (perl-5.16.2.tar.gz) = 16933974 bytes
6SHA1 (patch-aa) = 9066746c6e6ed0d58962f52de1ae773e210cfcb5 6SHA1 (patch-aa) = 9066746c6e6ed0d58962f52de1ae773e210cfcb5
7SHA1 (patch-ab) = a9c674c5b09700d13fa885f11a3525d6d54899b5 7SHA1 (patch-ab) = a9c674c5b09700d13fa885f11a3525d6d54899b5
8SHA1 (patch-ac) = cd918ae7aedddfcd3d555a1d1388c4c8719ccd12 8SHA1 (patch-ac) = cd918ae7aedddfcd3d555a1d1388c4c8719ccd12
9SHA1 (patch-ah) = f66b496ba8f7b7d3e5a1f0c6f03d051a652f426e 9SHA1 (patch-ah) = f66b496ba8f7b7d3e5a1f0c6f03d051a652f426e
10SHA1 (patch-aq) = 4bf5a76f0277b0939b2ca7720f4bb045a788b5cc 10SHA1 (patch-aq) = 4bf5a76f0277b0939b2ca7720f4bb045a788b5cc
11SHA1 (patch-ca) = 30450f739f51a07825442744d6c38b27b58ddd87 11SHA1 (patch-ca) = 30450f739f51a07825442744d6c38b27b58ddd87
12SHA1 (patch-ch) = 5b6a89c82e158bab0a5f06add48c28e600678099 12SHA1 (patch-ch) = 5b6a89c82e158bab0a5f06add48c28e600678099
13SHA1 (patch-ck) = 5c381db130cdf4c315678e2d65380eaaa3065fee 13SHA1 (patch-ck) = 5c381db130cdf4c315678e2d65380eaaa3065fee
14SHA1 (patch-cn) = d1877383e213a414562b5bb4c1e8aa785926fab7 14SHA1 (patch-cn) = d1877383e213a414562b5bb4c1e8aa785926fab7
15SHA1 (patch-cp) = 0b22d334df24d128142855464bf6dd61d4d82975 15SHA1 (patch-cp) = 0b22d334df24d128142855464bf6dd61d4d82975
16SHA1 (patch-cpan_Sys-Syslog_Syslog.xs) = 4413010d0b55a0ae636bca8ff3ace2ebc99e90ba 16SHA1 (patch-cpan_Sys-Syslog_Syslog.xs) = 4413010d0b55a0ae636bca8ff3ace2ebc99e90ba
17SHA1 (patch-dist_Locale-Maketext_lib_Locale_Maketext.pm) = d44647f32d356030c8c2cd6346559f613a7fe459 17SHA1 (patch-dist_Locale-Maketext_lib_Locale_Maketext.pm) = d44647f32d356030c8c2cd6346559f613a7fe459
 18SHA1 (patch-hints_netbsd.sh) = 8a0656a72e81461f461757712b7fc27ad8928028
18SHA1 (patch-hints_solaris_2.sh) = 26f804234c07da04ebd6c33ce7ad54d94c746f1e 19SHA1 (patch-hints_solaris_2.sh) = 26f804234c07da04ebd6c33ce7ad54d94c746f1e
19SHA1 (patch-ta) = 51a3e02148e78eaab882125f859e59add39a4fbe 20SHA1 (patch-ta) = 51a3e02148e78eaab882125f859e59add39a4fbe
20SHA1 (patch-zd) = 469602bc04b217f2d9929f5caeab43f77a74076f 21SHA1 (patch-zd) = 469602bc04b217f2d9929f5caeab43f77a74076f
21SHA1 (patch-ze) = a719797ccf8bb09e75aacc1609408fb4afe6aa60 22SHA1 (patch-ze) = a719797ccf8bb09e75aacc1609408fb4afe6aa60
File Added: pkgsrc/lang/perl5/patches/patch-hints_netbsd.sh
$NetBSD: patch-hints_netbsd.sh,v 1.3 2013/01/03 10:11:34 dholland Exp $

--- hints/netbsd.sh~	2012-10-11 18:20:45.000000000 +0000
+++ hints/netbsd.sh
@@ -186,10 +186,12 @@ esac
 EOCBU
 
 # Set sensible defaults for NetBSD: look for local software in
-# /usr/pkg (NetBSD Packages Collection) and in /usr/local.
+# /usr/local, plus the build prefix, which might or might not be
+# /usr/pkg.
 #
-loclibpth="/usr/pkg/lib /usr/local/lib"
-locincpth="/usr/pkg/include /usr/local/include"
+loclibpth="/usr/local/lib ${prefix}/lib"
+locincpth="/usr/local/include ${prefix}/include"
+
 case "$rpathflag" in
 '')
 	ldflags=