From f2f891d4fbe252c63c140c2eb12e08e74b5222bb Mon Sep 17 00:00:00 2001
From: tron <tron@pkgsrc.org>
Date: Mon, 17 Sep 2001 11:14:51 +0000
Subject: Stop configure from trying to use "libiconv" because
 "/usr/include/iconv.h" exists under SunOS.

---
 lang/perl5/patches/patch-aa | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

(limited to 'lang/perl5/patches/patch-aa')

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
-- 
cgit v1.2.3