Update lang/perl58 to 5.8.4. Changes from version 5.8.3 include Unicode

enhancements and optimizations and bug fixes in handling UTF8 strings.

7 files changed, 60 insertions, 35 deletions

diff --git a/lang/perl58/Makefile b/lang/perl58/Makefile
index 303ccde57e6..e10e783116b 100644
--- a/lang/perl58/Makefile
+++ b/lang/perl58/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2004/04/25 22:42:51 tv Exp $
+# $NetBSD: Makefile,v 1.44 2004/04/26 04:42:12 jlam Exp $
 
 # The following two variables should have empty values unless we're
 # building a perl snapshot or release candidate.
@@ -8,26 +8,28 @@ PERL5_RC_VERS=	# empty
 
 .if empty(PERL5_SNAPSHOT) && empty(PERL5_RC_VERS)
 DISTNAME=	perl-${PERL5_VERS}
-PKGREVISION=	1
+PKGNAME=	perl${PERL5_PKGSUFFIX}-${PERL5_VERS}
+PKGREVISION=	# empty
 SNAPSHOT_SITES=	# empty
 .else
 .  if !empty(PERL5_SNAPSHOT)
 DISTNAME=	perl@${PERL5_SNAPSHOT}
-PKGNAME=	perl-${PERL5_VERS}beta${PERL5_SNAPSHOT}
+PKGNAME=	perl${PERL5_PKGSUFFIX}-${PERL5_VERS}beta${PERL5_SNAPSHOT}
 SNAPSHOT_SITES=	http://www.iki.fi/jhi/
 EXTRACT_SUFX=	.tbz
 WRKSRC=		${WRKDIR}/perl
 .  else # !empty(PERL5_RC_VERS)
 DISTNAME=	perl-${PERL5_VERS}-RC${PERL5_RC_VERS}
-PKGNAME=	perl-${PERL5_VERS}rc${PERL5_RC_VERS}
+PKGNAME=	perl${PERL5_PKGSUFFIX}-${PERL5_VERS}rc${PERL5_RC_VERS}
 SNAPSHOT_SITES=	http://www.cpan.org/authors/id/J/JH/JHI/
 .  endif
 .endif
 
-PERL5_VERS=	5.8.3
+PERL5_VERS=	5.8.4
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	${SNAPSHOT_SITES} \
 		${MASTER_SITE_PERL_CPAN:S,/modules/by-module/$,/src/,}
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jlam@NetBSD.org
 HOMEPAGE=	http://www.perl.com/
@@ -80,6 +82,21 @@ CONFIGURE_ARGS+=	-Dsiteman1dir="${VIEWBASE}/man/man1"
 
 .include "../../mk/bsd.prefs.mk"
 
+# If perl58 is built with threads support, then name the package
+# "perl-thread", otherwise it's just "perl" as usual.
+#
+PERL5_USE_THREADS?=	no
+.if !empty(PERL5_USE_THREADS:M[nN][oO])
+PERL5_PKGSUFFIX=	# empty
+CONFLICTS+=		perl-thread-[0-9]*
+CONFIGURE_ARGS+=	-Uuseithreads
+.else
+PERL5_PKGSUFFIX=	-thread
+CONFLICTS+=		perl-[0-9]*
+CONFIGURE_ARGS+=	-Duseithreads
+.  include "../../mk/pthread.buildlink3.mk"
+.endif
+
 MKPIC?=		yes
 
 .if ${OPSYS} == "IRIX" && defined(USE_MIPSPRO)
@@ -217,12 +234,12 @@ MESSAGE_SUBST+=		PERL5_SITELIB=${PERL5_SITELIB}
 # what pkgsrc said instead.
 post-patch:
 .if ${PKGDIRMODE} != "755"
-.for f in installhtml installman installperl lib/ExtUtils/Install.pm
+.  for f in installhtml installman installperl lib/ExtUtils/Install.pm
 	cd ${WRKSRC} && \
 		${MV} -f $f $f.dirmode && \
 		${SED} -e 's/755/${PKGDIRMODE}/g;/umask(/d' \
 		$f.dirmode >$f
-.endfor
+.  endfor
 .endif
 
 # It's tough to guess which hints file will be used, so add our modifications
diff --git a/lang/perl58/distinfo b/lang/perl58/distinfo
index 58ef46b2d85..a4cd98cbcc7 100644
--- a/lang/perl58/distinfo
+++ b/lang/perl58/distinfo
@@ -1,16 +1,24 @@
-$NetBSD: distinfo,v 1.15 2004/04/25 20:41:27 tv Exp $
+$NetBSD: distinfo,v 1.16 2004/04/26 04:42:12 jlam Exp $
 
+<<<<<<< distinfo
+SHA1 (perl-5.8.4.tar.bz2) = c5ea4952f42b0505268863dc607058b39cfcd4b6
+Size (perl-5.8.4.tar.bz2) = 9598489 bytes
+=======
 SHA1 (perl-5.8.3.tar.gz) = 4c6f2aaa1b3a1d44535a1b54738d494e8fb90222
 Size (perl-5.8.3.tar.gz) = 12002329 bytes
+>>>>>>> 1.15
+<<<<<<< distinfo
+=======
+>>>>>>> 1.15
 SHA1 (patch-aa) = a441cba11b12a4285284e98b6e5918efbd8bafef
 SHA1 (patch-ae) = fa3bbb1561192ce9214a7a7c756ccb2595a52c80
-SHA1 (patch-ah) = 06fbeac7ed4eaf0099bad4404203bdd67576f33f
+SHA1 (patch-ah) = b5b65b219c3d088bca2d46d833bc0afb62d5e727
 SHA1 (patch-ba) = cdceb712bae08c6041e5aa175e5989d48b3a3f4e
-SHA1 (patch-bc) = 6bd07e902563079dd5642eac321ca7f9271ab8a6
-SHA1 (patch-ca) = 481bb11e50c5d691d096b23fa3381af5e504be69
-SHA1 (patch-cb) = 9bdf9f97d5488943cddf4f2a4225a24c75eeb664
+SHA1 (patch-bc) = 9bb94826d63a094bc95c2201b8b86bfbc056fb3f
+SHA1 (patch-ca) = 5c0e5c1300d270891246330439ac66dd70457583
+SHA1 (patch-cb) = 2221fb87bddd29406d925d1cb5351eb4f3087f76
 SHA1 (patch-cc) = 091793735154350b82a5ed7ecf60f5418ab81f32
-SHA1 (patch-cd) = 488e86f7064d2e4e8709c0de9b7789a866afc8e3
+SHA1 (patch-cd) = d9420f57f036567abac821a8144768a2a7057b47
 SHA1 (patch-ce) = c7d2defd2cfa872c1f6651678bc3de6cd7aeaf34
 SHA1 (patch-cf) = 23cf46c8d683b688878433ec9b33f3c65528cd28
 SHA1 (patch-cg) = e1b56aaa40934f78298d1fd9303fbae33c472d8e
diff --git a/lang/perl58/patches/patch-ah b/lang/perl58/patches/patch-ah
index 1de92f8f0a5..15d94e957b2 100644
--- a/lang/perl58/patches/patch-ah
+++ b/lang/perl58/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.5 2004/02/10 01:59:54 jlam Exp $
+$NetBSD: patch-ah,v 1.6 2004/04/26 04:42:12 jlam Exp $
 
---- perl.c.orig	Tue Dec 30 13:48:44 2003
-+++ perl.c	Mon Feb  9 19:59:50 2004
-@@ -3972,12 +3972,33 @@
+--- perl.c.orig	Tue Apr 20 11:34:24 2004
++++ perl.c	Sun Apr 25 03:06:15 2004
+@@ -4245,12 +4245,33 @@
      }
  
  /* Use the ~-expanded versions of APPLLIB (undocumented),
@@ -37,7 +37,7 @@ $NetBSD: patch-ah,v 1.5 2004/02/10 01:59:54 jlam Exp $
  #ifdef ARCHLIB_EXP
      incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE);
  #endif
-@@ -4009,27 +4030,6 @@
+@@ -4282,27 +4303,6 @@
      incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE);
  #else
      incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE);
diff --git a/lang/perl58/patches/patch-bc b/lang/perl58/patches/patch-bc
index 9545ee5b389..e304bae013e 100644
--- a/lang/perl58/patches/patch-bc
+++ b/lang/perl58/patches/patch-bc
@@ -1,8 +1,8 @@
-$NetBSD: patch-bc,v 1.1 2003/10/05 14:26:00 grant Exp $
+$NetBSD: patch-bc,v 1.2 2004/04/26 04:42:12 jlam Exp $
 
---- hints/solaris_2.sh.orig	2003-09-18 19:21:49.000000000 +1000
-+++ hints/solaris_2.sh
-@@ -241,6 +241,10 @@ END
+--- hints/solaris_2.sh.orig	Wed Mar 24 17:59:58 2004
++++ hints/solaris_2.sh	Sun Apr 25 03:07:00 2004
+@@ -246,6 +246,10 @@
  	    # All Solaris versions of ld I've seen contain the magic
  	    # string used in the grep.
  	    :
diff --git a/lang/perl58/patches/patch-ca b/lang/perl58/patches/patch-ca
index 845ba04fed5..c0f5c5ed8b6 100644
--- a/lang/perl58/patches/patch-ca
+++ b/lang/perl58/patches/patch-ca
@@ -1,8 +1,8 @@
-$NetBSD: patch-ca,v 1.2 2004/04/24 21:04:43 tv Exp $
+$NetBSD: patch-ca,v 1.3 2004/04/26 04:42:12 jlam Exp $
 
---- Configure.orig	Fri Dec  5 06:57:56 2003
-+++ Configure	Fri Apr 23 14:09:12 2004
-@@ -7806,7 +7806,7 @@
+--- Configure.orig	Thu Apr  1 08:48:18 2004
++++ Configure	Mon Apr 26 00:32:32 2004
+@@ -7829,7 +7829,7 @@
  	solaris)
  		xxx="-R $shrpdir"
  		;;
@@ -11,7 +11,7 @@ $NetBSD: patch-ca,v 1.2 2004/04/24 21:04:43 tv Exp $
  		xxx="-Wl,-R$shrpdir"
  		;;
  	bsdos|linux|irix*|dec_osf)
-@@ -17244,7 +17244,15 @@
+@@ -17267,7 +17267,15 @@
  ACAT(Cir,cus)
  EOCP
  $cppstdin $cppflags $cppminus <cpp_stuff.c >cpp_stuff.out 2>&1
diff --git a/lang/perl58/patches/patch-cb b/lang/perl58/patches/patch-cb
index 1f1f0d4bafb..68ba5937e0f 100644
--- a/lang/perl58/patches/patch-cb
+++ b/lang/perl58/patches/patch-cb
@@ -1,8 +1,8 @@
-$NetBSD: patch-cb,v 1.2 2004/04/25 20:41:27 tv Exp $
+$NetBSD: patch-cb,v 1.3 2004/04/26 04:42:12 jlam Exp $
 
---- Makefile.SH.orig	Fri Apr 23 11:05:32 2004
-+++ Makefile.SH	Fri Apr 23 11:06:03 2004
-@@ -58,6 +58,10 @@
+--- Makefile.SH.orig	Sat Mar  6 10:54:23 2004
++++ Makefile.SH	Mon Apr 26 00:33:38 2004
+@@ -69,6 +69,10 @@
  	sunos*)
  		linklibperl="-lperl"
  		;;
diff --git a/lang/perl58/patches/patch-cd b/lang/perl58/patches/patch-cd
index 3a240297aae..2b2c9b33448 100644
--- a/lang/perl58/patches/patch-cd
+++ b/lang/perl58/patches/patch-cd
@@ -1,8 +1,8 @@
-$NetBSD: patch-cd,v 1.1 2004/04/24 21:04:43 tv Exp $
+$NetBSD: patch-cd,v 1.2 2004/04/26 04:42:12 jlam Exp $
 
---- lib/File/Find.pm.orig	Fri Apr 23 12:41:39 2004
-+++ lib/File/Find.pm	Fri Apr 23 12:42:19 2004
-@@ -1212,6 +1212,7 @@
+--- lib/File/Find.pm.orig	Fri Feb 27 11:31:34 2004
++++ lib/File/Find.pm	Mon Apr 26 00:34:04 2004
+@@ -1221,6 +1221,7 @@
  
  $File::Find::dont_use_nlink = 1
      if $^O eq 'os2' || $^O eq 'dos' || $^O eq 'amigaos' || $^O eq 'MSWin32' ||