pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk Nuke bsd.perl.mk... we compute these values where t...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/cbc8a549bbc6
branches:  trunk
changeset: 485396:cbc8a549bbc6
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Dec 10 04:25:09 2004 +0000

description:
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:

 mk/bsd.pkg.mk |  6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diffs (26 lines):

diff -r 9a0400ea277d -r cbc8a549bbc6 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Fri Dec 10 02:51:46 2004 +0000
+++ b/mk/bsd.pkg.mk     Fri Dec 10 04:25:09 2004 +0000
@@ -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 @@
 .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}



Home | Main Index | Thread Index | Old Index