Reorder location and setting of BUILDLINK_PACKAGES to match template

buildlink3.mk file in revision 1.101 of bsd.buildlink3.mk.

1 files changed, 19 insertions, 19 deletions

diff --git a/lang/perl5/buildlink3.mk b/lang/perl5/buildlink3.mk
index a2849b4d4c7..8db263b5db4 100644
--- a/lang/perl5/buildlink3.mk
+++ b/lang/perl5/buildlink3.mk
@@ -1,29 +1,28 @@
-# $NetBSD: buildlink3.mk,v 1.12 2004/02/10 02:18:04 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2004/03/05 19:25:36 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PERL5_BUILDLINK3_MK:=	${PERL5_BUILDLINK3_MK}+
 
-.if !empty(PERL5_BUILDLINK3_MK:M+)
-.  include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.prefs.mk"
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	perl
+.endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nperl}
+BUILDLINK_PACKAGES+=	perl
+
+.if !empty(PERL5_BUILDLINK3_MK:M+)
 USE_PERL5?=	run
 PERL5_REQD+=	5.0
 
 BUILDLINK_DEPENDS.perl+=	perl>=${_PERL5_REQD}
 BUILDLINK_PKGSRCDIR.perl?=	${PERL5_PKGSRCDIR}
 
-.  if !empty(USE_PERL5:M[bB][uU][iI][lL][dD])
+.if !empty(USE_PERL5:M[bB][uU][iI][lL][dD])
 BUILDLINK_DEPMETHOD.perl?=	build
-.  endif
-.endif  # PERL5_BUILDLINK3_MK
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	perl
 .endif
 
-.if !empty(PERL5_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=	perl
-
 _PERL5_SITEVARS=							\
 	INSTALLSITEBIN INSTALLSITELIB INSTALLSITEARCH			\
 	INSTALLSITEMAN1DIR INSTALLSITEMAN3DIR				\
@@ -37,8 +36,8 @@ _PERL5_SITEVAR.INSTALLSITEMAN3DIR=	installsiteman3dir
 _PERL5_SITEVAR.SITELIBEXP=		sitelibexp
 _PERL5_SITEVAR.SITEARCHEXP=		sitearchexp
 
-.  if exists(${PERL5})
-.    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 +45,13 @@ _PERL5_SITEPREFIX!=	\
 MAKEFLAGS+=	_PERL5_PREFIX=${_PERL5_PREFIX:Q}
 MAKEFLAGS+=	_PERL5_SITEPREFIX=${_PERL5_SITEPREFIX:Q}
 
-.      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_}:Q}
-.      endfor
+.    endfor
 PERL5_SUB_INSTALLARCHLIB!=	\
 	eval `${PERL5} -V:installarchlib 2>/dev/null`;			\
 	${ECHO} $$installarchlib |					\
@@ -63,8 +62,8 @@ PERL5_SUB_INSTALLSCRIPT!=	\
 	${ECHO} $$installscript |					\
 	${SED} -e "s,^${_PERL5_PREFIX}/,,"
 MAKEFLAGS+=	PERL5_SUB_INSTALLSCRIPT=${PERL5_SUB_INSTALLSCRIPT:Q}
-.    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
@@ -73,8 +72,9 @@ MAKEFLAGS+=	PERL5_SUB_INSTALLSCRIPT=${PERL5_SUB_INSTALLSCRIPT:Q}
 BUILDLINK_FILES.perl=							\
 	${PERL5_SUB_INSTALLARCHLIB}/CORE/*				\
 	${PERL5_SUB_INSTALLARCHLIB}/auto/DynaLoader/DynaLoader.a
-.    endif
 .  endif
+.endif
+
 .endif  # PERL5_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}