diff options
| author | sbd <sbd@pkgsrc.org> | 2012-02-19 04:10:49 +0000 |
|---|---|---|
| committer | sbd <sbd@pkgsrc.org> | 2012-02-19 04:10:49 +0000 |
| commit | 2929618859b5ee643a477c0b876bbb17453756b8 (patch) | |
| tree | 886a78adc5fa211d1e355c8aa5759652f98beba5 /lang/perl5 | |
| parent | d4f346cff99e9e0826907b45ac6c4924a622bcfd (diff) | |
| download | pkgsrc-2929618859b5ee643a477c0b876bbb17453756b8.tar.gz | |
Merge patch-Configure into patch-ca and use lower case $prefix
Diffstat (limited to 'lang/perl5')
| -rw-r--r-- | lang/perl5/distinfo | 5 | ||||
| -rw-r--r-- | lang/perl5/patches/patch-Configure | 13 | ||||
| -rw-r--r-- | lang/perl5/patches/patch-ca | 15 |
3 files changed, 14 insertions, 19 deletions
diff --git a/lang/perl5/distinfo b/lang/perl5/distinfo index 8f724074090..0c23a437776 100644 --- a/lang/perl5/distinfo +++ b/lang/perl5/distinfo @@ -1,15 +1,14 @@ -$NetBSD: distinfo,v 1.82 2012/02/17 14:04:01 obache Exp $ +$NetBSD: distinfo,v 1.83 2012/02/19 04:10:49 sbd Exp $ SHA1 (perl-5.14.2.tar.gz) = df1549d65cdef2b20023af83ecaa2a024109a5ad RMD160 (perl-5.14.2.tar.gz) = bed043edbebd69e1279e9a70424e2552389bea79 Size (perl-5.14.2.tar.gz) = 15223598 bytes -SHA1 (patch-Configure) = cc3a55187827ebb16326198fd9b262dfae931653 SHA1 (patch-aa) = 7578d0ee8fa20e055c50b8c617680b0d90cc5efa SHA1 (patch-ab) = b6104a02aa6fbeda2340042a93c2382d1a1965bb SHA1 (patch-ac) = c1893ea4cf4b89b03b3acc5dec9b5828d50c5dad SHA1 (patch-ah) = 6fe177646f0fc40f11f4b2b4f504ca45ddff1941 SHA1 (patch-aq) = 0afdf2d8a262ea09e2df6efae705e7227dc9f06f -SHA1 (patch-ca) = 112a98b85e8e276d8a211b440596ceba4f3302db +SHA1 (patch-ca) = 51ef8888578ce7a724313d6f62e573ca92e455f7 SHA1 (patch-ch) = 5b6a89c82e158bab0a5f06add48c28e600678099 SHA1 (patch-ck) = 5c381db130cdf4c315678e2d65380eaaa3065fee SHA1 (patch-cn) = a88fcb04b32c6e446d77b62cb6883a04f04e2e75 diff --git a/lang/perl5/patches/patch-Configure b/lang/perl5/patches/patch-Configure deleted file mode 100644 index f625e5f3121..00000000000 --- a/lang/perl5/patches/patch-Configure +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-Configure,v 1.1 2011/11/27 19:47:50 joerg Exp $ - ---- Configure.orig 2011-11-27 18:47:43.000000000 +0000 -+++ Configure -@@ -4799,7 +4799,7 @@ esac - libpth='' - for xxx in $dlist - do -- if $test -d $xxx; then -+ if $test -d $xxx -o "$xxx" = "$PREFIX/lib"; then - case " $libpth " in - *" $xxx "*) ;; - *) libpth="$libpth $xxx";; diff --git a/lang/perl5/patches/patch-ca b/lang/perl5/patches/patch-ca index 2a6db696e5f..228b77bec4c 100644 --- a/lang/perl5/patches/patch-ca +++ b/lang/perl5/patches/patch-ca @@ -1,7 +1,7 @@ -$NetBSD: patch-ca,v 1.10 2011/08/05 18:06:14 adam Exp $ +$NetBSD: patch-ca,v 1.11 2012/02/19 04:10:49 sbd Exp $ ---- Configure.orig 2011-06-09 22:04:29.000000000 +0200 -+++ Configure 2011-07-31 12:24:09.000000000 +0200 +--- Configure.orig 2011-09-26 09:44:34.000000000 +0000 ++++ Configure @@ -3256,13 +3256,14 @@ EOM osvers="$3" ;; @@ -46,6 +46,15 @@ $NetBSD: patch-ca,v 1.10 2011/08/05 18:06:14 adam Exp $ *) dlist="$libpth";; esac +@@ -4798,7 +4799,7 @@ esac + libpth='' + for xxx in $dlist + do +- if $test -d $xxx; then ++ if $test -d $xxx -o "$xxx" = "$prefix/lib"; then + case " $libpth " in + *" $xxx "*) ;; + *) libpth="$libpth $xxx";; @@ -6521,7 +6522,9 @@ rp='Pathname for the site-specific libra . ./getfile prefixvar=sitelib |