Update libperl to 5.6.0nb3. This is basically a downgrade to version

5.6.0nb1 as this package no longer builds and installs libperl.so as a
shared library.  Instead, libperl.so is built and installed by the perl
(as of 5.6.0nb6) if the platform supports shared libraries (or if
MKPIC=yes).  The libperl package again only installs DynaLoader.o as a
relocatable shared object.

3 files changed, 23 insertions, 37 deletions

diff --git a/lang/libperl/Makefile b/lang/libperl/Makefile
index 098cff6ce74..0939011d797 100644
--- a/lang/libperl/Makefile
+++ b/lang/libperl/Makefile
@@ -1,58 +1,45 @@
-# $NetBSD: Makefile,v 1.17 2001/05/18 13:52:49 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2001/05/20 05:21:45 jlam Exp $
 
 DISTNAME=		perl-${PERL_VERSION}
-PKGNAME=		libperl-${PERL_VERSION}nb2
+PKGNAME=		libperl-${PERL_VERSION}nb3
 PERL_VERSION=		5.6.0
 CATEGORIES=		lang devel perl5
-MASTER_SITES=		ftp://ftp.digital.com/pub/plan/perl/CPAN/src/5.0/ \
-			ftp://ftp.cdrom.com/pub/perl/CPAN/src/5.0/
+MASTER_SITES=		ftp://ftp.digital.com/pub/plan/perl/CPAN/src/5.0/maint/ \
+			ftp://ftp.cdrom.com/pub/perl/CPAN/src/5.0/maint/
 
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://language.perl.com/index.html
-COMMENT=		PERL core library and DynaLoader as a shared object
+COMMENT=		Perl DynaLoader as a shared object
 
 USE_PERL5=		# defined
-PERL_REQD=		${PERL_VERSION}nb1
+PERL_REQD=		${PERL_VERSION}nb6
 
 DISTINFO_FILE=		${.CURDIR}/../../lang/perl5-base/distinfo
-PATCHDIR=		${.CURDIR}/../../lang/perl5-base/patches
 
-HAS_CONFIGURE=		# defined
-CONFIGURE_ENV+=		PREFIX=${PREFIX}
-CONFIGURE_SCRIPT=	./Configure
-CONFIGURE_ARGS+=	-sde -Dprefix=${PREFIX} -Doptimize="${CFLAGS}" \
-			-Darchname=${MACHINE_ARCH}-${LOWER_OPSYS} \
-			-Dcc=gcc -Dusemymalloc=false
-CONFIGURE_ARGS+=	-Duseshrplib=true
-MAKE_ENV+=              LD_LIBRARY_PATH=${WRKSRC}
-ALL_TARGET=		lib/Config.pm ${LIBPERL}
-PLIST_SUBST+=		LIBPERL=${LIBPERL}
-
-DYNALOADER_SRCDIR=	${WRKSRC}/ext/DynaLoader
+EXTRACT_ELEMENTS=	${DISTNAME}/ext/DynaLoader
+WRKSRC=			${WRKDIR}/${EXTRACT_ELEMENTS}
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OBJECT_FMT} == "ELF"
-LIBPERL=		libperl.so
+.if ${OPSYS} == "NetBSD"
+.if exists(/usr/libexec/ld.elf_so) || exists(/usr/libexec/ld.so)
+MKPIC?=			yes
 .else
-LIBPERL=		libperl.so.6.0
+MKPIC?=			no
+.endif
 .endif
 
-.if ${OPSYS} == "NetBSD"
-.if !exists(/usr/libexec/ld.elf_so) && !exists(/usr/libexec/ld.so)
+.if ${MKPIC} == "no"
 IGNORE=			${PKGNAME} needs shared objects
 .endif
-.endif
 
-post-build:
-	cd ${DYNALOADER_SRCDIR} &&					\
-		${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL &&		\
-		${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} DynaLoader.o
+do-configure:
+	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
+
+do-build:
+	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} DynaLoader.o
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/${LIBPERL}				\
-		${PERL5_ARCHLIB}/CORE/${LIBPERL}
-	${INSTALL_DATA} ${DYNALOADER_SRCDIR}/DynaLoader.o		\
-		${PERL5_ARCHLIB}/DynaLoader_pic.o
+	${INSTALL_DATA} ${WRKSRC}/DynaLoader.o ${PERL5_ARCHLIB}/DynaLoader_pic.o
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/libperl/pkg/DESCR b/lang/libperl/pkg/DESCR
index f8141f16d55..96de57afbad 100644
--- a/lang/libperl/pkg/DESCR
+++ b/lang/libperl/pkg/DESCR
@@ -5,5 +5,5 @@ and shell.  See the manual page for more hype.  There are also two Nutshell
 Handbooks published by O'Reilly & Assoc.  See pod/perlbook.pod
 for more information.
 
-This package is a placeholder for packages to depend upon when requiring a
-shared libperl.so.
+This package is contains the Perl DynaLoader built as relocatable shared
+object.
diff --git a/lang/libperl/pkg/PLIST b/lang/libperl/pkg/PLIST
index 6bad3d61b42..7a5ae54ea6c 100644
--- a/lang/libperl/pkg/PLIST
+++ b/lang/libperl/pkg/PLIST
@@ -1,3 +1,2 @@
-@comment $NetBSD: PLIST,v 1.4 2001/05/18 13:52:49 jlam Exp $
-${PERL5_ARCHLIB}/CORE/${LIBPERL}
+@comment $NetBSD: PLIST,v 1.5 2001/05/20 05:21:45 jlam Exp $
 ${PERL5_ARCHLIB}/DynaLoader_pic.o