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

6 files changed, 30 insertions, 39 deletions

diff --git a/security/PAM/buildlink3.mk b/security/PAM/buildlink3.mk
index 393cb0a66f9..1866c8f0be9 100644
--- a/security/PAM/buildlink3.mk
+++ b/security/PAM/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:07 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PAM_BUILDLINK3_MK:=	${PAM_BUILDLINK3_MK}+
 
-.if !empty(PAM_BUILDLINK3_MK:M\+)
+.if !empty(PAM_BUILDLINK3_MK:M+)
 .  include "../../mk/bsd.prefs.mk"
 
 BUILDLINK_DEPENDS.pam?=		PAM>=0.75
@@ -33,12 +33,12 @@ MAKEFLAGS+=	_NEED_PAM="${_NEED_PAM}"
 .endif
 
 .if ${_NEED_PAM} == "YES"
-.  if !empty(BUILDLINK_DEPTH:M\+)
+.  if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	pam
 .  endif
 .endif
 
-.if !empty(PAM_BUILDLINK3_MK:M\+)
+.if !empty(PAM_BUILDLINK3_MK:M+)
 .  if ${_NEED_PAM} == "YES"
 BUILDLINK_PACKAGES+=	pam
 .  else
diff --git a/security/cyrus-sasl2/buildlink3.mk b/security/cyrus-sasl2/buildlink3.mk
index b4db1364cff..479255e3449 100644
--- a/security/cyrus-sasl2/buildlink3.mk
+++ b/security/cyrus-sasl2/buildlink3.mk
@@ -1,19 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:07 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 CYRUS_SASL_BUILDLINK3_MK:=	${CYRUS_SASL_BUILDLINK3_MK}+
 
-.if !empty(CYRUS_SASL_BUILDLINK3_MK:M\+)
-BUILDLINK_DEPENDS.cyrus-sasl?=		cyrus-sasl>=2.1.12
-BUILDLINK_PKGSRCDIR.cyrus-sasl?=	../../security/cyrus-sasl2
-.endif	# CYRUS_SASL_BUILDLINK3_MK
-
-.if !empty(BUILDLINK_DEPTH:M\+)
+.if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	cyrus-sasl
 .endif
 
-.if !empty(CYRUS_SASL_BUILDLINK3_MK:M\+)
-BUILDLINK_PACKAGES+=	cyrus-sasl
+.if !empty(CYRUS_SASL_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=			cyrus-sasl
+BUILDLINK_DEPENDS.cyrus-sasl?=		cyrus-sasl>=2.1.12
+BUILDLINK_PKGSRCDIR.cyrus-sasl?=	../../security/cyrus-sasl2
 .endif	# CYRUS_SASL_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
diff --git a/security/libcrack/buildlink3.mk b/security/libcrack/buildlink3.mk
index c5f444d3736..61a3f4c2f1b 100644
--- a/security/libcrack/buildlink3.mk
+++ b/security/libcrack/buildlink3.mk
@@ -1,19 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:07 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBCRACK_BUILDLINK3_MK:=	${LIBCRACK_BUILDLINK3_MK}+
 
-.if !empty(LIBCRACK_BUILDLINK3_MK:M\+)
-BUILDLINK_DEPENDS.libcrack?=	libcrack>=2.7
-BUILDLINK_PKGSRCDIR.libcrack?=	../../security/libcrack
-.endif	# LIBCRACK_BUILDLINK3_MK
-
-.if !empty(BUILDLINK_DEPTH:M\+)
+.if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	libcrack
 .endif
 
-.if !empty(LIBCRACK_BUILDLINK3_MK:M\+)
-BUILDLINK_PACKAGES+=	libcrack
+.if !empty(LIBCRACK_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=		libcrack
+BUILDLINK_DEPENDS.libcrack?=	libcrack>=2.7
+BUILDLINK_PKGSRCDIR.libcrack?=	../../security/libcrack
 .endif	# LIBCRACK_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
diff --git a/security/openssl/buildlink3.mk b/security/openssl/buildlink3.mk
index 9ae9ba3a0f3..b8032279454 100644
--- a/security/openssl/buildlink3.mk
+++ b/security/openssl/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:07 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OPENSSL_BUILDLINK3_MK:=	${OPENSSL_BUILDLINK3_MK}+
 
-.if !empty(OPENSSL_BUILDLINK3_MK:M\+)
+.if !empty(OPENSSL_BUILDLINK3_MK:M+)
 .  include "../../mk/bsd.prefs.mk"
 
 # This is the ${PKGNAME} of the version of the OpenSSL package installed
@@ -129,12 +129,12 @@ PKG_SKIP_REASON=	"Unable to satisfy dependency: ${BUILDLINK_DEPENDS.openssl}"
 .endif
 
 .if ${_NEED_OPENSSL} == "YES"
-.  if !empty(BUILDLINK_DEPTH:M\+)
+.  if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	openssl
 .  endif
 .endif
 
-.if !empty(OPENSSL_BUILDLINK3_MK:M\+)
+.if !empty(OPENSSL_BUILDLINK3_MK:M+)
 .  if ${_NEED_OPENSSL} == "NO"
 BUILDLINK_PREFIX.openssl=	/usr
 .  endif
diff --git a/security/rsaref/buildlink3.mk b/security/rsaref/buildlink3.mk
index 812464aee64..71e5b4de9fa 100644
--- a/security/rsaref/buildlink3.mk
+++ b/security/rsaref/buildlink3.mk
@@ -1,19 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:07 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 RSAREF_BUILDLINK3_MK:=	${RSAREF_BUILDLINK3_MK}+
 
-.if !empty(RSAREF_BUILDLINK3_MK:M\+)
-BUILDLINK_DEPENDS.rsaref?=	rsaref-2.0p3
-BUILDLINK_PKGSRCDIR.rsaref?=	../../security/rsaref
-.endif	# RSAREF_BUILDLINK3_MK
-
-.if !empty(BUILDLINK_DEPTH:M\+)
+.if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	rsaref
 .endif
 
-.if !empty(RSAREF_BUILDLINK3_MK:M\+)
-BUILDLINK_PACKAGES+=	rsaref
+.if !empty(RSAREF_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=		rsaref
+BUILDLINK_DEPENDS.rsaref?=	rsaref-2.0p3
+BUILDLINK_PKGSRCDIR.rsaref?=	../../security/rsaref
 .endif	# RSAREF_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
diff --git a/security/tcp_wrappers/buildlink3.mk b/security/tcp_wrappers/buildlink3.mk
index b4dd96870ee..9f8480e8573 100644
--- a/security/tcp_wrappers/buildlink3.mk
+++ b/security/tcp_wrappers/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:07 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 TCP_WRAPPERS_BUILDLINK3_MK:=	${TCP_WRAPPERS_BUILDLINK3_MK}+
 
-.if !empty(TCP_WRAPPERS_BUILDLINK3_MK:M\+)
+.if !empty(TCP_WRAPPERS_BUILDLINK3_MK:M+)
 .  include "../../mk/bsd.prefs.mk"
 
 BUILDLINK_DEPENDS.tcp_wrappers?=	tcp_wrappers>=7.6.1nb1
@@ -33,12 +33,12 @@ MAKEFLAGS+=	_NEED_TCP_WRAPPERS="${_NEED_TCP_WRAPPERS}"
 .endif
 
 .if ${_NEED_TCP_WRAPPERS} == "YES"
-.  if !empty(BUILDLINK_DEPTH:M\+)
+.  if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	tcp_wrappers
 .  endif
 .endif
 
-.if !empty(TCP_WRAPPERS_BUILDLINK3_MK:M\+)
+.if !empty(TCP_WRAPPERS_BUILDLINK3_MK:M+)
 .  if ${_NEED_TCP_WRAPPERS} == "YES"
 BUILDLINK_PACKAGES+=		tcp_wrappers
 .  else