Re-arrange to match example buildlink3.mk file in bsd.buildlink3.mk.

4 files changed, 26 insertions, 33 deletions

diff --git a/lang/libperl/buildlink3.mk b/lang/libperl/buildlink3.mk
index c410f8be273..f744bcea9ba 100644
--- a/lang/libperl/buildlink3.mk
+++ b/lang/libperl/buildlink3.mk
@@ -1,20 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:44 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:06 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBPERL_BUILDLINK3_MK:=	${LIBPERL_BUILDLINK3_MK}+
 
-.if !empty(LIBPERL_BUILDLINK3_MK:M\+)
-LIBPERL5_REQD?=			${PERL5_REQD}
-BUILDLINK_DEPENDS.libperl?=	{libperl>=${LIBPERL5_REQD},perl>=5.8.0}
-BUILDLINK_PKGSRCDIR.libperl?=	../../lang/libperl
-.endif	# LIBPERL_BUILDLINK3_MK
-
-.if !empty(BUILDLINK_DEPTH:M\+)
+.if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	libperl
 .endif
 
-.if !empty(LIBPERL_BUILDLINK3_MK:M\+)
-BUILDLINK_PACKAGES+=	libperl
+.if !empty(LIBPERL_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=		libperl
+BUILDLINK_DEPENDS.libperl?=	{libperl>=${LIBPERL5_REQD},perl>=5.8.0}
+BUILDLINK_PKGSRCDIR.libperl?=	../../lang/libperl
+
+LIBPERL5_REQD?=		${PERL5_REQD}
 
 .  include "../../lang/perl5/buildlink3.mk"
 .endif	# LIBPERL_BUILDLINK3_MK
diff --git a/lang/ocaml/buildlink3.mk b/lang/ocaml/buildlink3.mk
index d3f9174f2bc..871d01aa92b 100644
--- a/lang/ocaml/buildlink3.mk
+++ b/lang/ocaml/buildlink3.mk
@@ -1,20 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:44 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:06 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OCAML_BUILDLINK3_MK:=	${OCAML_BUILDLINK3_MK}+
 
-.if !empty(OCAML_BUILDLINK3_MK:M\+)
-BUILDLINK_DEPENDS.ocaml?=	ocaml>=3.06
-BUILDLINK_PKGSRCDIR.ocaml?=	../../lang/ocaml
-BUILDLINK_DEPMETHOD.ocaml?=	build
-.endif	# OCAML_BUILDLINK3_MK
-
-.if !empty(BUILDLINK_DEPTH:M\+)
+.if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	ocaml
 .endif
 
-.if !empty(OCAML_BUILDLINK3_MK:M\+)
-BUILDLINK_PACKAGES+=	ocaml
+.if !empty(OCAML_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=		ocaml
+BUILDLINK_DEPENDS.ocaml?=	ocaml>=3.06
+BUILDLINK_PKGSRCDIR.ocaml?=	../../lang/ocaml
+BUILDLINK_DEPMETHOD.ocaml?=	build
 .endif	# OCAML_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
diff --git a/lang/perl5/buildlink3.mk b/lang/perl5/buildlink3.mk
index 571476e6bc7..f21086052fc 100644
--- a/lang/perl5/buildlink3.mk
+++ b/lang/perl5/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:44 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:06 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PERL5_BUILDLINK3_MK:=	${PERL5_BUILDLINK3_MK}+
 
-.if !empty(PERL5_BUILDLINK3_MK:M\+)
+.if !empty(PERL5_BUILDLINK3_MK:M+)
 .  include "../../mk/bsd.prefs.mk"
 
 USE_PERL5?=	run
@@ -17,11 +17,11 @@ BUILDLINK_DEPMETHOD.perl?=	build
 .  endif
 .endif  # PERL5_BUILDLINK3_MK
 
-.if !empty(BUILDLINK_DEPTH:M\+)
+.if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	perl
 .endif
 
-.if !empty(PERL5_BUILDLINK3_MK:M\+)
+.if !empty(PERL5_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=	perl
 
 _PERL5_SITEVARS=							\
diff --git a/lang/tcl/buildlink3.mk b/lang/tcl/buildlink3.mk
index f07d0b27dd9..c8e3a572f7b 100644
--- a/lang/tcl/buildlink3.mk
+++ b/lang/tcl/buildlink3.mk
@@ -1,19 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:44 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:06 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 TCL_BUILDLINK3_MK:=	${TCL_BUILDLINK3_MK}+
 
-.if !empty(TCL_BUILDLINK3_MK:M\+)
-BUILDLINK_DEPENDS.tcl?=		tcl>=8.3.4
-BUILDLINK_PKGSRCDIR.tcl?=	../../lang/tcl
-.endif	# TCL_BUILDLINK3_MK
-
-.if !empty(BUILDLINK_DEPTH:M\+)
+.if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	tcl
 .endif
 
-.if !empty(TCL_BUILDLINK3_MK:M\+)
-BUILDLINK_PACKAGES+=	tcl
+.if !empty(TCL_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=		tcl
+BUILDLINK_DEPENDS.tcl?=		tcl>=8.3.4
+BUILDLINK_PKGSRCDIR.tcl?=	../../lang/tcl
+
 BUILDLINK_FILES.tcl=	bin/tclsh*
 #
 # Make "-ltcl" resolve into "-ltcl83", so that we don't need to patch so