Update libperl to 5.6.0nb2. Changes from version 5.6.0nb1 include adding

back a dynamic libperl.so to the installation, needed as a result of a
change made on 2000-11-08 to the perl5-base package to not build against a
dynamic libperl.so.

3 files changed, 27 insertions, 16 deletions

diff --git a/lang/libperl/Makefile b/lang/libperl/Makefile
index 9ed44a79dd7..50341ad6a47 100644
--- a/lang/libperl/Makefile
+++ b/lang/libperl/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2001/02/17 09:07:18 agc Exp $
+# $NetBSD: Makefile,v 1.15 2001/05/11 14:52:21 jlam Exp $
 
 DISTNAME=		perl-${PERL_VERSION}
-PKGNAME=		libperl-${PERL_VERSION}nb1
+PKGNAME=		libperl-${PERL_VERSION}nb2
 PERL_VERSION=		5.6.0
 CATEGORIES=		lang devel perl5
 MASTER_SITES=		ftp://ftp.digital.com/pub/plan/perl/CPAN/src/5.0/ \
@@ -12,10 +12,22 @@ HOMEPAGE=		http://language.perl.com/index.html
 COMMENT=		PERL core library and DynaLoader as a shared object
 
 USE_PERL5=		# defined
-DEPENDS+=		perl>=${PERL_VERSION}:../../lang/perl5
+PERL_REQD=		${PERL_VERSION}nb1
 
-EXTRACT_ELEMENTS=	${DISTNAME}/ext/DynaLoader
-WRKSRC=			${WRKDIR}/${EXTRACT_ELEMENTS}
+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.so
+
+DYNALOADER_SRCDIR=	${WRKSRC}/ext/DynaLoader
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -25,13 +37,15 @@ IGNORE=			${PKGNAME} needs shared objects
 .endif
 .endif
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
-do-build:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} DynaLoader.o
+post-build:
+	cd ${DYNALOADER_SRCDIR} &&					\
+		${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL &&		\
+		${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} DynaLoader.o
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/DynaLoader.o ${PERL5_ARCHLIB}/DynaLoader_pic.o
+	${INSTALL_DATA} ${WRKSRC}/libperl.so				\
+		${PERL5_ARCHLIB}/CORE/libperl.so
+	${INSTALL_DATA} ${DYNALOADER_SRCDIR}/DynaLoader.o		\
+		${PERL5_ARCHLIB}/DynaLoader_pic.o
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/libperl/distinfo b/lang/libperl/distinfo
deleted file mode 100644
index aca7b7353ac..00000000000
--- a/lang/libperl/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 15:00:53 agc Exp $
-
-SHA1 (perl-5.6.0.tar.gz) = a2e9da9c82116a9094cc0f92c248c4339fda89fa
-Size (perl-5.6.0.tar.gz) = 5443601 bytes
diff --git a/lang/libperl/pkg/PLIST b/lang/libperl/pkg/PLIST
index 2f555f04798..74329526bef 100644
--- a/lang/libperl/pkg/PLIST
+++ b/lang/libperl/pkg/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.2 2000/09/07 04:37:56 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/05/11 14:52:22 jlam Exp $
+${PERL5_ARCHLIB}/CORE/libperl.so
 ${PERL5_ARCHLIB}/DynaLoader_pic.o