6 files changed, 24 insertions, 44 deletions
diff --git a/lang/perl58/Makefile b/lang/perl58/Makefile
index 82771c8eba3..f80d55468d5 100644
--- a/lang/perl58/Makefile
+++ b/lang/perl58/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2004/11/04 22:51:58 jklos Exp $
+# $NetBSD: Makefile,v 1.54 2004/11/07 16:20:11 wiz Exp $
 
 # The following two variables should have empty values unless we're
 # building a perl snapshot or release candidate.
@@ -9,7 +9,6 @@ PERL5_RC_VERS=	# empty
 .if empty(PERL5_SNAPSHOT) && empty(PERL5_RC_VERS)
 DISTNAME=	perl-${PERL5_VERS}
 PKGNAME=	perl${PERL5_PKGSUFFIX}-${PERL5_VERS}
-PKGREVISION=	1
 SNAPSHOT_SITES=	# empty
 .else
 .  if !empty(PERL5_SNAPSHOT)
@@ -25,7 +24,7 @@ SNAPSHOT_SITES=	http://www.cpan.org/authors/id/J/JH/JHI/
 .  endif
 .endif
 
-PERL5_VERS=	5.8.4
+PERL5_VERS=	5.8.5
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	${SNAPSHOT_SITES} \
 		${MASTER_SITE_PERL_CPAN:S,/modules/by-module/$,/src/,}
@@ -91,7 +90,6 @@ PERL5_PKGSUFFIX=	# empty
 CONFLICTS+=		perl-thread-[0-9]*
 CONFIGURE_ARGS+=	-Uuseithreads
 .else
-PKGREVISION=		1
 PERL5_ARCHLIB=		${PREFIX}/lib/perl5/${PERL5_VERS}/${MACHINE_ARCH}-${LOWER_OPSYS}-thread-multi
 PERL5_PKGSUFFIX=	-thread
 CONFLICTS+=		perl-[0-9]*
diff --git a/lang/perl58/PLIST b/lang/perl58/PLIST
index bb66de6211c..391173d7d86 100644
--- a/lang/perl58/PLIST
+++ b/lang/perl58/PLIST
@@ -1,6 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2003/10/05 07:07:14 jlam Exp $
-man/man1/psed.1
-man/man1/pstruct.1
+@comment $NetBSD: PLIST,v 1.8 2004/11/07 16:20:11 wiz Exp $
 share/mk/bsd.perl.mk
 @unexec ${RM} -f %D/${PERL5_SITEARCH}/perllocal.pod
 @unexec ${RMDIR} -p %D/${PERL5_SITEARCH} 2>/dev/null || ${TRUE}
diff --git a/lang/perl58/distinfo b/lang/perl58/distinfo
index ea8a87c7158..029baeb2a59 100644
--- a/lang/perl58/distinfo
+++ b/lang/perl58/distinfo
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.19 2004/06/09 20:47:20 christos Exp $
+$NetBSD: distinfo,v 1.20 2004/11/07 16:20:11 wiz Exp $
 
-SHA1 (perl-5.8.4.tar.bz2) = c5ea4952f42b0505268863dc607058b39cfcd4b6
-Size (perl-5.8.4.tar.bz2) = 9598489 bytes
+SHA1 (perl-5.8.5.tar.bz2) = 6fec546bd96070c3c14b5b5fd2cd9af3185905fe
+Size (perl-5.8.5.tar.bz2) = 9464689 bytes
 SHA1 (patch-aa) = a441cba11b12a4285284e98b6e5918efbd8bafef
 SHA1 (patch-ae) = fa3bbb1561192ce9214a7a7c756ccb2595a52c80
-SHA1 (patch-ah) = b5b65b219c3d088bca2d46d833bc0afb62d5e727
+SHA1 (patch-ah) = b180ba8d91d2ac5e685b7d23a265245605e7eb74
 SHA1 (patch-ba) = 74a01f3a86f263720b9f07d1fdbaadbaecafb012
-SHA1 (patch-bc) = 9bb94826d63a094bc95c2201b8b86bfbc056fb3f
-SHA1 (patch-ca) = 5c0e5c1300d270891246330439ac66dd70457583
+SHA1 (patch-ca) = 8b5a84067d229822394f724508961ab78498c1ea
 SHA1 (patch-cb) = 2221fb87bddd29406d925d1cb5351eb4f3087f76
 SHA1 (patch-cc) = 721459e0123c3306c44cca20e37680ec7026dd09
 SHA1 (patch-cd) = d9420f57f036567abac821a8144768a2a7057b47
diff --git a/lang/perl58/patches/patch-ah b/lang/perl58/patches/patch-ah
index 15d94e957b2..c5d8bf32e6f 100644
--- a/lang/perl58/patches/patch-ah
+++ b/lang/perl58/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.6 2004/04/26 04:42:12 jlam Exp $
+$NetBSD: patch-ah,v 1.7 2004/11/07 16:20:11 wiz Exp $
 
---- perl.c.orig	Tue Apr 20 11:34:24 2004
-+++ perl.c	Sun Apr 25 03:06:15 2004
-@@ -4245,12 +4245,33 @@
+--- perl.c.orig	2004-06-23 12:35:46.000000000 +0200
++++ perl.c
+@@ -4280,12 +4280,33 @@ S_init_perllib(pTHX)
      }
  
  /* Use the ~-expanded versions of APPLLIB (undocumented),
@@ -37,12 +37,10 @@ $NetBSD: patch-ah,v 1.6 2004/04/26 04:42:12 jlam Exp $
  #ifdef ARCHLIB_EXP
      incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE);
  #endif
-@@ -4282,27 +4303,6 @@
-     incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE);
- #else
+@@ -4319,27 +4340,6 @@ S_init_perllib(pTHX)
      incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE);
--#endif
--
+ #endif
+ 
 -#ifdef SITEARCH_EXP
 -    /* sitearch is always relative to sitelib on Windows for
 -     * DLL-based path intuition to work correctly */
@@ -62,6 +60,8 @@ $NetBSD: patch-ah,v 1.6 2004/04/26 04:42:12 jlam Exp $
 -
 -#ifdef SITELIB_STEM /* Search for version-specific dirs below here */
 -    incpush(SITELIB_STEM, FALSE, TRUE, TRUE);
- #endif
- 
+-#endif
+-
  #ifdef PERL_VENDORARCH_EXP
+     /* vendorarch is always relative to vendorlib on Windows for
+      * DLL-based path intuition to work correctly */
diff --git a/lang/perl58/patches/patch-bc b/lang/perl58/patches/patch-bc
deleted file mode 100644
index e304bae013e..00000000000
--- a/lang/perl58/patches/patch-bc
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-bc,v 1.2 2004/04/26 04:42:12 jlam Exp $
-
---- 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.
- 	    :
-+	elif echo "$verbose" | grep "ld: Solaris Link Editors" >/dev/null 2>&1; then
-+	    # This string has also been observed "in the wild" as
-+	    # being the Solaris linker.
-+	    :
- 	else
- 	    # No evidence yet of /usr/ccs/bin/ld.  Some versions
- 	    # of egcs's ld wrapper call /usr/ccs/bin/ld in turn but
diff --git a/lang/perl58/patches/patch-ca b/lang/perl58/patches/patch-ca
index c0f5c5ed8b6..9d009a20d47 100644
--- a/lang/perl58/patches/patch-ca
+++ b/lang/perl58/patches/patch-ca
@@ -1,8 +1,8 @@
-$NetBSD: patch-ca,v 1.3 2004/04/26 04:42:12 jlam Exp $
+$NetBSD: patch-ca,v 1.4 2004/11/07 16:20:11 wiz Exp $
 
---- Configure.orig	Thu Apr  1 08:48:18 2004
-+++ Configure	Mon Apr 26 00:32:32 2004
-@@ -7829,7 +7829,7 @@
+--- Configure.orig	2004-05-12 13:00:41.000000000 +0200
++++ Configure
+@@ -7850,7 +7850,7 @@ if "$useshrplib"; then
  	solaris)
  		xxx="-R $shrpdir"
  		;;
@@ -11,7 +11,7 @@ $NetBSD: patch-ca,v 1.3 2004/04/26 04:42:12 jlam Exp $
  		xxx="-Wl,-R$shrpdir"
  		;;
  	bsdos|linux|irix*|dec_osf)
-@@ -17267,7 +17267,15 @@
+@@ -17288,7 +17288,15 @@ RCAT(Rei,ser)
  ACAT(Cir,cus)
  EOCP
  $cppstdin $cppflags $cppminus <cpp_stuff.c >cpp_stuff.out 2>&1