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

7 files changed, 45 insertions, 63 deletions

diff --git a/databases/db/buildlink3.mk b/databases/db/buildlink3.mk
index a9518948b67..fbb6638add0 100644
--- a/databases/db/buildlink3.mk
+++ b/databases/db/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:43 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 DB2_BUILDLINK3_MK:=	${DB2_BUILDLINK3_MK}+
 
-.if !empty(DB2_BUILDLINK3_MK:M\+)
+.if !empty(DB2_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		db
 BUILDLINK_DEPENDS.db?=		db>=2.7.3
 BUILDLINK_PKGSRCDIR.db?=	../../databases/db
@@ -26,12 +26,12 @@ MAKEFLAGS+=	_NEED_DB2="${_NEED_DB2}"
 .endif
 
 .if ${_NEED_DB2} == "YES"
-.  if !empty(BUILDLINK_DEPTH:M\+)
+.  if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	db
 .  endif
 .endif
 
-.if !empty(DB2_BUILDLINK3_MK:M\+)
+.if !empty(DB2_BUILDLINK3_MK:M+)
 .  if ${_NEED_DB2} == "YES"
 BUILDLINK_INCDIRS.db=	include/db2
 BUILDLINK_TRANSFORM+=	l:db:db2
diff --git a/databases/db3/buildlink3.mk b/databases/db3/buildlink3.mk
index bd5f19685cc..fb46d1ce397 100644
--- a/databases/db3/buildlink3.mk
+++ b/databases/db3/buildlink3.mk
@@ -1,19 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:43 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 DB3_BUILDLINK3_MK:=	${DB3_BUILDLINK3_MK}+
 
-.if !empty(DB3_BUILDLINK3_MK:M\+)
-BUILDLINK_DEPENDS.db3?=		db3>=2.9.2
-BUILDLINK_PKGSRCDIR.db3?=	../../databases/db3
-.endif	# DB3_BUILDLINK3_MK
-
-.if !empty(BUILDLINK_DEPTH:M\+)
+.if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	db3
 .endif
 
-.if !empty(DB3_BUILDLINK3_MK:M\+)
-BUILDLINK_PACKAGES+=	db3
+.if !empty(DB3_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=		db3
+BUILDLINK_DEPENDS.db3?=		db3>=2.9.2
+BUILDLINK_PKGSRCDIR.db3?=	../../databases/db3
 .endif	# DB3_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
diff --git a/databases/db4/buildlink3.mk b/databases/db4/buildlink3.mk
index 14524df16c0..6c49ff3ea93 100644
--- a/databases/db4/buildlink3.mk
+++ b/databases/db4/buildlink3.mk
@@ -1,20 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:43 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 DB4_BUILDLINK3_MK:=	${DB4_BUILDLINK3_MK}+
 
-.if !empty(DB4_BUILDLINK3_MK:M\+)
-BUILDLINK_DEPENDS.db4?=		db4>=4.1.25
-BUILDLINK_PKGSRCDIR.db4?=	../../databases/db4
-BUILDLINK_CPPFLAGS.db4?=	-I${BUILDLINK_PREFIX.db4}/include/db4
-.endif	# DB4_BUILDLINK3_MK
-
-.if !empty(BUILDLINK_DEPTH:M\+)
+.if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	db4
 .endif
 
-.if !empty(DB4_BUILDLINK3_MK:M\+)
-BUILDLINK_PACKAGES+=	db4
+.if !empty(DB4_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=		db4
+BUILDLINK_DEPENDS.db4?=		db4>=4.1.25
+BUILDLINK_PKGSRCDIR.db4?=	../../databases/db4
+BUILDLINK_CPPFLAGS.db4?=	-I${BUILDLINK_PREFIX.db4}/include/db4
 .endif	# DB4_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
diff --git a/databases/mysql-client/buildlink3.mk b/databases/mysql-client/buildlink3.mk
index 6b19103f3b3..da13371341b 100644
--- a/databases/mysql-client/buildlink3.mk
+++ b/databases/mysql-client/buildlink3.mk
@@ -1,22 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:43 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 MYSQL_CLIENT_BUILDLINK3_MK:=	${MYSQL_CLIENT_BUILDLINK3_MK}+
 
-.if !empty(MYSQL_CLIENT_BUILDLINK3_MK:M\+)
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	mysql-client
+.endif
+
+.if !empty(MYSQL_CLIENT_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=			mysql-client
 BUILDLINK_DEPENDS.mysql-client?=	mysql-client>=3.23.58
 BUILDLINK_PKGSRCDIR.mysql-client?=	../../databases/mysql-client
 BUILDLINK_LDFLAGS.mysql-client?=	\
 	-L${BUILDLINK_PREFIX.mysql-client}/lib/mysql			\
 	-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.mysql-client}/lib/mysql
-.endif	# MYSQL_CLIENT_BUILDLINK3_MK
-
-.if !empty(BUILDLINK_DEPTH:M\+)
-BUILDLINK_DEPENDS+=	mysql-client
-.endif
-
-.if !empty(MYSQL_CLIENT_BUILDLINK3_MK:M\+)
-BUILDLINK_PACKAGES+=	mysql-client
 
 .  include "../../devel/zlib/buildlink3.mk"
 .endif	# MYSQL_CLIENT_BUILDLINK3_MK
diff --git a/databases/openldap/buildlink3.mk b/databases/openldap/buildlink3.mk
index 85194a528b0..b932e274033 100644
--- a/databases/openldap/buildlink3.mk
+++ b/databases/openldap/buildlink3.mk
@@ -1,21 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:43 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 OPENLDAP_BUILDLINK3_MK:=	${OPENLDAP_BUILDLINK3_MK}+
 
-.if !empty(OPENLDAP_BUILDLINK3_MK:M\+)
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	openldap
+.endif
+
+.if !empty(OPENLDAP_BUILDLINK3_MK:M+)
 .  include "../../mk/bsd.prefs.mk"
 
+BUILDLINK_PACKAGES+=		openldap
 BUILDLINK_DEPENDS.openldap?=	openldap>=2.1.22
 BUILDLINK_PKGSRCDIR.openldap?=	../../databases/openldap
-.endif	# OPENLDAP_BUILDLINK3_MK
-
-.if !empty(BUILDLINK_DEPTH:M\+)
-BUILDLINK_DEPENDS+=	openldap
-.endif
-
-.if !empty(OPENLDAP_BUILDLINK3_MK:M\+)
-BUILDLINK_PACKAGES+=	openldap
 
 .  if defined(USE_SASL2) && (${USE_SASL2} == "YES")
 .    include "../../security/cyrus-sasl2/buildlink3.mk"
diff --git a/databases/p5-DBI/buildlink3.mk b/databases/p5-DBI/buildlink3.mk
index ff21b0785b0..0c302fcd7c7 100644
--- a/databases/p5-DBI/buildlink3.mk
+++ b/databases/p5-DBI/buildlink3.mk
@@ -1,20 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:43 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 P5_DBI_BUILDLINK3_MK:=	${P5_DBI_BUILDLINK3_MK}+
 
-.if !empty(P5_DBI_BUILDLINK3_MK:M\+)
-BUILDLINK_DEPENDS.p5-DBI?=	p5-DBI>=1.30
-BUILDLINK_PKGSRCDIR.p5-DBI?=	../../databases/p5-DBI
-BUILDLINK_INCDIRS.p5-DBI?=	${PERL5_SUB_INSTALLSITEARCH}/auto/DBI
-.endif	# P5_DBI_BUILDLINK3_MK
-
-.if !empty(BUILDLINK_DEPTH:M\+)
+.if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	p5-DBI
 .endif
 
-.if !empty(P5_DBI_BUILDLINK3_MK:M\+)
-BUILDLINK_PACKAGES+=	p5-DBI
+.if !empty(P5_DBI_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=		p5-DBI
+BUILDLINK_DEPENDS.p5-DBI?=	p5-DBI>=1.30
+BUILDLINK_PKGSRCDIR.p5-DBI?=	../../databases/p5-DBI
+BUILDLINK_INCDIRS.p5-DBI?=	${PERL5_SUB_INSTALLSITEARCH}/auto/DBI
 
 .  include "../../lang/perl5/buildlink3.mk"
 .endif	# P5_DBI_BUILDLINK3_MK
diff --git a/databases/postgresql-lib/buildlink3.mk b/databases/postgresql-lib/buildlink3.mk
index d4533bc1934..d4fc7a050ab 100644
--- a/databases/postgresql-lib/buildlink3.mk
+++ b/databases/postgresql-lib/buildlink3.mk
@@ -1,20 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:43 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 POSTGRESQL_LIB_BUILDLINK3_MK:=	${POSTGRESQL_LIB_BUILDLINK3_MK}+
 
-.if !empty(POSTGRESQL_LIB_BUILDLINK3_MK:M\+)
-BUILDLINK_DEPENDS.postgresql-lib?=	postgresql-lib>=7.3.1
-BUILDLINK_PKGSRCDIR.postgresql-lib?=	../../databases/postgresql-lib
-BUILDLINK_INCDIRS.postgresql-lib?=	include/postgresql
-.endif	# POSTGRESQL_LIB_BUILDLINK3_MK
-
-.if !empty(BUILDLINK_DEPTH:M\+)
+.if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	postgresql-lib
 .endif
 
-.if !empty(POSTGRESQL_LIB_BUILDLINK3_MK:M\+)
-BUILDLINK_PACKAGES+=	postgresql-lib
+.if !empty(POSTGRESQL_LIB_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=			postgresql-lib
+BUILDLINK_DEPENDS.postgresql-lib?=	postgresql-lib>=7.3.1
+BUILDLINK_PKGSRCDIR.postgresql-lib?=	../../databases/postgresql-lib
+BUILDLINK_INCDIRS.postgresql-lib?=	include/postgresql
 
 .  include "../../security/openssl/buildlink3.mk"
 .endif	# POSTGRESQL_LIB_BUILDLINK3_MK