diff options
| author | tron <tron> | 2001-09-17 11:14:51 +0000 |
|---|---|---|
| committer | tron <tron> | 2001-09-17 11:14:51 +0000 |
| commit | 838ad5649989f196efd1ca3a03fe3f2cea0b6508 (patch) | |
| tree | 74274d3f4abf52e973bb9acc219d4ca78fef9806 /lang | |
| parent | bae44b8ad9ad45c44bad7b7c8ccc8b9ebd6f6bc1 (diff) | |
| download | pkgsrc-838ad5649989f196efd1ca3a03fe3f2cea0b6508.tar.gz | |
Stop configure from trying to use "libiconv" because "/usr/include/iconv.h"
exists under SunOS.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/perl5/distinfo | 4 | ||||
| -rw-r--r-- | lang/perl5/patches/patch-aa | 24 |
2 files changed, 21 insertions, 7 deletions
diff --git a/lang/perl5/distinfo b/lang/perl5/distinfo index 66ff170a0c4..c2fbe34225a 100644 --- a/lang/perl5/distinfo +++ b/lang/perl5/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.3 2001/09/14 05:00:35 jlam Exp $ +$NetBSD: distinfo,v 1.4 2001/09/17 11:14:51 tron Exp $ SHA1 (perl-5.6.1.tar.gz) = c718b38685f90d51a9a6b1b008de0d7d198c0744 Size (perl-5.6.1.tar.gz) = 5983695 bytes -SHA1 (patch-aa) = 6538191502ddee841fe5f0202b33d642688c9a54 +SHA1 (patch-aa) = 6d4f9ed08f5f35844eb7833de9014ca58f6df70e SHA1 (patch-ab) = 65bbbb0d6a1ddf17bd5d718f0ac741faf37ce408 SHA1 (patch-ac) = dfebafeec171c86de3d6105e5543270a30f82691 SHA1 (patch-ad) = 7a3ca903d958026473f593fdeb172f86f2ef66d2 diff --git a/lang/perl5/patches/patch-aa b/lang/perl5/patches/patch-aa index efe6b58010c..3d1d88c0d5c 100644 --- a/lang/perl5/patches/patch-aa +++ b/lang/perl5/patches/patch-aa @@ -1,8 +1,22 @@ -$NetBSD: patch-aa,v 1.19 2001/09/14 05:00:36 jlam Exp $ +$NetBSD: patch-aa,v 1.20 2001/09/17 11:14:51 tron Exp $ ---- Configure.orig Sun Mar 18 22:03:33 2001 -+++ Configure Fri Sep 14 00:55:04 2001 -@@ -6807,9 +6807,12 @@ +--- Configure.orig Mon Mar 19 04:03:33 2001 ++++ Configure Mon Sep 17 11:59:02 2001 +@@ -1033,7 +1033,12 @@ + libswanted='sfio socket bind inet nsl nm ndbm gdbm dbm db malloc dl' + libswanted="$libswanted dld ld sun m c cposix posix" + libswanted="$libswanted ndir dir crypt sec" +-libswanted="$libswanted ucb bsd BSD PW x iconv util" ++if [ -x /usr/bin/uname ] && [ "`/usr/bin/uname -s`" = SunOS ] ++then ++ libswanted="$libswanted ucb bsd BSD PW x util" ++else ++ libswanted="$libswanted ucb bsd BSD PW x iconv util" ++fi + : We probably want to search /usr/shlib before most other libraries. + : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist. + glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'` +@@ -6807,9 +6812,12 @@ aix) # We'll set it in Makefile.SH... ;; @@ -16,7 +30,7 @@ $NetBSD: patch-aa,v 1.19 2001/09/14 05:00:36 jlam Exp $ freebsd) xxx="-Wl,-R$shrpdir" ;; -@@ -14719,7 +14722,7 @@ +@@ -14719,7 +14727,7 @@ eval $inhdr : see if this is a ieeefp.h system |