summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2001-09-17 18:04:42 +0000
committertron <tron@pkgsrc.org>2001-09-17 18:04:42 +0000
commit95a495ffdf910db893ff36064fc67a57bad2bbdb (patch)
treee18bec3594014d3ad296719b85f455cce973167b /lang
parent8b012e804da2c8bbd7ff19c5ecc94c5410d26769 (diff)
downloadpkgsrc-95a495ffdf910db893ff36064fc67a57bad2bbdb.tar.gz
Solve SunOS build problem in a much cleaner way by predefining "libswanted"
for Perl's configuration script as suggested by Johnny C. Lam in private e-mail.
Diffstat (limited to 'lang')
-rw-r--r--lang/perl5/Makefile4
-rw-r--r--lang/perl5/distinfo4
-rw-r--r--lang/perl5/patches/patch-aa16
3 files changed, 6 insertions, 18 deletions
diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index a7164cc0fda..4c4524af265 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2001/09/12 18:58:57 jlam Exp $
+# $NetBSD: Makefile,v 1.43 2001/09/17 18:04:42 tron Exp $
.include "../../lang/perl5/Makefile.common"
@@ -34,12 +34,14 @@ MKPIC?= yes
# dependencies.
#
LIBSWANTED.NetBSD= m crypt
+LIBSWANTED.SunOS= m crypt socket nsl
# Nail down the directories in which the system libraries may be found.
# If this isn't defined, then use the perl defaults for the particular
# operating system.
#
SYSLIBPATH.NetBSD= /usr/lib
+SYSLIBPATH.SunOS= /usr/lib
.if defined(LIBSWANTED.${OPSYS})
CONFIGURE_ARGS+= -Dlibswanted="${LIBSWANTED.${OPSYS}}"
diff --git a/lang/perl5/distinfo b/lang/perl5/distinfo
index c2fbe34225a..77475cc3e23 100644
--- a/lang/perl5/distinfo
+++ b/lang/perl5/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2001/09/17 11:14:51 tron Exp $
+$NetBSD: distinfo,v 1.5 2001/09/17 18:04:42 tron Exp $
SHA1 (perl-5.6.1.tar.gz) = c718b38685f90d51a9a6b1b008de0d7d198c0744
Size (perl-5.6.1.tar.gz) = 5983695 bytes
-SHA1 (patch-aa) = 6d4f9ed08f5f35844eb7833de9014ca58f6df70e
+SHA1 (patch-aa) = 2f03e3b58eff2f7ff56dbcf0f5976f74199a3ab9
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 3d1d88c0d5c..d3999384aa7 100644
--- a/lang/perl5/patches/patch-aa
+++ b/lang/perl5/patches/patch-aa
@@ -1,21 +1,7 @@
-$NetBSD: patch-aa,v 1.20 2001/09/17 11:14:51 tron Exp $
+$NetBSD: patch-aa,v 1.21 2001/09/17 18:04:44 tron Exp $
--- 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...