From a61d12971d49c24c815159a139c379540ba1d3d0 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Mon, 22 Jul 2002 22:00:49 +0000
Subject: Adapt to using perl-5.8.0.  Perl 5.8.0 removes the need for libperl
 as DynaLoader.a is now an archive of PIC objects.

---
 databases/postgresql-plperl/Makefile | 4 ++--
 finance/gnucash/Makefile             | 4 ++--
 lang/libperl/Makefile                | 5 +++--
 lang/perl5/buildlink.mk              | 6 +++++-
 mk/bsd.pkg.mk                        | 7 ++++++-
 textproc/eperl/Makefile              | 4 ++--
 www/ap-perl/Makefile                 | 4 ++--
 7 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/databases/postgresql-plperl/Makefile b/databases/postgresql-plperl/Makefile
index e50ba79a25c..371da858d17 100644
--- a/databases/postgresql-plperl/Makefile
+++ b/databases/postgresql-plperl/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2002/04/04 07:41:03 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2002/07/22 22:00:51 jlam Exp $
 
 PKGNAME=		postgresql-plperl-${BASE_VERS}
 COMMENT=		PL/Perl procedural language for the PostgreSQL backend
 
 DEPENDS+=		postgresql-server>=${BASE_VERS}:../../databases/postgresql-server
-DEPENDS+=		libperl>=${LIBPERL5_REQD}:../../lang/libperl
+DEPENDS+=		{libperl>=${LIBPERL5_REQD},perl>=5.8.0}:../../lang/libperl
 
 LIBPERL5_REQD=		${PERL5_REQD}
 USE_BUILDLINK_ONLY=	YES
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index 6c4e5947475..5d5edf3aa9b 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2002/03/13 17:36:58 fredb Exp $
+# $NetBSD: Makefile,v 1.24 2002/07/22 22:00:52 jlam Exp $
 
 DISTNAME=		gnucash-1.6.6
 PKGREVISION=		1
@@ -14,7 +14,7 @@ COMMENT=		Personal double-entry accounting program
 DEPENDS+=		eperl-2.2.14:../../textproc/eperl
 DEPENDS+=		g-wrap>=1.1.10:../../devel/g-wrap
 DEPENDS+=		guppi>=0.40.0nb1:../../math/guppi
-DEPENDS+=		libperl>=${LIBPERL5_REQD}:../../lang/libperl
+DEPENDS+=		{libperl>=${LIBPERL5_REQD},perl>=5.8.0}:../../lang/libperl
 DEPENDS+=		popt>=1.5:../../devel/popt
 DEPENDS+=		swig-1.1p5:../../devel/swig
 DEPENDS+=		glib>=0.99.7:../../devel/glib
diff --git a/lang/libperl/Makefile b/lang/libperl/Makefile
index edd88666bfc..a288cf3565d 100644
--- a/lang/libperl/Makefile
+++ b/lang/libperl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2001/12/03 07:55:43 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2002/07/22 22:00:52 jlam Exp $
 
 .include "../../lang/perl5/Makefile.common"
 
@@ -11,10 +11,11 @@ HOMEPAGE=	http://language.perl.com/index.html
 COMMENT=	Perl DynaLoader as a shared object
 
 USE_BUILDLINK_ONLY=	YES
-PERL5_REQD=		${PERL5_DIST_VERS}
 EXTRACT_ELEMENTS=	${DISTNAME}/ext/DynaLoader
 WRKSRC=			${WRKDIR}/${EXTRACT_ELEMENTS}
 
+#BUILDLINK_DEPENDS.perl=	perl-${PERL5_DIST_VERS}*
+
 .include "../../mk/bsd.prefs.mk"
 
 MKPIC?=		yes
diff --git a/lang/perl5/buildlink.mk b/lang/perl5/buildlink.mk
index cdc2da7d47f..ee69bcdd4b2 100644
--- a/lang/perl5/buildlink.mk
+++ b/lang/perl5/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.8 2001/12/11 06:08:58 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.9 2002/07/22 22:00:53 jlam Exp $
 #
 # This Makefile fragment is included by packages that use perl.
 #
@@ -10,7 +10,11 @@
 
 .include "../../mk/bsd.buildlink.mk"
 
+.if ${OPSYS} == "Darwin"
+PERL5_REQD?=			5.8.0
+.else
 PERL5_REQD?=			5.0
+.endif
 BUILDLINK_DEPENDS.perl?=	perl>=${PERL5_REQD}
 
 BUILDLINK_PREFIX.perl?=	${LOCALBASE}
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 5c734f1a35a..9cbfa7d0b10 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1010 2002/07/22 02:33:55 jschauma Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1011 2002/07/22 22:00:49 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -204,7 +204,12 @@ BUILD_DEFS+=		KERBEROS
 
 PERL5_REQD?=		5.0
 .if defined(USE_PERL5)
+.  if ${OPSYS} == "Darwin"
+PERL5_REQD=		5.8.0
+DEPENDS+=		perl>=${PERL5_REQD}:../../lang/perl58
+.  else
 DEPENDS+=		perl>=${PERL5_REQD}:../../lang/perl5
+.  endif
 .  if exists(${PERL5})
 .    if exists(${LOCALBASE}/share/mk/bsd.perl.mk)
 .      include "${LOCALBASE}/share/mk/bsd.perl.mk"
diff --git a/textproc/eperl/Makefile b/textproc/eperl/Makefile
index a577d448380..dd7cd98bd73 100644
--- a/textproc/eperl/Makefile
+++ b/textproc/eperl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/03/15 17:05:37 skrll Exp $
+# $NetBSD: Makefile,v 1.13 2002/07/22 22:00:53 jlam Exp $
 
 DISTNAME=	eperl-2.2.14
 CATEGORIES=	lang perl5 textproc
@@ -8,7 +8,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.engelschall.com/sw/eperl/
 COMMENT=	Interpreter/preprocessor for Perl embedded in text documents
 
-DEPENDS=	libperl>=${LIBPERL5_REQD}:../../lang/libperl
+DEPENDS=	{libperl>=${LIBPERL5_REQD},perl>=5.8.0}:../../lang/libperl
 
 USE_PERL5=	# defined
 LIBPERL5_REQD=	${PERL5_REQD}
diff --git a/www/ap-perl/Makefile b/www/ap-perl/Makefile
index d6f9bd9aa16..86398528802 100644
--- a/www/ap-perl/Makefile
+++ b/www/ap-perl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2002/07/02 13:00:52 grant Exp $
+# $NetBSD: Makefile,v 1.21 2002/07/22 22:00:54 jlam Exp $
 #
 
 DISTNAME=		mod_perl-1.27
@@ -12,7 +12,7 @@ HOMEPAGE=		http://perl.apache.org/
 COMMENT=		Module that embeds a Perl interpreter into Apache
 
 DEPENDS+=		${BUILDLINK_DEPENDS.apache}:../../www/apache
-DEPENDS+=		libperl>=${LIBPERL5_REQD}:../../lang/libperl
+DEPENDS+=		{libperl>=${LIBPERL5_REQD},perl>=5.8.0}:../../lang/libperl
 DEPENDS+=		p5-BSD-Resource>=1.10:../../devel/p5-BSD-Resource
 
 USE_BUILDLINK_ONLY=	YES
-- 
cgit v1.2.3