summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2004-12-10 04:25:09 +0000
committerjlam <jlam@pkgsrc.org>2004-12-10 04:25:09 +0000
commit82d866954bcbdb5cacb2fb9bfe34b771d4661ff5 (patch)
treef117ae212fd26e3f3c5692fa26f26e6ea732afd4 /mk
parent9dd16adef419924b33633d4ce9c52fece0ef85b5 (diff)
downloadpkgsrc-82d866954bcbdb5cacb2fb9bfe34b771d4661ff5.tar.gz
Nuke bsd.perl.mk... we compute these values where they're needed in
perl5/buildlink3.mk already, so no need to include this file in bsd.pkg.mk anymore.
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.pkg.mk6
1 files changed, 1 insertions, 5 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 3e30c73e92a..bbdb293df74 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1545 2004/12/03 15:15:04 wiz Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1546 2004/12/10 04:25:09 jlam Exp $
#
# This file is in the public domain.
#
@@ -315,16 +315,12 @@ ${_PERL5_DEPMETHOD}+= ${_PERL5_DEPENDS}:${PERL5_PKGSRCDIR}
.if defined(USE_PERL5) && (${USE_PERL5} == "run")
. if !defined(PERL5_SITELIB) || !defined(PERL5_SITEARCH) || !defined(PERL5_ARCHLIB)
. if exists(${PERL5})
-. if exists(${LOCALBASE}/share/mk/bsd.perl.mk)
-. include "${LOCALBASE}/share/mk/bsd.perl.mk"
-. else
PERL5_SITELIB!= eval `${PERL5} -V:installsitelib 2>/dev/null`; \
${ECHO} $${installsitelib}
PERL5_SITEARCH!= eval `${PERL5} -V:installsitearch 2>/dev/null`; \
${ECHO} $${installsitearch}
PERL5_ARCHLIB!= eval `${PERL5} -V:installarchlib 2>/dev/null`; \
${ECHO} $${installarchlib}
-. endif # !exists(bsd.perl.mk)
. if ${PKG_INSTALLATION_TYPE} == "overwrite"
_PERL5_PREFIX!= eval `${PERL5} -V:prefix 2>/dev/null`; \
${ECHO} $${prefix}