Perl has no dependencies, so force patch the Configure script to make

library searches to start in the system directories instead of in the
pkgsrc-controlled directories.  This change is in the same spirit as
the one that caused the PKGREVISION bump to 6, but is more likely to
work on IRIX where plibpth needs to be set from the Configure script.
This time, we patch the Configure script instead of setting libpth in
the hints file because we depend on the values of variables which are
defined after the hints file is sourced by the Configure script.

XXX This breaks building perl on a platform that has native pthreads
XXX with PREFER_NATIVE_PTHREADS=no, but that's not really worthwhile
XXX to fix.

3 files changed, 15 insertions, 15 deletions

diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index a474776384e..c983836a1c0 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.109 2005/12/22 15:23:17 jlam Exp $
+# $NetBSD: Makefile,v 1.110 2005/12/29 17:54:45 jlam Exp $
 
 # The following two variables should have empty values unless we're
 # building a perl snapshot or release candidate.
@@ -273,14 +273,8 @@ SUBST_SED.dirmode=	-e "s/755/${PKGDIRMODE}/g;/umask(/d"
 # - Explicitly set the local compiler search paths to contain only the
 #   pkgsrc-controlled directories.
 #
-# - Perl has no dependencies, so force library searches to start in the
-#   system directories instead of in the pkgsrc-controlled directories.
-#   XXX
-#   XXX This breaks building perl on a platform that has native pthreads
-#   XXX with PREFER_NATIVE_PTHREADS=no, but that's not really worthwhile
-#   XXX to fix.
-#
 pre-configure:
+.if defined(PTHREAD_LDFLAGS) && !empty(PTHREAD_LDFLAGS)
 	hintdir="${WRKSRC}/hints";					\
 	for hints in $${hintdir}/*.sh; do				\
 		${CHMOD} +w $${hints};					\
@@ -293,6 +287,7 @@ pre-configure:
 		  ${ECHO} "EOCBU";					\
 		} >> $${hints};						\
 	done
+.endif
 	hintdir="${WRKSRC}/hints";					\
 	for hints in $${hintdir}/*.sh; do				\
 		{ ${ECHO} "";						\
@@ -318,10 +313,6 @@ pre-configure:
 		${ECHO} 'glibpth="'${SYSLIBPATH:Q}'"' >> $${hints};	\
 	done
 .endif
-	hintdir="${WRKSRC}/hints";					\
-	for hints in $${hintdir}/*.sh; do				\
-		${ECHO} 'libpth="$$glibpth $$loclibpth"' >> $${hints};	\
-	done
 
 INSTALLATION_DIRS=	bin man/man1
 PERL5_PACKLIST_DIR_cmd=	eval `${PERL5} -V:installarchlib 2>/dev/null`;	\
diff --git a/lang/perl5/distinfo b/lang/perl5/distinfo
index a393e7c2f49..e36cc15350c 100644
--- a/lang/perl5/distinfo
+++ b/lang/perl5/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2005/12/18 15:25:29 jlam Exp $
+$NetBSD: distinfo,v 1.31 2005/12/29 17:54:45 jlam Exp $
 
 SHA1 (perl-5.8.7.tar.bz2) = c9477c6fe76b200033694bdc555a0276523d4228
 RMD160 (perl-5.8.7.tar.bz2) = 110c286d73fd89e25da8ea394e763f209a76d283
@@ -10,7 +10,7 @@ SHA1 (patch-am) = f82f8fd7fa372f1d47b057b6051613d66dc4bc23
 SHA1 (patch-an) = 25c0991dba16ebe11422a97f544cb100e8da56b8
 SHA1 (patch-ba) = 096835f71a69f29e50bdad47944afa838dba5aec
 SHA1 (patch-bd) = 9f96ba1912f2a8db93db31f7a63c0b49a045318d
-SHA1 (patch-ca) = 8eef6a9f96b8f1c6a7c34b521b7c633d396757e3
+SHA1 (patch-ca) = 47c05240424e400910a99b86aada6e7f46061459
 SHA1 (patch-cb) = 1a67bf37338de9b8e24e90ddad90205ec4fbb6c8
 SHA1 (patch-ce) = 6b1efab32c6bc28e0faf7522322e6d805eb21730
 SHA1 (patch-ch) = 028439dde97f1d5a94fbd571a59fd0ab2c5b3b07
diff --git a/lang/perl5/patches/patch-ca b/lang/perl5/patches/patch-ca
index 283cdf17807..b5c453ea017 100644
--- a/lang/perl5/patches/patch-ca
+++ b/lang/perl5/patches/patch-ca
@@ -1,4 +1,4 @@
-$NetBSD: patch-ca,v 1.3 2005/08/06 06:18:45 jlam Exp $
+$NetBSD: patch-ca,v 1.4 2005/12/29 17:54:45 jlam Exp $
 
 --- Configure.orig	2005-04-20 12:34:37.000000000 -0400
 +++ Configure
@@ -37,6 +37,15 @@ $NetBSD: patch-ca,v 1.3 2005/08/06 06:18:45 jlam Exp $
  		os2)	osname=os2
  			osvers="$4"
  			;;
+@@ -4426,7 +4428,7 @@ case "$plibpth" in
+ esac
+ case "$libpth" in
+ ' ') dlist='';;
+-'') dlist="$loclibpth $plibpth $glibpth";;
++'') dlist="$plibpth $glibpth $loclibpth";;
+ *) dlist="$libpth";;
+ esac
+ 
 @@ -7856,7 +7858,7 @@ if "$useshrplib"; then
  	solaris)
  		xxx="-R $shrpdir"