From 9ff0e10340db36b9d69d9c894831dee901dd82e7 Mon Sep 17 00:00:00 2001 From: jlam 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. --- parallel/mpi-ch/buildlink3.mk | 14 +++++++------- parallel/pvm3/buildlink3.mk | 16 ++++++---------- 2 files changed, 13 insertions(+), 17 deletions(-) (limited to 'parallel') diff --git a/parallel/mpi-ch/buildlink3.mk b/parallel/mpi-ch/buildlink3.mk index cadbd58c905..aff86eaddd5 100644 --- a/parallel/mpi-ch/buildlink3.mk +++ b/parallel/mpi-ch/buildlink3.mk @@ -1,5 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/02/12 16:50:53 recht Exp $ -# +# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:39 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ MPICH_BUILDLINK3_MK:= ${MPICH_BUILDLINK3_MK}+ @@ -8,11 +7,12 @@ MPICH_BUILDLINK3_MK:= ${MPICH_BUILDLINK3_MK}+ BUILDLINK_DEPENDS+= mpich .endif -.if !empty(MPICH_BUILDLINK3_MK:M+) -BUILDLINK_PACKAGES+= mpich -BUILDLINK_DEPENDS.mpich+= mpich>=1.2.5.2 -BUILDLINK_PKGSRCDIR.mpich?= ../../parallel/mpi-ch +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmpich} +BUILDLINK_PACKAGES+= mpich -.endif # MPICH_BUILDLINK3_MK +.if !empty(MPICH_BUILDLINK3_MK:M+) +BUILDLINK_DEPENDS.mpich+= mpich>=1.2.5.2 +BUILDLINK_PKGSRCDIR.mpich?= ../../parallel/mpi-ch +.endif # MPICH_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/parallel/pvm3/buildlink3.mk b/parallel/pvm3/buildlink3.mk index e54560af970..0331500c268 100644 --- a/parallel/pvm3/buildlink3.mk +++ b/parallel/pvm3/buildlink3.mk @@ -1,9 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/02/25 03:47:50 dmcmahill Exp $ -# -# This Makefile fragment is included by packages that use pvm. -# -# This file was created automatically using createbuildlink-3.1. -# +# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:39 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PVM_BUILDLINK3_MK:= ${PVM_BUILDLINK3_MK}+ @@ -12,11 +7,12 @@ PVM_BUILDLINK3_MK:= ${PVM_BUILDLINK3_MK}+ BUILDLINK_DEPENDS+= pvm .endif +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npvm} +BUILDLINK_PACKAGES+= pvm + .if !empty(PVM_BUILDLINK3_MK:M+) -BUILDLINK_PACKAGES+= pvm BUILDLINK_DEPENDS.pvm+= pvm>=3.4.3 -BUILDLINK_PKGSRCDIR.pvm?= ../../parallel/pvm3 - -.endif # PVM_BUILDLINK3_MK +BUILDLINK_PKGSRCDIR.pvm?= ../../parallel/pvm3 +.endif # PVM_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} -- cgit v1.2.3