From afe13927bc95790c8a1e766bddb44d489c029bcf Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Fri, 5 Mar 2004 19:25:06 +0000
Subject: Reorder location and setting of BUILDLINK_PACKAGES to match template
 buildlink3.mk file in revision 1.101 of bsd.buildlink3.mk.

---
 lang/gcc3-c/buildlink3.mk | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'lang/gcc3-c')

diff --git a/lang/gcc3-c/buildlink3.mk b/lang/gcc3-c/buildlink3.mk
index 49b600bfd27..ac946757f5b 100644
--- a/lang/gcc3-c/buildlink3.mk
+++ b/lang/gcc3-c/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/02/05 20:58:41 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:36 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GCC3C_BUILDLINK3_MK:=	${GCC3C_BUILDLINK3_MK}+
@@ -9,6 +9,9 @@ GCC3C_BUILDLINK3_MK:=	${GCC3C_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	gcc3c
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngcc3c}
+BUILDLINK_PACKAGES+=	gcc3c
+
 .if !empty(GCC3C_BUILDLINK3_MK:M+)
 .  if defined(GCC3_INSTALLTO_SUBPREFIX)
 #
@@ -16,21 +19,21 @@ BUILDLINK_DEPENDS+=	gcc3c
 # as GCC3_DEFAULT_SUBPREFIX.
 #
 .    if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3"
-GCC3_PKGMODIF=			_${GCC3_INSTALLTO_SUBPREFIX}
+GCC3_PKGMODIF=	_${GCC3_INSTALLTO_SUBPREFIX}
 .    endif
 .  endif
-BUILDLINK_PACKAGES+=		gcc3c
 BUILDLINK_DEPENDS.gcc3c+=	gcc3${GCC3_PKGMODIF}-c>=${_GCC_REQD}
 BUILDLINK_PKGSRCDIR.gcc3c?=	../../lang/gcc3-c
 BUILDLINK_LIBDIRS.gcc3c?=	\
 	lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3c}\///}
 
 # Packages that link against shared libraries need a full dependency.
-.  if defined(USE_GCC_SHLIB)
+.if defined(USE_GCC_SHLIB)
 BUILDLINK_DEPMETHOD.gcc3c+=	full
-.  else
+.else
 BUILDLINK_DEPMETHOD.gcc3c?=	build
-.  endif
+.endif
+
 .endif	# GCC3C_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
-- 
cgit v1.2.3