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

4 files changed, 23 insertions, 31 deletions

diff --git a/net/libpcap/buildlink3.mk b/net/libpcap/buildlink3.mk
index 7ff95f37034..b7407355562 100644
--- a/net/libpcap/buildlink3.mk
+++ b/net/libpcap/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:07 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBPCAP_BUILDLINK3_MK:=	${LIBPCAP_BUILDLINK3_MK}+
 
-.if !empty(LIBPCAP_BUILDLINK3_MK:M\+)
+.if !empty(LIBPCAP_BUILDLINK3_MK:M+)
 .  include "../../mk/bsd.prefs.mk"
 
 BUILDLINK_DEPENDS.libpcap?=	libpcap>=0.7.2
@@ -33,12 +33,12 @@ MAKEFLAGS+=	_NEED_LIBPCAP="${_NEED_LIBPCAP}"
 .endif
 
 .if ${_NEED_LIBPCAP} == "YES"
-.  if !empty(BUILDLINK_DEPTH:M\+)
+.  if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	libpcap
 .  endif
 .endif
 
-.if !empty(LIBPCAP_BUILDLINK3_MK:M\+)
+.if !empty(LIBPCAP_BUILDLINK3_MK:M+)
 .  if ${_NEED_LIBPCAP} == "YES"
 BUILDLINK_PACKAGES+=		libpcap
 .  else
diff --git a/net/openslp/buildlink3.mk b/net/openslp/buildlink3.mk
index 3bdee1a3154..9d262783f68 100644
--- a/net/openslp/buildlink3.mk
+++ b/net/openslp/buildlink3.mk
@@ -1,19 +1,16 @@
-# $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:07 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OPENSLP_BUILDLINK3_MK:=	${OPENSLP_BUILDLINK3_MK}+
 
-.if !empty(OPENSLP_BUILDLINK3_MK:M\+)
-BUILDLINK_DEPENDS.openslp?=	openslp>=1.0.1
-BUILDLINK_PKGSRCDIR.openslp?=	../../net/openslp
-.endif	# OPENSLP_BUILDLINK3_MK
-
-.if !empty(BUILDLINK_DEPTH:M\+)
+.if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	openslp
 .endif
 
-.if !empty(OPENSLP_BUILDLINK3_MK:M\+)
-BUILDLINK_PACKAGES+=	openslp
+.if !empty(OPENSLP_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=		openslp
+BUILDLINK_DEPENDS.openslp?=	openslp>=1.0.1
+BUILDLINK_PKGSRCDIR.openslp?=	../../net/openslp
 .endif	# OPENSLP_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
diff --git a/net/socks4/buildlink3.mk b/net/socks4/buildlink3.mk
index 1b6d11de656..59880886b5e 100644
--- a/net/socks4/buildlink3.mk
+++ b/net/socks4/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:07 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SOCKS4_BUILDLINK3_MK:=	${SOCKS4_BUILDLINK3_MK}+
 
-.if !empty(SOCKS4_BUILDLINK3_MK:M\+)
-BUILDLINK_DEPENDS.socks4?=	socks4>=2.2
-BUILDLINK_PKGSRCDIR.socks4?=	../../net/socks4
-.endif	# SOCKS4_BUILDLINK3_MK
-
-.if !empty(BUILDLINK_DEPTH:M\+)
+.if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	socks4
 .endif
 
-.if !empty(SOCKS4_BUILDLINK3_MK:M\+)
-BUILDLINK_PACKAGES+=	socks4
+.if !empty(SOCKS4_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=		socks4
+BUILDLINK_DEPENDS.socks4?=	socks4>=2.2
+BUILDLINK_PKGSRCDIR.socks4?=	../../net/socks4
+
 BUILDLINK_TRANSFORM+=	l:socks:socks4
 .endif	# SOCKS4_BUILDLINK3_MK
 
diff --git a/net/socks5/buildlink3.mk b/net/socks5/buildlink3.mk
index 99da0a1c2e9..ab2477fed16 100644
--- a/net/socks5/buildlink3.mk
+++ b/net/socks5/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}+
 SOCKS5_BUILDLINK3_MK:=	${SOCKS5_BUILDLINK3_MK}+
 
-.if !empty(SOCKS5_BUILDLINK3_MK:M\+)
-BUILDLINK_DEPENDS.socks5?=	socks5>=1.0.2
-BUILDLINK_PKGSRCDIR.socks5?=	../../net/socks5
-.endif	# SOCKS5_BUILDLINK3_MK
-
-.if !empty(BUILDLINK_DEPTH:M\+)
+.if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	socks5
 .endif
 
-.if !empty(SOCKS5_BUILDLINK3_MK:M\+)
-BUILDLINK_PACKAGES+=	socks5
+.if !empty(SOCKS5_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=		socks5
+BUILDLINK_DEPENDS.socks5?=	socks5>=1.0.2
+BUILDLINK_PKGSRCDIR.socks5?=	../../net/socks5
 .endif	# SOCKS5_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}