Move inclusion of bsd.buildlink.mk to start of file.

20 files changed, 60 insertions, 60 deletions

diff --git a/devel/SDL/buildlink.mk b/devel/SDL/buildlink.mk
index 4d8cde2f424..3ce0a91b2eb 100644
--- a/devel/SDL/buildlink.mk
+++ b/devel/SDL/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/28 21:41:21 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:14 jlam Exp $
 #
 # This Makefile fragment is included by packages that use SDL.
 #
@@ -15,6 +15,8 @@
 .if !defined(SDL_BUILDLINK_MK)
 SDL_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.SDL?=	SDL>=1.2.0
 DEPENDS+=		${BUILDLINK_DEPENDS.SDL}:../../devel/SDL
 
@@ -49,6 +51,4 @@ pre-configure: ${BUILDLINK_TARGETS.SDL}
 SDL-buildlink: _BUILDLINK_USE
 SDL-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# SDL_BUILDLINK_MK
diff --git a/devel/SDL_ttf/buildlink.mk b/devel/SDL_ttf/buildlink.mk
index eb97242ec3d..cd9ba6a5444 100644
--- a/devel/SDL_ttf/buildlink.mk
+++ b/devel/SDL_ttf/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/06/26 21:42:52 zuntum Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/07/01 22:59:14 jlam Exp $
 #
 # This Makefile fragment is included by packages that use SDL_ttf.
 #
@@ -15,6 +15,8 @@
 .if !defined(SDL_ttf_BUILDLINK_MK)
 SDL_ttf_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.SDL_ttf?=	SDL_ttf>=2.0.3
 DEPENDS+=	${BUILDLINK_DEPENDS.SDL_ttf}:../../devel/SDL_ttf
 
@@ -31,6 +33,4 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.SDL_ttf}
 pre-configure: ${BUILDLINK_TARGETS.SDL_ttf}
 SDL_ttf-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# SDL_ttf_BUILDLINK_MK
diff --git a/devel/gettext-lib/buildlink.mk b/devel/gettext-lib/buildlink.mk
index 14fc8ad8d4a..9762ba6988e 100644
--- a/devel/gettext-lib/buildlink.mk
+++ b/devel/gettext-lib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.7 2001/06/23 19:26:52 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.8 2001/07/01 22:59:15 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gettext.
 #
@@ -15,6 +15,8 @@
 .if !defined(GETTEXT_BUILDLINK_MK)
 GETTEXT_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.gettext?=	gettext-lib>=0.10.35nb1
 
 .if defined(USE_GNU_GETTEXT)
@@ -55,6 +57,4 @@ LIBS+=			-lintl
 pre-configure: ${BUILDLINK_TARGETS.gettext}
 gettext-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# GETTEXT_BUILDLINK_MK
diff --git a/devel/glib/buildlink.mk b/devel/glib/buildlink.mk
index e56efe5460f..1599e12b31d 100644
--- a/devel/glib/buildlink.mk
+++ b/devel/glib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:26:53 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:15 jlam Exp $
 #
 # This Makefile fragment is included by packages that use glib.
 #
@@ -15,6 +15,8 @@
 .if !defined(GLIB_BUILDLINK_MK)
 GLIB_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.glib?=	glib>=1.2.8
 DEPENDS+=	${BUILDLINK_DEPENDS.glib}:../../devel/glib
 
@@ -42,6 +44,4 @@ pre-configure: ${BUILDLINK_TARGETS.glib}
 glib-buildlink: _BUILDLINK_USE
 glib-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# GLIB_BUILDLINK_MK
diff --git a/devel/gmp/buildlink.mk b/devel/gmp/buildlink.mk
index 21d38e3c4c1..c71fd421bfe 100644
--- a/devel/gmp/buildlink.mk
+++ b/devel/gmp/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/06/23 19:26:53 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2001/07/01 22:59:15 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gmp.
 #
@@ -15,6 +15,8 @@
 .if !defined(GMP_BUILDLINK_MK)
 GMP_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.gmp?=	gmp>=3.0
 DEPENDS+=		${BUILDLINK_DEPENDS.gmp}:../../devel/gmp
 
@@ -28,6 +30,4 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.gmp}
 pre-configure: ${BUILDLINK_TARGETS.gmp}
 gmp-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# GMP_BUILDLINK_MK
diff --git a/devel/libdockapp/buildlink.mk b/devel/libdockapp/buildlink.mk
index 6d5ceb4d8f9..a273b80e2f1 100644
--- a/devel/libdockapp/buildlink.mk
+++ b/devel/libdockapp/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/29 21:16:40 zuntum Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:16 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libdockapp.
 #
@@ -15,6 +15,8 @@
 .if !defined(LIBDOCKAPP_BUILDLINK_MK)
 LIBDOCKAPP_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.libdockapp?=	libdockapp>=0.4.0
 DEPENDS+=	${BUILDLINK_DEPENDS.libdockapp}:../../devel/libdockapp
 
@@ -28,6 +30,4 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.libdockapp}
 pre-configure: ${BUILDLINK_TARGETS.libdockapp}
 libdockapp-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# LIBDOCKAPP_BUILDLINK_MK
diff --git a/devel/libgetopt/buildlink.mk b/devel/libgetopt/buildlink.mk
index c4f466a75ad..130b94c320a 100644
--- a/devel/libgetopt/buildlink.mk
+++ b/devel/libgetopt/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.9 2001/06/23 19:26:53 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.10 2001/07/01 22:59:16 jlam Exp $
 #
 # This Makefile fragment is included by packages that use getopt_long().
 #
@@ -14,6 +14,8 @@
 .if !defined(GETOPT_BUILDLINK_MK)
 GETOPT_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.getopt?=	libgetopt>=1.3
 
 .if exists(/usr/include/getopt.h)
@@ -37,6 +39,4 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.getopt}
 pre-configure: ${BUILDLINK_TARGETS.getopt}
 getopt-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# GETOPT_BUILDLINK_MK
diff --git a/devel/libproplist/buildlink.mk b/devel/libproplist/buildlink.mk
index 3192d6c897e..593f2db59db 100644
--- a/devel/libproplist/buildlink.mk
+++ b/devel/libproplist/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/29 16:10:46 nra Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:16 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libproplist.
 #
@@ -15,6 +15,8 @@
 .if !defined(LIBPROPLIST_BUILDLINK_MK)
 LIBPROPLIST_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.libproplist?=	libproplist>=0.10.1
 DEPENDS+=	${BUILDLINK_DEPENDS.libproplist}:../../devel/libproplist
 
@@ -28,6 +30,4 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.libproplist}
 pre-configure: ${BUILDLINK_TARGETS.libproplist}
 libproplist-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# LIBPROPLIST_BUILDLINK_MK
diff --git a/devel/libslang/buildlink.mk b/devel/libslang/buildlink.mk
index e1d8b7f0836..0f4cb1f61d0 100644
--- a/devel/libslang/buildlink.mk
+++ b/devel/libslang/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/26 14:26:03 zuntum Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:17 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libslang.
 #
@@ -15,6 +15,8 @@
 .if !defined(LIBSLANG_BUILDLINK_MK)
 LIBSLANG_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.libslang?=	libslang>=1.4.4
 DEPENDS+=	${BUILDLINK_DEPENDS.libslang}:../../devel/libslang
 
@@ -29,6 +31,4 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.libslang}
 pre-configure: ${BUILDLINK_TARGETS.libslang}
 libslang-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# LIBSLANG_BUILDLINK_MK
diff --git a/devel/libtool/buildlink.mk b/devel/libtool/buildlink.mk
index f9f61a408a3..18abf44a730 100644
--- a/devel/libtool/buildlink.mk
+++ b/devel/libtool/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:26:53 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:17 jlam Exp $
 #
 # This Makefile fragment is included by packages that use ltdl.
 #
@@ -13,6 +13,8 @@
 .if !defined(LTDL_BUILDLINK_MK)
 LTDL_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.ltdl?=	libtool>=${LIBTOOL_REQD}
 DEPENDS+=	${BUILDLINK_DEPENDS.ltdl}:../../devel/libtool
 
@@ -26,6 +28,4 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.ltdl}
 pre-configure: ${BUILDLINK_TARGETS.ltdl}
 ltdl-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# LTDL_BUILDLINK_MK
diff --git a/devel/lwp/buildlink.mk b/devel/lwp/buildlink.mk
index 0bae73af493..93ba7f49fc5 100644
--- a/devel/lwp/buildlink.mk
+++ b/devel/lwp/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2001/06/23 19:26:53 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.6 2001/07/01 22:59:17 jlam Exp $
 #
 # This Makefile fragment is included by packages that use lwp.
 #
@@ -15,6 +15,8 @@
 .if !defined(LWP_BUILDLINK_MK)
 LWP_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.lwp?=	lwp>=1.6
 DEPENDS+=		${BUILDLINK_DEPENDS.lwp}:../../devel/lwp
 
@@ -28,6 +30,4 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.lwp}
 pre-configure: ${BUILDLINK_TARGETS.lwp}
 lwp-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# LWP_BUILDLINK_MK
diff --git a/devel/ncurses/buildlink.mk b/devel/ncurses/buildlink.mk
index 1af1556b096..62c2f9df02f 100644
--- a/devel/ncurses/buildlink.mk
+++ b/devel/ncurses/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/07/01 21:10:09 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/07/01 22:59:17 jlam Exp $
 #
 # This Makefile fragment is included by packages that use ncurses.
 #
@@ -12,6 +12,8 @@
 # (4) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
 #     path.
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.ncurses?=	ncurses>=5.0
 
 .if defined(USE_NCURSES)
@@ -88,5 +90,3 @@ ncurses-extra-includes-buildlink:
 	for file in $${extra_includes}; do				\
 		${TOUCH} ${TOUCH_FLAGS} $${BUILDLINK_DIR}/$${file};	\
 	done
-
-.include "../../mk/bsd.buildlink.mk"
diff --git a/devel/pcre/buildlink.mk b/devel/pcre/buildlink.mk
index 130f1d17135..9f660fcfd99 100644
--- a/devel/pcre/buildlink.mk
+++ b/devel/pcre/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/27 03:46:06 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:18 jlam Exp $
 #
 # This Makefile fragment is included by packages that use pcre.
 #
@@ -15,6 +15,8 @@
 .if !defined(PCRE_BUILDLINK_MK)
 PCRE_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.pcre?=	pcre>=3.4
 DEPENDS+=	${BUILDLINK_DEPENDS.pcre}:../../devel/pcre
 
@@ -39,6 +41,4 @@ pre-configure: ${BUILDLINK_TARGETS.pcre}
 pcre-buildlink: _BUILDLINK_USE
 pcre-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# PCRE_BUILDLINK_MK
diff --git a/devel/pth/buildlink.mk b/devel/pth/buildlink.mk
index 33174d125f5..980415f824d 100644
--- a/devel/pth/buildlink.mk
+++ b/devel/pth/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/06/23 19:26:54 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/07/01 22:59:18 jlam Exp $
 #
 # This Makefile fragment is included by packages that use pth.
 #
@@ -15,6 +15,8 @@
 .if !defined(PTH_BUILDLINK_MK)
 PTH_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.pth?=	pth>=1.3.2
 DEPENDS+=		${BUILDLINK_DEPENDS.pth}:../../devel/pth
 
@@ -40,6 +42,4 @@ pth-buildlink: _BUILDLINK_USE
 pth-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
 pth-pthread-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# PTH_BUILDLINK_MK
diff --git a/devel/readline/buildlink.mk b/devel/readline/buildlink.mk
index 5c473266630..3617897ca7d 100644
--- a/devel/readline/buildlink.mk
+++ b/devel/readline/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.12 2001/06/23 19:26:54 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.13 2001/07/01 22:59:18 jlam Exp $
 #
 # This Makefile fragment is included by packages that use readline().
 #
@@ -18,6 +18,8 @@
 .if !defined(READLINE_BUILDLINK_MK)
 READLINE_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.readline?=	readline>=2.2
 
 .if defined(USE_GNU_READLINE)
@@ -71,6 +73,4 @@ pre-configure: ${BUILDLINK_TARGETS.readline}
 readline-buildlink: _BUILDLINK_USE
 history-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# READLINE_BUILDLINK_MK
diff --git a/devel/rpc2/buildlink.mk b/devel/rpc2/buildlink.mk
index ad513f59b73..4293e6d719e 100644
--- a/devel/rpc2/buildlink.mk
+++ b/devel/rpc2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2001/06/23 19:26:54 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.6 2001/07/01 22:59:19 jlam Exp $
 #
 # This Makefile fragment is included by packages that use rpc2.
 #
@@ -15,6 +15,8 @@
 .if !defined(RPC2_BUILDLINK_MK)
 RPC2_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.rpc2?=	rpc2>=1.10
 DEPENDS+=			${BUILDLINK_DEPENDS.rpc2}:../../devel/rpc2
 
@@ -32,6 +34,4 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.rpc2}
 pre-configure: ${BUILDLINK_TARGETS.rpc2}
 rpc2-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# RPC2_BUILDLINK_MK
diff --git a/devel/rvm/buildlink.mk b/devel/rvm/buildlink.mk
index 2d08c6c3dbc..91a73d6535d 100644
--- a/devel/rvm/buildlink.mk
+++ b/devel/rvm/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2001/06/23 19:26:54 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.6 2001/07/01 22:59:19 jlam Exp $
 #
 # This Makefile fragment is included by packages that use rvm.
 #
@@ -15,6 +15,8 @@
 .if !defined(RVM_BUILDLINK_MK)
 RVM_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.rvm?=	rvm>=1.3
 DEPENDS+=		${BUILDLINK_DEPENDS.rvm}:../../devel/rvm
 
@@ -34,6 +36,4 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.rvm}
 pre-configure: ${BUILDLINK_TARGETS.rvm}
 rvm-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# RVM_BUILDLINK_MK
diff --git a/devel/rx/buildlink.mk b/devel/rx/buildlink.mk
index 555af0c379c..dc36d506c15 100644
--- a/devel/rx/buildlink.mk
+++ b/devel/rx/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/30 09:28:15 zuntum Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:19 jlam Exp $
 #
 # This Makefile fragment is included by packages that use rx.
 #
@@ -15,6 +15,8 @@
 .if !defined(RX_BUILDLINK_MK)
 RX_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.rx?=	rx>=1.5
 DEPENDS+=	${BUILDLINK_DEPENDS.rx}:../../devel/rx
 
@@ -28,6 +30,4 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.rx}
 pre-configure: ${BUILDLINK_TARGETS.rx}
 rx-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# RX_BUILDLINK_MK
diff --git a/devel/smpeg/buildlink.mk b/devel/smpeg/buildlink.mk
index a86e80d7507..307e10d60b4 100644
--- a/devel/smpeg/buildlink.mk
+++ b/devel/smpeg/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/06/28 22:03:41 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/07/01 22:59:20 jlam Exp $
 #
 # This Makefile fragment is included by packages that use smpeg.
 #
@@ -15,6 +15,8 @@
 .if !defined(SMPEG_BUILDLINK_MK)
 SMPEG_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.smpeg?=	smpeg>=0.4.3
 DEPENDS+=	${BUILDLINK_DEPENDS.smpeg}:../../devel/smpeg
 
@@ -40,6 +42,4 @@ pre-configure: ${BUILDLINK_TARGETS.smpeg}
 smpeg-buildlink: _BUILDLINK_USE
 smpeg-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# SMPEG_BUILDLINK_MK
diff --git a/devel/zlib/buildlink.mk b/devel/zlib/buildlink.mk
index 6dadc4a7cfd..61786b89818 100644
--- a/devel/zlib/buildlink.mk
+++ b/devel/zlib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/06/23 19:26:55 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2001/07/01 22:59:20 jlam Exp $
 #
 # This Makefile fragment is included by packages that use zlib. 
 #
@@ -15,6 +15,8 @@
 .if !defined(ZLIB_BUILDLINK_MK)
 ZLIB_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.zlib?=	zlib>=1.1.3
 
 .if exists(/usr/include/zlib.h)
@@ -40,6 +42,4 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.zlib}
 pre-configure: ${BUILDLINK_TARGETS.zlib}
 zlib-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# ZLIB_BUILDLINK_MK