[pkgsrc/trunk]: pkgsrc/lang/perl5 Rearrange order of tests and protect more o...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f99477ea74e1
branches:  trunk
changeset: 466207:f99477ea74e1
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Jan 13 07:12:01 2004 +0000

description:
Rearrange order of tests and protect more of the code that depends on
${PERL5} being present from being seen if ${PERL5} is in fact not there.

diffstat:

 lang/perl5/buildlink2.mk |   8 ++++----
 lang/perl5/buildlink3.mk |  15 +++++++--------
 2 files changed, 11 insertions(+), 12 deletions(-)

diffs (89 lines):

diff -r 01007eb0819f -r f99477ea74e1 lang/perl5/buildlink2.mk
--- a/lang/perl5/buildlink2.mk  Tue Jan 13 06:55:31 2004 +0000
+++ b/lang/perl5/buildlink2.mk  Tue Jan 13 07:12:01 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.8 2004/01/12 15:50:22 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.9 2004/01/13 07:12:01 jlam Exp $
 
 .if !defined(PERL5_BUILDLINK2_MK)
 PERL5_BUILDLINK2_MK=  # defined
@@ -33,8 +33,8 @@
 _PERL5_SITEVAR.SITELIBEXP=             sitelibexp
 _PERL5_SITEVAR.SITEARCHEXP=            sitearchexp
 
-.if !defined(_PERL5_SITEPREFIX)
-.  if exists(${PERL5})
+.if exists(${PERL5})
+.  if !defined(_PERL5_SITEPREFIX)
 _PERL5_PREFIX!=                \
        eval `${PERL5} -V:prefix 2>/dev/null`; ${ECHO} $$prefix
 _PERL5_SITEPREFIX!=    \
@@ -60,11 +60,11 @@
        ${SED} -e "s,^${_PERL5_PREFIX}/,,"
 MAKEFLAGS+=    PERL5_SUB_INSTALLSCRIPT="${PERL5_SUB_INSTALLSCRIPT}"
 .  endif
-.endif
 
 BUILDLINK_FILES.perl=                                                  \
        ${PERL5_SUB_INSTALLARCHLIB}/CORE/*                              \
        ${PERL5_SUB_INSTALLARCHLIB}/auto/DynaLoader/DynaLoader.a
+.endif
 
 BUILDLINK_TARGETS+=    perl-buildlink
 
diff -r 01007eb0819f -r f99477ea74e1 lang/perl5/buildlink3.mk
--- a/lang/perl5/buildlink3.mk  Tue Jan 13 06:55:31 2004 +0000
+++ b/lang/perl5/buildlink3.mk  Tue Jan 13 07:12:01 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/01/12 15:50:22 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/01/13 07:12:01 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 PERL5_BUILDLINK3_MK:=  ${PERL5_BUILDLINK3_MK}+
@@ -37,8 +37,8 @@
 _PERL5_SITEVAR.SITELIBEXP=             sitelibexp
 _PERL5_SITEVAR.SITEARCHEXP=            sitearchexp
 
-.if !defined(_PERL5_SITEPREFIX)
 .  if exists(${PERL5})
+.    if !defined(_PERL5_SITEPREFIX)
 _PERL5_PREFIX!=                \
        eval `${PERL5} -V:prefix 2>/dev/null`; ${ECHO} $$prefix
 _PERL5_SITEPREFIX!=    \
@@ -46,13 +46,13 @@
 MAKEFLAGS+=    _PERL5_PREFIX="${_PERL5_PREFIX}"
 MAKEFLAGS+=    _PERL5_SITEPREFIX="${_PERL5_SITEPREFIX}"
 
-.    for _var_ in ${_PERL5_SITEVARS}
+.      for _var_ in ${_PERL5_SITEVARS}
 PERL5_SUB_${_var_}!=   \
        eval `${PERL5} -V:${_PERL5_SITEVAR.${_var_}} 2>/dev/null`;      \
        ${ECHO} $${${_PERL5_SITEVAR.${_var_}}} |                        \
        ${SED} -e "s,^${_PERL5_SITEPREFIX}/,,"
 MAKEFLAGS+=    PERL5_SUB_${_var_}="${PERL5_SUB_${_var_}}"
-.    endfor
+.      endfor
 PERL5_SUB_INSTALLARCHLIB!=     \
        eval `${PERL5} -V:installarchlib 2>/dev/null`;                  \
        ${ECHO} $$installarchlib |                                      \
@@ -63,10 +63,8 @@
        ${ECHO} $$installscript |                                       \
        ${SED} -e "s,^${_PERL5_PREFIX}/,,"
 MAKEFLAGS+=    PERL5_SUB_INSTALLSCRIPT="${PERL5_SUB_INSTALLSCRIPT}"
-.  endif
-.endif
-
-.  if ${PKG_INSTALLATION_TYPE} == "overwrite"
+.    endif
+.    if ${PKG_INSTALLATION_TYPE} == "overwrite"
 #
 # Perl keeps headers and odd libraries in an odd path not caught by the
 # default BUILDLINK_FILES_CMD, so name them to be symlinked into
@@ -75,6 +73,7 @@
 BUILDLINK_FILES.perl=                                                  \
        ${PERL5_SUB_INSTALLARCHLIB}/CORE/*                              \
        ${PERL5_SUB_INSTALLARCHLIB}/auto/DynaLoader/DynaLoader.a
+.    endif
 .  endif
 .endif  # PERL5_BUILDLINK3_MK